[packages/WindowMaker.git] / WindowMaker-wmconfig.patch

diff -Nur WindowMaker-0.80.1.orig/WindowMaker/menu WindowMaker-0.80.1/WindowMaker/menu
--- WindowMaker-0.80.1.orig/WindowMaker/menu	Tue Jul  2 02:30:25 2002
+++ WindowMaker-0.80.1/WindowMaker/menu	Mon Jul 15 19:51:47 2002
@@ -116,49 +116,10 @@
 		"Process List" EXEC xterm -e top
 		"Manual Browser" EXEC xman
 	"Info" END
-	"Run..." SHEXEC %a(Run,Type command to run:)
 	"XTerm" EXEC xterm -sb 
 	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"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)
-  		"TkDesk" EXEC tkdesk
-	"Applications" END
-	"Editors" MENU
-		"XFte" EXEC xfte
-		"XEmacs" EXEC xemacs
-		"Emacs" EXEC emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editors" END
-	"Miscellaneous" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Miscellaneous" 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 xmag
-		"Colormap" EXEC xcmap
-		"XKill" EXEC xkill
-		"Clipboard" EXEC xclipboard
-	"Utils" END
+	"Applications" OPEN_MENU | wmconfig --output wmaker --rootmenu Applications 2>/dev/null
 
 	"Selection" MENU
 		"Copy" SHEXEC echo '%s' | wxcopy
diff -Nur WindowMaker-0.80.1.orig/WindowMaker/plmenu WindowMaker-0.80.1/WindowMaker/plmenu
--- WindowMaker-0.80.1.orig/WindowMaker/plmenu	Tue Jul  2 02:30:25 2002
+++ WindowMaker-0.80.1/WindowMaker/plmenu	Mon Jul 15 19:52:58 2002
@@ -11,46 +11,7 @@
  ("XTerm", EXEC, "xterm -sb"),
  ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("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)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("Editors",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", EXEC, "xemacs"),
