gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat May 21 19:55:52 EDT 2022
Updated via https://github.com/Gnucash/gnucash/commit/e38b1aa0 (commit)
via https://github.com/Gnucash/gnucash/commit/c0244c6f (commit)
from https://github.com/Gnucash/gnucash/commit/f18c70f6 (commit)
commit e38b1aa0ae78787c287d239f9907f4a6532a5c85
Merge: f18c70f68 c0244c6f1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 21 16:52:44 2022 -0700
Merge Christian Wehling's 'SLR help-buttons' into maint.
commit c0244c6f1cc38321abea9b9e328276f0afa83711
Author: Christian Wehling <christian.wehling at web.de>
Date: Sat May 14 17:36:33 2022 +0200
Bug 771095, partially solved. Inserting a help button in the
Since-Last-Run dialog.
diff --git a/gnucash/gnome-utils/gnc-ui.h b/gnucash/gnome-utils/gnc-ui.h
index bc7327d90..15eb774e0 100644
--- a/gnucash/gnome-utils/gnc-ui.h
+++ b/gnucash/gnome-utils/gnc-ui.h
@@ -67,6 +67,7 @@
#define HL_PRINTCHECK "print-check"
#define HL_RECNWIN "acct-reconcile"
#define HL_SXEDITOR "trans-sched"
+#define HL_SX_SLR "trans-sched-slr"
#define HL_BOOK_OPTIONS "book-options"
#define HL_STYLE_SHEET "change-style"
#define HL_CLOSE_BOOK "tool-close-book"
diff --git a/gnucash/gnome/dialog-sx-since-last-run.c b/gnucash/gnome/dialog-sx-since-last-run.c
index 594cf4cb4..00e0c0f78 100644
--- a/gnucash/gnome/dialog-sx-since-last-run.c
+++ b/gnucash/gnome/dialog-sx-since-last-run.c
@@ -1137,6 +1137,10 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog
GList* creation_errors = NULL;
switch (response_id)
{
+ case GTK_RESPONSE_HELP:
+ gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_SX_SLR);
+ break;
+
case GTK_RESPONSE_OK:
// @@fixme validate current state(GError *errs);
// - [ ] instance state constraints
diff --git a/gnucash/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade
index 124f490d6..deffc4dc0 100644
--- a/gnucash/gtkbuilder/dialog-sx.glade
+++ b/gnucash/gtkbuilder/dialog-sx.glade
@@ -1489,6 +1489,22 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="layout-style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton2">
+ <property name="label" translatable="yes">_Help</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
<child>
<object class="GtkButton" id="cancelbutton2">
<property name="label" translatable="yes">_Cancel</property>
@@ -1502,7 +1518,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1517,7 +1533,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -1604,6 +1620,7 @@
</object>
</child>
<action-widgets>
+ <action-widget response="-11">helpbutton2</action-widget>
<action-widget response="-6">cancelbutton2</action-widget>
<action-widget response="-5">okbutton2</action-widget>
</action-widgets>
Summary of changes:
gnucash/gnome-utils/gnc-ui.h | 1 +
gnucash/gnome/dialog-sx-since-last-run.c | 4 ++++
gnucash/gtkbuilder/dialog-sx.glade | 21 +++++++++++++++++++--
3 files changed, 24 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list