This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via 101ef6f28eb751550bff89ab4b2dc72dde4153cc (commit)
via 5a5595f76cf0e49065ce42d638d3c3997d61663a (commit)
via 1a5abe9d84aa1e6c0c494f1fe3661cc06e2bffb9 (commit)
via d364afff0295ad8487d29023f7cdc7e71e2a89da (commit)
via 273d17a0be1a00435e3b98791359b47908dab443 (commit)
from d6f754e7473c4303b29854e356cd47e68193977d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 101ef6f28eb751550bff89ab4b2dc72dde4153cc
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 17 Aug 2017 21:02:28 -0400
URL: <http://repo.or.cz/wmaker-crm.git/101ef6f28eb75155>
menu: For consistency, use appearance.menu for English-language menus.
---
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 bebab5f2f681..429f8bec2a26 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 f2d692fdcd31..9eeba280377b 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),
commit 5a5595f76cf0e49065ce42d638d3c3997d61663a
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 17 Aug 2017 21:02:27 -0400
URL: <http://repo.or.cz/wmaker-crm.git/5a5595f76cf0e490>
menu: Add WPrefs to appearance.menu.
WPrefs appears under the 'Appearances' submenu of both menu and plmenu.
---
WindowMaker/Makefile.am | 2 +-
WindowMaker/{appearance.menu => appearance.menu.in} | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
rename WindowMaker/{appearance.menu => appearance.menu.in} (92%)
diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index 51fab0c8e2f4..14e409618045 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -6,6 +6,7 @@ wpexecbindir = @wprefs_bindir@
# menus which need generated to have correct path to WPrefs or data directory
GENERATED_MENUS =\
+ appearance.menu\
menu\
menu.bg\
menu.fi\
@@ -60,7 +61,6 @@ NONGENERATED_MENUS =\
plmenu.it
dist_prefsdata_DATA =\
- appearance.menu\
autostart.sh\
background.menu\
exitscript.sh\
diff --git a/WindowMaker/appearance.menu b/WindowMaker/appearance.menu.in
similarity index 92%
rename from WindowMaker/appearance.menu
rename to WindowMaker/appearance.menu.in
index 024a852cd6cb..4e2598342661 100644
--- a/WindowMaker/appearance.menu
+++ b/WindowMaker/appearance.menu.in
@@ -7,5 +7,6 @@ Appearance MENU
"Icon Sets" OPEN_MENU -noext LOCAL_ICON_SETS_DIR 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)"
+ "Preferences Utility" EXEC #wprefs#
Appearance END
commit 1a5abe9d84aa1e6c0c494f1fe3661cc06e2bffb9
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 17 Aug 2017 21:02:26 -0400
URL: <http://repo.or.cz/wmaker-crm.git/1a5abe9d84aa1e6c>
menu: Add Bluemarine to solid background color options.
This color was present in menu and plmenu, but not background.menu.
---
WindowMaker/background.menu | 1 +
1 file changed, 1 insertion(+)
diff --git a/WindowMaker/background.menu b/WindowMaker/background.menu
index fce1c2405ae7..c34961765c7a 100644
--- a/WindowMaker/background.menu
+++ b/WindowMaker/background.menu
@@ -5,6 +5,7 @@
"Black" WS_BACK '(solid, black)'
"Blue" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
+ "Bluemarine" WS_BACK '(solid, "#224477")'
"Deep Blue" WS_BACK '(solid, "#180090")'
"Purple" WS_BACK '(solid, "#554466")'
"Wheat" WS_BACK '(solid, "wheat4")'
commit d364afff0295ad8487d29023f7cdc7e71e2a89da
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 17 Aug 2017 21:02:25 -0400
URL: <http://repo.or.cz/wmaker-crm.git/d364afff0295ad84>
menu: Write data directory during build instead of with wmaker.inst.
Many of the menu files contain the macro #wmdatadir# as a placeholder for
the data directory containing Window Maker themes, styles, background
pixmaps, etc. This macro is replaced by the the actual path to the data
directory (by default /usr/local/share/WindowMaker) by the wmaker.inst
script, but only when copying WMRootMenu to the user's home directory.
Instead, we replace the macro during the build. This way, *every* menu
file has the correct path.
Note that several of the files in question were not previously generated
during build. These have been renamed with a .in extension.
---
WindowMaker/Makefile.am | 16 ++++++++--------
WindowMaker/{plmenu.pl => plmenu.pl.in} | 0
WindowMaker/{plmenu.zh_CN => plmenu.zh_CN.in} | 0
WindowMaker/{wmmacros => wmmacros.in} | 0
util/wmaker.inst.in | 6 +-----
5 files changed, 9 insertions(+), 13 deletions(-)
rename WindowMaker/{plmenu.pl => plmenu.pl.in} (100%)
rename WindowMaker/{plmenu.zh_CN => plmenu.zh_CN.in} (100%)
rename WindowMaker/{wmmacros => wmmacros.in} (100%)
diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index e648d54279ec..51fab0c8e2f4 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -4,7 +4,7 @@ prefsdatadir = $(pkgdatadir)
wpexecbindir = @wprefs_bindir@
-# menus which need generated to have correct path to WPrefs
+# menus which need generated to have correct path to WPrefs or data directory
GENERATED_MENUS =\
menu\
menu.bg\
@@ -24,11 +24,14 @@ GENERATED_MENUS =\
plmenu.ja\
plmenu.ko\
plmenu.nl\
+ plmenu.pl\
plmenu.ro\
plmenu.sk\
- plmenu.zh_TW
+ plmenu.zh_CN\
+ plmenu.zh_TW\
+ wmmacros
-# menus which do not mention WPrefs
+# menus which do not mention WPrefs or data directory
NONGENERATED_MENUS =\
menu.ca\
menu.cz\
@@ -54,9 +57,7 @@ NONGENERATED_MENUS =\
plmenu.de\
plmenu.fr\
plmenu.hr\
- plmenu.it\
- plmenu.pl\
- plmenu.zh_CN
+ plmenu.it
dist_prefsdata_DATA =\
appearance.menu\
@@ -65,7 +66,6 @@ dist_prefsdata_DATA =\
exitscript.sh\
README\
README.themes\
- wmmacros\
$(NONGENERATED_MENUS)
nodist_prefsdata_DATA = $(GENERATED_MENUS)
@@ -76,4 +76,4 @@ CLEANFILES = $(GENERATED_MENUS)
$(GENERATED_MENUS):
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
- $(srcdir)/$@.in > $@
+ -e "s:#wmdatadir#:$(pkgdatadir):" $(srcdir)/$@.in > $@
diff --git a/WindowMaker/plmenu.pl b/WindowMaker/plmenu.pl.in
similarity index 100%
rename from WindowMaker/plmenu.pl
rename to WindowMaker/plmenu.pl.in
diff --git a/WindowMaker/plmenu.zh_CN b/WindowMaker/plmenu.zh_CN.in
similarity index 100%
rename from WindowMaker/plmenu.zh_CN
rename to WindowMaker/plmenu.zh_CN.in
diff --git a/WindowMaker/wmmacros b/WindowMaker/wmmacros.in
similarity index 100%
rename from WindowMaker/wmmacros
rename to WindowMaker/wmmacros.in
diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in
index 4aeac6523b3a..2e3f3ef740a4 100644
--- a/util/wmaker.inst.in
+++ b/util/wmaker.inst.in
@@ -62,12 +62,8 @@ copy() {
if [ "$file" = "WindowMaker" ]; then
sed -e "s|~/GNUstep|$GSDIR|g" "$source" > "$target"
else
- if test "x$GNUSTEP_USER_ROOT" = "x"; then
- sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
- "$source" > "$target"
- else
+ if test "x$GNUSTEP_USER_ROOT" != "x"; then
sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
- -e "s:#wmdatadir#:$GLOBALDIR:g" \
"$source" > "$target"
fi
fi
commit 273d17a0be1a00435e3b98791359b47908dab443
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 17 Aug 2017 21:02:24 -0400
URL: <http://repo.or.cz/wmaker-crm.git/273d17a0be1a0043>
menu: Include all aspect ratio options for background pixmap.
The background menu was missing "centered", "maximized", and "filled".
This closes Debian bug #85591 [1]:
The current default for the scaled backgrounds menu is to use
scaling without keeping the aspect ratio.
This very rarely yields to a usable background.
Could the default be changed to scaling with keeping the aspect
ratio ?
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=85591
---
WindowMaker/background.menu | 3 +++
1 file changed, 3 insertions(+)
diff --git a/WindowMaker/background.menu b/WindowMaker/background.menu
index d1f4b10b01f0..fce1c2405ae7 100644
--- a/WindowMaker/background.menu
+++ b/WindowMaker/background.menu
@@ -24,5 +24,8 @@
"Images" MENU
"Tiled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Scaled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
+ "Centered" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
+ "Maximized" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
+ "Filled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Image" END
"Background" END
-----------------------------------------------------------------------
Summary of changes:
WindowMaker/Makefile.am | 18 +++++------
.../{appearance.menu => appearance.menu.in} | 1 +
WindowMaker/background.menu | 4 +++
WindowMaker/menu.in | 32 +------------------
WindowMaker/plmenu.in | 32 +------------------
WindowMaker/{plmenu.pl => plmenu.pl.in} | 0
WindowMaker/{plmenu.zh_CN => plmenu.zh_CN.in} | 0
WindowMaker/{wmmacros => wmmacros.in} | 0
util/wmaker.inst.in | 6 +---
9 files changed, 17 insertions(+), 76 deletions(-)
rename WindowMaker/{appearance.menu => appearance.menu.in} (92%)
rename WindowMaker/{plmenu.pl => plmenu.pl.in} (100%)
rename WindowMaker/{plmenu.zh_CN => plmenu.zh_CN.in} (100%)
rename WindowMaker/{wmmacros => wmmacros.in} (100%)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
