X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fvwm-system.fvwmrc;h=387d77c4963dbc522015005047d2541e77a723e3;hb=refs%2Fheads%2Fmaster;hp=7c1273f0742045afa8e6e43b1f51c621f39ef1f5;hpb=0328871462f0a1021b994548a4e9e2715dbd97c4;p=packages%2Ffvwm.git

diff --git a/fvwm-system.fvwmrc b/fvwm-system.fvwmrc
index 7c1273f..387d77c 100644
--- a/fvwm-system.fvwmrc
+++ b/fvwm-system.fvwmrc
@@ -185,9 +185,9 @@ DeskTopScale 32
 # Module path and paths to the icons
 #
 # ModulePath is a colon-separated list, just like regular unix PATH
-ModulePath /usr/X11R6/lib/X11/fvwm/
-PixmapPath /usr/X11R6/include/X11/pixmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/
-IconPath   /usr/X11R6/include/X11/bitmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/
+ModulePath /usr/lib/fvwm1/
+PixmapPath /usr/share/pixmaps/:/usr/share/pixmaps/mini/:/usr/X11R6/include/X11/pixmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/
+IconPath   /usr/share/pixmaps/:/usr/share/pixmaps/mini/:/usr/X11R6/include/X11/bitmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/
 
 ############################################################################
 # Set the decoration styles and window options
@@ -241,7 +241,7 @@ ButtonStyle 4 50x50
 
 Function "InitFunction"
 #	Module	"I"	FvwmBanner
-#	Exec	"I"	xpmroot /usr/include/X11/pixmaps/fvwm.xpm &
+#	Exec	"I"	xpmroot /usr/share/pixmaps/fvwm.xpm &
 	Exec	"I"	xsetroot -solid "#266294"      
 	Module	"I"	GoodStuff
 #	Exec	"I"	exec xterm -geometry 80x64+0+0 &
@@ -325,7 +325,7 @@ EndFunction
 Popup "Quit-Verify"
 	Title	"Really Quit Fvwm?"
 	Quit	"Yes, Really Quit"
-	Restart "Restart Fvwm"	fvwm
+	Restart "Restart Fvwm"	fvwm1
 	Restart "Start twm" 	twm
 	Restart "Start tvtwm" 	tvtwm
 	Restart "Start mwm" 	mwm
@@ -394,18 +394,19 @@ Function "window_ops_func"
 	Close  "DoubleClick"  
 EndFunction
 
-esyscmd(wmconfig --output afterstep --rootmenu Programs)
+#esyscmd(wmconfig --output afterstep --rootmenu Applications)
+#esyscmd(vfmg -f -x -c fvwm)
+esyscmd(cat /etc/X11/fvwm/fvwm.menu)
 
-# This menu will fire up some very common utilities
-Popup "MainMenu"
-	Title 	"Main Menu"
+Popup	"Main Menu"
 	Exec    "Xterm"		exec xterm &
 	Exec    "Rxvt"		exec rxvt -bg Black -fg Wheat &
 	Nop	""
-	Popup	"Programs"	Programs
+	Popup	"Applications"	Applications
+	Nop	""
 	Popup	"Modules"	Module-Popup
 	Nop	""
-        Restart "Restart Fvwm"  fvwm
+        Restart "Restart Fvwm"  fvwm1
 	Popup	"Exit Fvwm"	Quit-Verify
 EndPopup
 
@@ -420,7 +421,7 @@ EndPopup
 # any shift-control-whatever combination you want!
 
 #     Button	Context Modifi 	Function
-Mouse 1		R   	A       PopUp "MainMenu"
+Mouse 1		R   	A       PopUp "Main Menu"
 Mouse 2		R    	A      	PopUp "Window Ops"
 Mouse 3		R    	A      	Module "winlist" FvwmWinList transient