-  ("Emacs", EXEC, "emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Miscellaneous",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Utils",
-  ("Calculator", EXEC, "xcalc"),
-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Font Chooser", EXEC, "xfontsel"),
-  ("Terminal Emulator", EXEC, "xminicom"),
-  ("Magnify", EXEC, "xmag"),
-  ("Colormap", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
+ ("Applications", OPEN_MENU, "| wmconfig --output wmaker --rootmenu Applications 2>/dev/null "),
  ("Selection",
   ("Copy", SHEXEC, "echo '%s' | wxcopy"),
   ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
Commit	Line	Data
6065adeb JB	1	diff -Nur WindowMaker-0.80.1.orig/WindowMaker/menu WindowMaker-0.80.1/WindowMaker/menu
	2	--- WindowMaker-0.80.1.orig/WindowMaker/menu Tue Jul 2 02:30:25 2002
	3	+++ WindowMaker-0.80.1/WindowMaker/menu Mon Jul 15 19:51:47 2002
	4	@@ -116,49 +116,10 @@
c8d02bd2	5	"Process List" EXEC xterm -e top
	6	"Manual Browser" EXEC xman
	7	"Info" END
3542dd94	8	- "Run..." SHEXEC %a(Run,Type command to run:)
c8d02bd2	9	"XTerm" EXEC xterm -sb
	10	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
	11	"Workspaces" WORKSPACE_MENU
	12	- "Applications" MENU
	13	- "Graphics" MENU
3542dd94	14	- "Gimp" SHEXEC gimp >/dev/null
c8d02bd2	15	- "XV" EXEC xv
	16	- "XPaint" EXEC xpaint
	17	- "XFig" EXEC xfig
	18	- "Graphics" END
	19	- "X File Manager" EXEC xfm
	20	- "OffiX Files" EXEC files
	21	- "LyX" EXEC lyx
	22	- "Netscape" EXEC netscape
	23	- "Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
	24	- "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
	25	- "TkDesk" EXEC tkdesk
	26	- "Applications" END
	27	- "Editors" MENU
	28	- "XFte" EXEC xfte
6065adeb JB	29	- "XEmacs" EXEC xemacs
6065adeb JB	30	- "Emacs" EXEC emacs
c8d02bd2	31	- "XJed" EXEC xjed
	32	- "NEdit" EXEC nedit
	33	- "Xedit" EXEC xedit
	34	- "VI" EXEC xterm -e vi
	35	- "Editors" END
	36	- "Miscellaneous" MENU
3542dd94	37	- "Xmcd" SHEXEC xmcd 2> /dev/null
c8d02bd2	38	- "Xplaycd" EXEC xplaycd
	39	- "Xmixer" EXEC xmixer
	40	- "Miscellaneous" END
	41	- "Utils" MENU
	42	- "Calculator" EXEC xcalc
3542dd94	43	- "Window Properties" SHEXEC xprop \| xmessage -center -title 'xprop' -file -
c8d02bd2	44	- "Font Chooser" EXEC xfontsel
	45	- "Terminal Emulator" EXEC xminicom
	46	- "Magnify" EXEC xmag
	47	- "Colormap" EXEC xcmap
	48	- "XKill" EXEC xkill
	49	- "Clipboard" EXEC xclipboard
	50	- "Utils" END
3542dd94	51	+ "Applications" OPEN_MENU \| wmconfig --output wmaker --rootmenu Applications 2>/dev/null
c8d02bd2	52
c8d02bd2	53	"Selection" MENU
3542dd94	54	"Copy" SHEXEC echo '%s' \| wxcopy
6065adeb JB	55	diff -Nur WindowMaker-0.80.1.orig/WindowMaker/plmenu WindowMaker-0.80.1/WindowMaker/plmenu
	56	--- WindowMaker-0.80.1.orig/WindowMaker/plmenu Tue Jul 2 02:30:25 2002
	57	+++ WindowMaker-0.80.1/WindowMaker/plmenu Mon Jul 15 19:52:58 2002
	58	@@ -11,46 +11,7 @@
c8d02bd2	59	("XTerm", EXEC, "xterm -sb"),
	60	("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
	61	("Workspaces", WORKSPACE_MENU),
	62	- ("Applications",
	63	- ("Graphics",
3542dd94	64	- ("Gimp", SHEXEC, "gimp >/dev/null"),
c8d02bd2	65	- ("XV", EXEC, "xv"),
	66	- ("XPaint", EXEC, "xpaint"),
	67	- ("XFig", EXEC, "xfig")
	68	- ),
	69	- ("X File Manager", EXEC, "xfm"),
	70	- ("OffiX Files", EXEC, "files"),
	71	- ("LyX", EXEC, "lyx"),
	72	- ("Netscape", EXEC, "netscape"),
	73	- ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
	74	- ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
	75	- ("TkDesk", EXEC, "tkdesk")
	76	- ),
	77	- ("Editors",
	78	- ("XFte", EXEC, "xfte"),
6065adeb JB	79	- ("XEmacs", EXEC, "xemacs"),
6065adeb JB	80	- ("Emacs", EXEC, "emacs"),
c8d02bd2	81	- ("XJed", EXEC, "xjed"),
	82	- ("NEdit", EXEC, "nedit"),
	83	- ("Xedit", EXEC, "xedit"),
	84	- ("VI", EXEC, "xterm -e vi")
	85	- ),
	86	- ("Miscellaneous",
3542dd94	87	- ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
c8d02bd2	88	- ("Xplaycd", EXEC, "xplaycd"),
	89	- ("Xmixer", EXEC, "xmixer")
	90	- ),
	91	- ("Utils",
	92	- ("Calculator", EXEC, "xcalc"),
3542dd94	93	- ("Window Properties", SHEXEC, "xprop \| xmessage -center -title 'xprop' -file -"),
c8d02bd2	94	- ("Font Chooser", EXEC, "xfontsel"),
	95	- ("Terminal Emulator", EXEC, "xminicom"),
	96	- ("Magnify", EXEC, "xmag"),
	97	- ("Colormap", EXEC, "xcmap"),
	98	- ("XKill", EXEC, "xkill"),
	99	- ("ASClock", EXEC, "asclock -shape"),
	100	- ("Clipboard", EXEC, "xclipboard")
	101	- ),
b6fb2731	102	+ ("Applications", OPEN_MENU, "\| wmconfig --output wmaker --rootmenu Applications 2>/dev/null "),
c8d02bd2	103	("Selection",
3542dd94	104	("Copy", SHEXEC, "echo '%s' \| wxcopy"),
c8d02bd2	105	("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),