[PATCH 5/5] menu: For consistency, use appearance.menu for English-language menus.

Doug Torrance <[email protected]> Thu, 17 Aug 2017 21:02:28 -0400
Newsgroups gmane.compw.window-managers.windowmaker.devel
Message-ID <[email protected]>
---
 WindowMaker/menu.in   | 32 +-------------------------------
 WindowMaker/plmenu.in | 32 +-------------------------------
 2 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/WindowMaker/menu.in b/WindowMaker/menu.in
index bebab5f2..429f8bec 100644
--- a/WindowMaker/menu.in
+++ b/WindowMaker/menu.in
@@ -179,37 +179,7 @@
 		"Lock" EXEC xlock -allowroot -usefirst
 	"Commands" END
 
-	"Appearance" MENU
-		"Themes" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-		"Styles" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-		"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
-		"Background" MENU
-			"Solid" MENU
-				"Black" WS_BACK '(solid, black)'
-				"Blue"  WS_BACK '(solid, "#505075")'
-				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Bluemarine" WS_BACK '(solid, "#224477")'
-				"Purple" WS_BACK '(solid, "#554466")'
-				"Wheat"  WS_BACK '(solid, "wheat4")'
-				"Dark Gray"  WS_BACK '(solid, "#333340")'
-				"Wine" WS_BACK '(solid, "#400020")'
-				"Solid" END
-			"Gradient" MENU
-				"Sunset" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
-				"Sky" WS_BACK '(vgradient, blue4, white)'
-    			"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
-				"Indigo Shades" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    "Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
-    			"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
-    			"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
-    			"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
-			"Gradient" END
-			"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
-		"Background" END
-		"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
-		"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Preferences Utility" EXEC #wprefs#
-	"Appearance" END
+	"Appearance" OPEN_MENU "appearance.menu"
 
 	"Session" MENU
 		"Save Session" SAVE_SESSION
diff --git a/WindowMaker/plmenu.in b/WindowMaker/plmenu.in
index f2d692fd..9eeba280 100644
--- a/WindowMaker/plmenu.in
+++ b/WindowMaker/plmenu.in
@@ -64,37 +64,7 @@
   ("Refresh", REFRESH),
   ("Lock", EXEC, "xlock -allowroot -usefirst")
  ),
- ("Appearance",
-  ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-  ("Background",
-   ("Solid",
-	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-	("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\")'"),
-	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-   ),
-   ("Gradient",
-	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-   ),
-   ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-   ),
-   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-   ("Preferences Utility", EXEC, "#wprefs#")
-   ),
+ ("Appearance", OPEN_MENU, "appearance.menu"),
    ("Session",
     ("Save Session", SAVE_SESSION),
     ("Clear Session", CLEAR_SESSION),
-- 
2.11.0


-- 
To unsubscribe, send mail to [email protected].