Mailinglist Archive: yast-commit (687 mails)

[aschnell@xxxxxxxxxxxxxxxx]

Author: aschnell
Date: Wed Jan 30 15:25:39 2008
New Revision: 44017

URL: http://svn.opensuse.org/viewcvs/yast?rev=44017&view=rev
Log:
- use icewm instead of fvwm during installation (bnc #357240)

Added:
    trunk/installation/src/config/preferences.yast2
Modified:
    trunk/installation/VERSION
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/config/Makefile.am
    trunk/installation/startup/YaST2.call
    trunk/installation/yast2-installation.spec.in

Modified: trunk/installation/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=44017&r1=44016&r2=44017&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Wed Jan 30 15:25:39 2008
@@ -1 +1 @@
-2.16.11
+2.16.12

Modified: trunk/installation/package/yast2-installation.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44017&r1=44016&r2=44017&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Wed Jan 30 15:25:39 
2008
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Wed Jan 30 15:22:29 CET 2008 - aschnell@xxxxxxx
+
+- Use icewm instead of fvwm during installation (bnc #357240)
+
+-------------------------------------------------------------------
 Wed Jan 30 14:15:50 CET 2008 - fehr@xxxxxxx
 
 - Add installation step for disk partitioning between time zone

Modified: trunk/installation/src/config/Makefile.am
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/Makefile.am?rev=44017&r1=44016&r2=44017&view=diff
==============================================================================
--- trunk/installation/src/config/Makefile.am (original)
+++ trunk/installation/src/config/Makefile.am Wed Jan 30 15:25:39 2008
@@ -1,12 +1,11 @@
-# Makefile.am for installation/vendor
+# Makefile.am for installation/src/config
 
 desktop_DATA = release_notes.desktop
 
-fvwm_DATA = fvwmrc.yast2
+# FIXME
+icewmdir= /etc/icewm
+icewm_DATA = preferences.yast2
 
-rncdir =  $(schemadir)/autoyast/rnc
-rnc_DATA = 
-
-EXTRA_DIST = $(desktop_DATA) $(fvwm_DATA) $(rnc_DATA)
+EXTRA_DIST = $(desktop_DATA) $(icewm_DATA)
 
 include $(top_srcdir)/Makefile.am.common

Added: trunk/installation/src/config/preferences.yast2
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/preferences.yast2?rev=44017&view=auto
==============================================================================
--- trunk/installation/src/config/preferences.yast2 (added)
+++ trunk/installation/src/config/preferences.yast2 Wed Jan 30 15:25:39 2008
@@ -0,0 +1,114 @@
+# IceWM configuration file for use during installation
+
+# Hide taskbar
+ShowTaskBar=0
+
+# Hide titlebar buttons
+TitleButtonsLeft=""
+TitleButtonsRight=""
+
+# Show only Move, Size and Close in the window menu
+WinMenuItems="msc"
+
+# Disable Alt+Tab
+QuickSwitch=0
+
+# Colors
+ColorActiveTitleBar="rgb:4e/6f/9f"
+ColorNormalTitleBar="rgb:c3/c3/c3"
+
+# Borders
+BorderSizeX=3
+BorderSizeY=3
+DlgBorderSizeX=3
+DlgBorderSizeY=3
+
+# Disable most shortcuts
+# :r !grep -o '\<Key[^=]*' /etc/icewm/preferences  | sed 's/$/=""/'
+KeyWinRaise=""
+KeyWinOccupyAll=""
+KeyWinLower=""
+KeyWinClose=""
+KeyWinRestore=""
+KeyWinPrev=""
+KeyWinNext=""
+KeyWinMove=""
+KeyWinSize=""
+KeyWinMinimize=""
+KeyWinMaximize=""
+KeyWinMaximizeVert=""
+KeyWinMaximizeHoriz=""
+KeyWinFullscreen=""
+KeyWinHide=""
+KeyWinRollup=""
+KeyWinMenu=""
+KeyWinArrangeN=""
+KeyWinArrangeNE=""
+KeyWinArrangeE=""
+KeyWinArrangeSE=""
+KeyWinArrangeS=""
+KeyWinArrangeSW=""
+KeyWinArrangeW=""
+KeyWinArrangeNW=""
+KeyWinArrangeC=""
+KeySysSwitchNext=""
+KeySysSwitchLast=""
+KeySysWinNext=""
+KeySysWinPrev=""
+KeySysWinMenu=""
+KeySysDialog=""
+KeySysMenu=""
+KeySysWindowList=""
+KeySysWinListMenu=""
+KeySysAddressBar=""
+KeySysWorkspacePrev=""
+KeySysWorkspaceNext=""
+KeySysWorkspaceLast=""
+KeySysWorkspacePrevTakeWin=""
+KeySysWorkspaceNextTakeWin=""
+KeySysWorkspaceLastTakeWin=""
+KeySysWorkspace1=""
+KeySysWorkspace2=""
+KeySysWorkspace3=""
+KeySysWorkspace4=""
+KeySysWorkspace5=""
+KeySysWorkspace6=""
+KeySysWorkspace7=""
+KeySysWorkspace8=""
+KeySysWorkspace9=""
+KeySysWorkspace10=""
+KeySysWorkspace11=""
+KeySysWorkspace12=""
+KeySysWorkspace1TakeWin=""
+KeySysWorkspace2TakeWin=""
+KeySysWorkspace3TakeWin=""
+KeySysWorkspace4TakeWin=""
+KeySysWorkspace5TakeWin=""
+KeySysWorkspace6TakeWin=""
+KeySysWorkspace7TakeWin=""
+KeySysWorkspace8TakeWin=""
+KeySysWorkspace9TakeWin=""
+KeySysWorkspace10TakeWin=""
+KeySysWorkspace11TakeWin=""
+KeySysWorkspace12TakeWin=""
+KeySysTileVertical=""
+KeySysTileHorizontal=""
+KeySysCascade=""
+KeySysArrange=""
+KeySysArrangeIcons=""
+KeySysMinimizeAll=""
+KeySysHideAll=""
+KeySysUndoArrange=""
+KeySysShowDesktop=""
+KeySysCollapseTaskBar=""
+
+# Disable root window menus
+# :r !grep -o '\<Desktop[^=]*Button=' /etc/icewm/preferences  | sed 's/$/0/'
+DesktopWinMenuButton=0
+DesktopWinListButton=0
+DesktopMenuButton=0
+
+# Disable maximize and rollup
+TitleBarMaximizeButton=0
+TitleBarRollupButton=0
+

Modified: trunk/installation/startup/YaST2.call
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?rev=44017&r1=44016&r2=44017&view=diff
==============================================================================
--- trunk/installation/startup/YaST2.call (original)
+++ trunk/installation/startup/YaST2.call Wed Jan 30 15:25:39 2008
@@ -469,7 +469,7 @@
            fi
 
            # set the background
-           fvwm-root --dither ${BACKGROUND_IMAGE}
+           # FIXME
 
            # remove PNG silently if exists
            rm -rf ${TMPDIR}/img.png
@@ -725,7 +725,7 @@
 fi
 fi
 # 3.1.6) Check for WindowManager configuration
-if [ ! -f $Xsharedir/fvwm/fvwmrc.yast2 ];then
+if [ ! -f /etc/icewm/preferences.yast2 ];then
        log "\tNo Windowmanager configuration found -> Medium Qt and Gtk 
disabled"
        MEDIUM[0]=0
        MEDIUM[4]=0
@@ -755,7 +755,7 @@
 # 3.3) prequalification checks for VNC
 #---------------------------------------------
 # 3.3.1) Check for WindowManager configuration
-if [ ! -f $Xsharedir/fvwm/fvwmrc.yast2 ];then
+if [ ! -f /etc/icewm/preferences.yast2 ];then
        log "\tNo Windowmanager configuration found -> Medium VNC disabled"
        MEDIUM[2]=0
 fi

Modified: trunk/installation/yast2-installation.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=44017&r1=44016&r2=44017&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Wed Jan 30 15:25:39 2008
@@ -122,12 +122,8 @@
 # programs and scripts
 @ystartupdir@/startup
 
-# fvwmrc
-%if 0%{?suse_version} <= 1010
-%{prefix}/X11R6/share/fvwm/
-%else
-%{prefix}/share/fvwm/
-%endif
+# icewm
+/etc/icewm
 
 %dir @docdir@
 @docdir@/COPYING

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx