updated default menus a little bit

WindowMaker/menu

@@ -118,46 +118,50 @@
 	"Info" END
 	"Run..." SHEXEC %a(Run,Type command to run:)
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
+	"Mozilla Firefox" EXEC firefox
 	"Workspaces" WORKSPACE_MENU
 	"Applications" MENU
-		"Graphics" MENU
 		"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Graphics" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
   		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
+		"Xpdf" EXEC xpdf %a(Xpdf,Enter PDF to view)
-  		"TkDesk" EXEC tkdesk
+		"Abiword" EXEC abiword
-	"Applications" END
+		"Dia" EXEC dia
+		"OpenOffice.org" MENU
+			"OpenOffice.org" EXEC ooffice
+			"Writer" EXEC oowriter
+			"Spreadsheet" EXEC oocalc
+			"Draw" EXEC oodraw
+			"Impress" EXEC ooimpress
+		"OpenOffice.org" END 
+
 		"Editors" MENU
-		"XFte" EXEC xfte
 			"XEmacs" EXEC xemacs
 			"Emacs" EXEC emacs
 			"XJed" EXEC xjed 
+			"VI" EXEC xterm -e vi
+			"GVIM" EXEC gvim
 			"NEdit" EXEC nedit
 			"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
 		"Editors" END
-	"Miscellaneous" MENU
+
-		"Xmcd" SHEXEC xmcd 2> /dev/null
+		"Multimedia" MENU
-		"Xplaycd" EXEC xplaycd
+			"XMMS" MENU
-		"Xmixer" EXEC xmixer
+				"XMMS" EXEC xmms
-	"Miscellaneous" END
+				"XMMS play/pause" EXEC xmms -t
+				"XMMS stop" EXEC xmms -s
+			"XMMS" END
+			"Xine video player" EXEC xine
+			"MPlayer" EXEC mplayer
+		"Multimedia" END
+	"Applications" END
+
 	"Utils" MENU
 		"Calculator" EXEC xcalc
 		"Window Properties" SHEXEC xprop | xmessage -center -title 'xprop' -file -
 		"Font Chooser" EXEC xfontsel
-		"Terminal Emulator" EXEC xminicom
+		"Magnify" EXEC wmagnify
-		"Magnify" EXEC xmag
 		"Colormap" EXEC xcmap
-		"XKill" EXEC xkill
+		"Kill X Application" EXEC xkill
-		"Clipboard" EXEC xclipboard
 	"Utils" END
 
 	"Selection" MENU
@@ -186,7 +190,7 @@
 				"Black" WS_BACK '(solid, black)'
 				"Blue"  WS_BACK '(solid, "#505075")'
 				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Bleumarine" WS_BACK '(solid, "#224477")'
+				"Bluemarine" WS_BACK '(solid, "#224477")'
 				"Purple" WS_BACK '(solid, "#554466")'
 				"Wheat"  WS_BACK '(solid, "wheat4")'
 				"Dark Gray"  WS_BACK '(solid, "#333340")'
@@ -210,9 +214,10 @@
 	"Appearance" END
 
 	"Exit" MENU
-		"Restart" RESTART
+		"Save Session" SAVE_SESSION
+		"Clear Session" CLEAR_SESSION
+		"Restart Window Maker" RESTART
 		"Start BlackBox" RESTART blackbox
-		"Start kwm" RESTART kwm
 		"Start IceWM" RESTART icewm
 		"Exit"  EXIT
 	"Exit" END

WindowMaker/plmenu

@@ -9,52 +9,52 @@
  ),
  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+ ("Mozilla Firefox", EXEC, "firefox"),
  ("Workspaces", WORKSPACE_MENU),
  ("Applications",
-  ("Graphics",
   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("X File Manager", EXEC, "xfm"),
-  ("OffiX Files", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
   ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
+  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
-  ("TkDesk", EXEC, "tkdesk")
+  ("Abiword", EXEC, "abiword"),
+  ("Dia", EXEC, "dia"),
+  ("OpenOffice.org",
+   ("OpenOffice.org", EXEC, "ooffice"),
+   ("Writer", EXEC, "oowriter"),
+   ("Spreadsheet", EXEC, "oocalc"),
+   ("Draw", EXEC, "oodraw"),
+   ("Impress", EXEC, "ooimpress")
   ),
   ("Editors",
-  ("XFte", EXEC, "xfte"),
    ("XEmacs", EXEC, "xemacs"),
    ("Emacs", EXEC, "emacs"),
    ("XJed", EXEC, "xjed"),
+   ("VI", EXEC, "xterm -e vi"),
+   ("GVIM", EXEC, "gvim"),
    ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
+   ("Xedit", EXEC, "xedit")
-  ("VI", EXEC, "xterm -e vi")
   ),
- ("Miscellaneous",
+  ("Multimedia",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
+   ("XMMS", 
-  ("Xplaycd", EXEC, "xplaycd"),
+    ("XMMS", EXEC, "xmms"),
-  ("Xmixer", EXEC, "xmixer")
+    ("XMMS play/pause", EXEC, "xmms -t"),
+    ("XMMS stop", EXEC, "xmms -s")
+   ),
+   ("Xine video player", EXEC, "xine"),
+   ("MPlayer", EXEC, "mplayer")
+  )
  ),
  ("Utils",
   ("Calculator", EXEC, "xcalc"),
   ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
   ("Font Chooser", EXEC, "xfontsel"),
-  ("Terminal Emulator", EXEC, "xminicom"),
+  ("Magnify", EXEC, "wmagnify"),
-  ("Magnify", EXEC, "xmag"),
   ("Colormap", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
+  ("Kill X Application", EXEC, "xkill")
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
  ),
  ("Selection",
   ("Copy", SHEXEC, "echo '%s' | wxcopy"),
   ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navigate", EXEC, "netscape %s"),
+  ("Navigate", EXEC, "mozilla %s"),
   ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
  ),
  ("Commands",
@@ -75,7 +75,7 @@
 	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
 	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
 	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-    ("Bleumarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
+	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
 	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
 	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
 	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
@@ -98,9 +98,10 @@
    ("Preferences Utility", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs")
    ), 
    ("Exit",
-  ("Restart", RESTART),
+    ("Save Session", SAVE_SESSION),
+    ("Clear Session", CLEAR_SESSION),
+	("Restart Window Maker", RESTART),
 	("Start BlackBox", RESTART, blackbox),
-  ("Start kwm", RESTART, kwm),
 	("Start IceWM", RESTART, icewm),
 	("Exit", EXIT)
    )