gnucash maint: Multiple changes pushed
Robert Fewell
bobit at code.gnucash.org
Tue Jul 26 05:23:16 EDT 2022
Updated via https://github.com/Gnucash/gnucash/commit/6b64c70c (commit)
via https://github.com/Gnucash/gnucash/commit/3a6f1ab1 (commit)
via https://github.com/Gnucash/gnucash/commit/5fa4b831 (commit)
from https://github.com/Gnucash/gnucash/commit/4b73dbc6 (commit)
commit 6b64c70c643cf8c5c4401ea8fe095f5bcb3b9685
Merge: 4b73dbc61 3a6f1ab1a
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Jul 26 09:38:25 2022 +0100
Merge Christian Wehling's branch 'help-buttons' into maint PR #1385
commit 3a6f1ab1a962d5730269233cfbda3f15c8e9ad2c
Author: Christian Wehling <christian.wehling at web.de>
Date: Mon Jul 25 17:20:16 2022 +0200
[dialog-price] Price Database: Insert help buttons
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index 14770a519..721446fc6 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -62,6 +62,7 @@ static QofLogModule log_module = GNC_MOD_GUI;
void gnc_prices_dialog_destroy_cb (GtkWidget *object, gpointer data);
void gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data);
+void gnc_prices_dialog_help_cb (GtkDialog *dialog, gpointer data);
void gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data);
void gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data);
void gnc_prices_dialog_remove_old_clicked (GtkWidget *widget, gpointer data);
@@ -134,6 +135,15 @@ gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data)
}
+void
+gnc_prices_dialog_help_cb (GtkDialog *dialog, gpointer data)
+{
+ PricesDialog *pdb_dialog = data;
+
+ gnc_gnome_help (GTK_WINDOW (pdb_dialog->window), HF_HELP, HL_PRICE_DB);
+}
+
+
void
gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data)
{
diff --git a/gnucash/gnome/dialog-price-editor.c b/gnucash/gnome/dialog-price-editor.c
index fba85ca64..6b36c6702 100644
--- a/gnucash/gnome/dialog-price-editor.c
+++ b/gnucash/gnome/dialog-price-editor.c
@@ -71,6 +71,7 @@ typedef struct
GtkWidget * type_combobox;
GtkWidget * price_edit;
+ GtkWidget * help_button;
GtkWidget * cancel_button;
GtkWidget * apply_button;
GtkWidget * ok_button;
@@ -371,6 +372,10 @@ pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
gnc_price_unref (pedit_dialog->price);
pedit_dialog->price = new_price;
}
+ else if (response == GTK_RESPONSE_HELP)
+ {
+ gnc_gnome_help (GTK_WINDOW (pedit_dialog->dialog), HF_HELP, HL_PRICE_EDIT);
+ }
else
{
gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(pedit_dialog->dialog));
@@ -544,6 +549,9 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
g_signal_connect (G_OBJECT (w), "changed",
G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
+ w = GTK_WIDGET(gtk_builder_get_object (builder, "pd_help_button"));
+ pedit_dialog->help_button = w;
+
w = GTK_WIDGET(gtk_builder_get_object (builder, "pd_cancel_button"));
pedit_dialog->cancel_button = w;
diff --git a/gnucash/gtkbuilder/dialog-price.glade b/gnucash/gtkbuilder/dialog-price.glade
index 887d9d450..e2178311f 100644
--- a/gnucash/gtkbuilder/dialog-price.glade
+++ b/gnucash/gtkbuilder/dialog-price.glade
@@ -55,6 +55,22 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="layout-style">end</property>
+ <child>
+ <object class="GtkButton" id="pd_help_button">
+ <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="pd_cancel_button">
<property name="label" translatable="yes">_Cancel</property>
@@ -67,7 +83,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>
@@ -81,7 +97,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -97,7 +113,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -334,6 +350,7 @@
</object>
</child>
<action-widgets>
+ <action-widget response="-11">pd_help_button</action-widget>
<action-widget response="-6">pd_cancel_button</action-widget>
<action-widget response="-10">pd_apply_button</action-widget>
<action-widget response="-5">pd_ok_button</action-widget>
@@ -782,13 +799,15 @@ These prices were added so that there's always a "nearest in time" price for eve
<property name="default-width">800</property>
<property name="default-height">400</property>
<child>
- <object class="GtkBox" id="vbox11">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="price_list_window">
<property name="visible">True</property>
@@ -799,163 +818,192 @@ These prices were added so that there's always a "nearest in time" price for eve
<property name="shadow-type">in</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-bottom">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox">
+ <object class="GtkButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="margin-bottom">12</property>
+ <property name="border-width">5</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="layout-style">start</property>
<child>
- <object class="GtkButtonBox" id="vbuttonbox1">
+ <object class="GtkButton" id="add_button">
+ <property name="label" translatable="yes">_Add</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="border-width">5</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <property name="layout-style">start</property>
- <child>
- <object class="GtkButton" id="add_button">
- <property name="label" translatable="yes">_Add</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="tooltip-text" translatable="yes">Add a new price.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_add_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_button">
- <property name="label" translatable="yes">_Remove</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Remove the current price.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="edit_button">
- <property name="label" translatable="yes">_Edit</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Edit the current price.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_old_button">
- <property name="label" translatable="yes">Remove _Old</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="tooltip-text" translatable="yes">Remove prices older than a user-entered date.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="get_quotes_button">
- <property name="label" translatable="yes">_Get Quotes</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="tooltip-text" translatable="yes">Get new online quotes for stock accounts.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Add a new price.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_add_clicked" swapped="no"/>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="vbuttonbox2">
+ <object class="GtkButton" id="remove_button">
+ <property name="label" translatable="yes">_Remove</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="valign">end</property>
- <property name="border-width">5</property>
- <property name="orientation">vertical</property>
- <property name="layout-style">start</property>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label" translatable="yes">_Close</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="valign">start</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_close_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Remove the current price.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="edit_button">
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Edit the current price.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="remove_old_button">
+ <property name="label" translatable="yes">Remove _Old</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="tooltip-text" translatable="yes">Remove prices older than a user-entered date.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="get_quotes_button">
+ <property name="label" translatable="yes">_Get Quotes</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="tooltip-text" translatable="yes">Get new online quotes for stock accounts.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="vbuttonbox2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="valign">end</property>
+ <property name="border-width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout-style">start</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label" translatable="yes">_Close</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="valign">start</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_close_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="valign">end</property>
+ <property name="layout-style">start</property>
+ <child>
+ <object class="GtkButton" id="help_button">
+ <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="margin-bottom">9</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_help_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
commit 5fa4b83169b70f7d273960dd2250fa2a7ddd2a61
Author: Christian Wehling <christian.wehling at web.de>
Date: Thu Jul 21 17:42:31 2022 +0200
[gnc-ui.h] Price Database: Insert new links to the help file
diff --git a/gnucash/gnome-utils/gnc-ui.h b/gnucash/gnome-utils/gnc-ui.h
index 40224c79b..1df87cd54 100644
--- a/gnucash/gnome-utils/gnc-ui.h
+++ b/gnucash/gnome-utils/gnc-ui.h
@@ -64,6 +64,8 @@
#define HL_COMMODITY "tool-commodity"
#define HL_FIND_TRANSACTIONS "tool-find"
#define HL_FIN_CALC "tool-calc"
+#define HL_PRICE_DB "tool-price"
+#define HL_PRICE_EDIT "tool-price-manual"
#define HL_GLOBPREFS "set-prefs"
#define HL_PRINTCHECK "print-check"
#define HL_RECNWIN "acct-reconcile"
Summary of changes:
gnucash/gnome-utils/gnc-ui.h | 2 +
gnucash/gnome/dialog-price-edit-db.c | 10 ++
gnucash/gnome/dialog-price-editor.c | 8 +
gnucash/gtkbuilder/dialog-price.glade | 312 ++++++++++++++++++++--------------
4 files changed, 200 insertions(+), 132 deletions(-)
More information about the gnucash-changes
mailing list