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 2dbd778ed4580ab63de7d26d30326fd8717584e4 (commit)
via f63635dd17fc60a95845dde60d3576c48d5633b3 (commit)
via 97702618deb5ae613e6b8e91834886d5b1377c5a (commit)
from b68a1994c22651858e69f63a35e046cbf93f1eb5 (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 2dbd778ed4580ab63de7d26d30326fd8717584e4
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Sat, 19 Aug 2017 10:48:44 -0400
URL: <http://repo.or.cz/wmaker-crm.git/2dbd778ed4580ab6>
WPrefs: Inform user which menu file is being edited.
---
WPrefs.app/Menu.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 3caf4975daeb..54e53faad7b6 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -1483,7 +1483,7 @@ static WMPropList *getDefaultMenu(_Panel * panel)
static void showData(_Panel * panel)
{
const char *gspath;
- char *menuPath;
+ char *menuPath, *labelText;
char buf[1024];
WMPropList *pmenu;
@@ -1554,6 +1554,14 @@ static void showData(_Panel * panel)
panel->menuPath = menuPath;
+ snprintf(buf, 1024,
+ _("\n\nWhen saved, the menu will be written to the
file\n\"%s\"."),
+ menuPath);
+ labelText = WMGetLabelText(panel->sections[NoInfo][0]);
+ labelText = wstrconcat(labelText, buf);
+ WMSetLabelText(panel->sections[NoInfo][0], labelText);
+ wfree(labelText);
+
buildMenuFromPL(panel, pmenu);
WMReleasePropList(pmenu);
commit f63635dd17fc60a95845dde60d3576c48d5633b3
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Sat, 19 Aug 2017 10:48:43 -0400
URL: <http://repo.or.cz/wmaker-crm.git/f63635dd17fc60a9>
WPrefs: Save menu back to the file we read it from.
Previously, we saved any modifications back to WMRootMenu, regardless of
the file we read the menu from.
---
WPrefs.app/Menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 6e682b575173..3caf4975daeb 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -1527,7 +1527,7 @@ static void showData(_Panel * panel)
}
pmenu = WMReadPropListFromFile(path);
- wfree(path);
+ menuPath = path;
}
if (!pmenu || !WMIsPLArray(pmenu)) {
commit 97702618deb5ae613e6b8e91834886d5b1377c5a
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Sat, 19 Aug 2017 10:48:42 -0400
URL: <http://repo.or.cz/wmaker-crm.git/97702618deb5ae61>
WPrefs: Display warning when attempting to modify a read-only menu file.
---
WPrefs.app/Menu.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index a18e495e637c..6e682b575173 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -1484,6 +1484,7 @@ static void showData(_Panel * panel)
{
const char *gspath;
char *menuPath;
+ char buf[1024];
WMPropList *pmenu;
gspath = wusergnusteppath();
@@ -1510,6 +1511,21 @@ static void showData(_Panel * panel)
if (!path)
break;
+ if (access(path, W_OK) < 0) {
+ snprintf(buf, 1024,
+ _("The menu file \"%s\" referenced by "
+ "WMRootMenu is read-only.\n"
+ "You cannot use WPrefs to modify it."),
+ path);
+ WMRunAlertPanel(WMWidgetScreen(panel->parent),
+ panel->parent,
+ _("Warning"), buf,
+ _("OK"), NULL, NULL);
+ panel->dontSave = True;
+ wfree(path);
+ return;
+ }
+
pmenu = WMReadPropListFromFile(path);
wfree(path);
}
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Menu.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
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.
