From 7c89ca2551d00dfc89e5533b8d5d4cec8e1f89ba Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Tue, 15 May 2018 14:14:14 -0400 Subject: [PATCH] menu: Fix broken "Save Theme" option. This option had been broken for several reasons: * The getstyle utility does not replace the #usergnusteppath# macro which was passed to it by the menu. * When processing the USER_THEMES_DIR macro, the menu inserts a space afterwards, and so the directory and filename were passed to getstyle as two separate arguments. * It used the old, pre-0.50.0 theme format. By using the -p option to getstyle, we can avoid these issues, as we don't need to specify the directory *and* it uses the 'new' (since 1999) themepack format. --- WindowMaker/appearance.menu.fy.in | 2 +- WindowMaker/appearance.menu.in | 2 +- WindowMaker/appearance.menu.nl.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WindowMaker/appearance.menu.fy.in b/WindowMaker/appearance.menu.fy.in index c007b9d2..c5576dc6 100644 --- a/WindowMaker/appearance.menu.fy.in +++ b/WindowMaker/appearance.menu.fy.in @@ -6,7 +6,7 @@ Uterlik MENU "Tema's" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle "Ikoanesets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons "Ikoaneset bewarje" EXEC geticonset USER_ICON_SETS_DIR/"%a(Ikoanesetnamme)" - "Tema bewarje" EXEC getstyle -t USER_THEMES_DIR/"%a(Temanamme)" + "Tema bewarje" EXEC getstyle -p "%a(Temanamme)" "Foarkarrehelpmiddel" EXEC #wprefs# Uterlik END diff --git a/WindowMaker/appearance.menu.in b/WindowMaker/appearance.menu.in index 99759b15..3833ac42 100644 --- a/WindowMaker/appearance.menu.in +++ b/WindowMaker/appearance.menu.in @@ -6,7 +6,7 @@ Appearance MENU "Themes" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle "Icon Sets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons "Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)" - "Save Theme" EXEC getstyle -t USER_THEMES_DIR/"%a(Theme name)" + "Save Theme" EXEC getstyle -p "%a(Theme name)" "Preferences Utility" EXEC #wprefs# Appearance END diff --git a/WindowMaker/appearance.menu.nl.in b/WindowMaker/appearance.menu.nl.in index f8bedde1..d4d9865b 100644 --- a/WindowMaker/appearance.menu.nl.in +++ b/WindowMaker/appearance.menu.nl.in @@ -6,7 +6,7 @@ Uiterlijk MENU "Thema's" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle "Iconensets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons "Iconenset opslaan" EXEC geticonset USER_ICON_SETS_DIR/"%a(Iconensetnaam)" - "Thema opslaan" EXEC getstyle -t USER_THEMES_DIR/"%a(Themanaam)" + "Thema opslaan" EXEC getstyle -p "%a(Themanaam)" "Voorkeurenhulpmiddel" EXEC #wprefs# Uiterlijk END