gnucash stable: Multiple changes pushed
Robert Fewell
bobit at code.gnucash.org
Mon Mar 10 06:17:34 EDT 2025
Updated via https://github.com/Gnucash/gnucash/commit/ad4c3f68 (commit)
via https://github.com/Gnucash/gnucash/commit/c23d8cdf (commit)
via https://github.com/Gnucash/gnucash/commit/bdf7c36d (commit)
via https://github.com/Gnucash/gnucash/commit/76b25758 (commit)
via https://github.com/Gnucash/gnucash/commit/ac2511bd (commit)
via https://github.com/Gnucash/gnucash/commit/d924e3f6 (commit)
via https://github.com/Gnucash/gnucash/commit/6be4c3c3 (commit)
via https://github.com/Gnucash/gnucash/commit/79c6c373 (commit)
from https://github.com/Gnucash/gnucash/commit/6f722be6 (commit)
commit ad4c3f681da349c7b4d4b9a7cf7f80beb56a6806
Merge: 6f722be642 c23d8cdf5b
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Mar 10 10:07:03 2025 +0000
Merge Simon Arlott 'jump-multiple-splits' into stable
commit c23d8cdf5ba479036eb796999b58d27498d6692f
Author: Simon Arlott <sa.me.uk>
Date: Fri Jan 31 20:50:41 2025 +0000
When using "Jump" with more than two splits, expand the transaction
If there are more than two splits it may not be obvious why a transaction
has been selected in the basic register mode, so expand the transaction to
show the split that's in this register and also to indicate which split was
followed to reach this transaction.
diff --git a/gnucash/gnome/gnc-plugin-page-register.cpp b/gnucash/gnome/gnc-plugin-page-register.cpp
index 533260e97a..b5f5fcf494 100644
--- a/gnucash/gnome/gnc-plugin-page-register.cpp
+++ b/gnucash/gnome/gnc-plugin-page-register.cpp
@@ -4985,6 +4985,8 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
Account* account;
Account* leader;
Split* split;
+ Split* other_split;
+ gboolean multiple_splits;
ENTER ("(action %p, page %p)", simple, page);
@@ -5013,6 +5015,9 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
return;
}
+ other_split = xaccSplitGetOtherSplit (split);
+ multiple_splits = other_split == NULL;
+
leader = gnc_ledger_display_leader (priv->ledger);
if (account == leader)
{
@@ -5040,8 +5045,7 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
return;
}
- Split* other_split = xaccSplitGetOtherSplit (split);
- if (other_split == NULL)
+ if (multiple_splits)
{
other_split = jump_multiple_splits (account, split);
}
@@ -5105,11 +5109,30 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
gnc_main_window_open_page (GNC_MAIN_WINDOW (window), new_page);
gsr = gnc_plugin_page_register_get_gsr (new_page);
+ SplitRegister *new_page_reg = gnc_ledger_display_get_split_register (gsr->ledger);
+ gboolean jump_twice = FALSE;
+
+ /* Selecting the split (instead of just the transaction to open the "other"
+ * account) requires jumping a second time after expanding the transaction,
+ * in the basic and auto ledger modes.
+ */
+ if (new_page_reg->style != REG_STYLE_JOURNAL)
+ jump_twice = TRUE;
+
/* Test for visibility of split */
if (gnc_split_reg_clear_filter_for_split (gsr, split))
gnc_plugin_page_register_clear_current_filter (GNC_PLUGIN_PAGE(new_page));
gnc_split_reg_jump_to_split (gsr, split);
+
+ if (multiple_splits && jump_twice)
+ {
+ /* Expand the transaction for the basic and auto ledger to identify the
+ * split in this register, but only if there are more than two splits.
+ */
+ gnc_split_register_expand_current_trans (new_page_reg, TRUE);
+ gnc_split_reg_jump_to_split (gsr, split);
+ }
LEAVE (" ");
}
commit bdf7c36d7d164e05fa3372379b67363659bea622
Author: Simon Arlott <sa.me.uk>
Date: Mon Jun 5 20:09:57 2023 +0100
Add warnings to the "Jump" operation instead of doing nothing
diff --git a/gnucash/gnome/gnc-plugin-page-register.cpp b/gnucash/gnome/gnc-plugin-page-register.cpp
index f8f3843ffc..533260e97a 100644
--- a/gnucash/gnome/gnc-plugin-page-register.cpp
+++ b/gnucash/gnome/gnc-plugin-page-register.cpp
@@ -4897,6 +4897,10 @@ jump_multiple_splits_by_single_account (Account *account, Split *split)
other_split = s;
}
+ // Jump to the same account so that the right warning is triggered
+ if (!other_split)
+ other_split = split;
+
return other_split;
}
@@ -4938,6 +4942,10 @@ jump_multiple_splits_by_value (Account *account, Split *split, gboolean largest)
other_split = s;
}
+ // Jump to the same account so that the right warning is triggered
+ if (!other_split)
+ other_split = split;
+
return other_split;
}
@@ -5039,6 +5047,20 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
}
if (other_split == NULL)
{
+ GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW(window),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL
+ | GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_NONE,
+ "%s",
+ _("Unable to jump to other account"));
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
+ "%s", _("This transaction involves more than one other account. Select a specific split to jump to that account."));
+ gtk_dialog_add_button (GTK_DIALOG(dialog), _("_OK"), GTK_RESPONSE_OK);
+ gnc_dialog_run (GTK_DIALOG(dialog), GNC_PREF_WARN_REG_TRANS_JUMP_MULTIPLE_SPLITS);
+ gtk_widget_destroy (dialog);
+
LEAVE ("no split (2)");
return;
}
@@ -5054,6 +5076,20 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
if (account == leader)
{
+ GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW(window),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL
+ | GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_NONE,
+ "%s",
+ _("Unable to jump to other account"));
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
+ "%s", _("This transaction only involves the current account so there is no other account to jump to."));
+ gtk_dialog_add_button (GTK_DIALOG(dialog), _("_OK"), GTK_RESPONSE_OK);
+ gnc_dialog_run (GTK_DIALOG(dialog), GNC_PREF_WARN_REG_TRANS_JUMP_SINGLE_ACCOUNT);
+ gtk_widget_destroy (dialog);
+
LEAVE ("register open for account");
return;
}
diff --git a/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in b/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in
index 8db0304cd7..253553124c 100644
--- a/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in
@@ -124,6 +124,16 @@
<summary>Commit changes to a transaction</summary>
<description>This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded.</description>
</key>
+ <key name="reg-trans-jump-multiple-splits" type="i">
+ <default>0</default>
+ <summary>Jump when there are multiple other accounts</summary>
+ <description>This dialog is presented when you are unable to jump on a transaction because it has splits for multiple other accounts. A specific split must be selected to jump to the other account.</description>
+ </key>
+ <key name="reg-trans-jump-single-account" type="i">
+ <default>0</default>
+ <summary>Jump when there are no other accounts</summary>
+ <description>This dialog is presented when you are unable to jump on a transaction because it only has splits for the current account.</description>
+ </key>
</schema>
<schema id="org.gnucash.GnuCash.warnings.temporary" path="/org/gnucash/GnuCash/warnings/temporary/">
@@ -247,5 +257,15 @@
<summary>Commit changes to a transaction</summary>
<description>This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded.</description>
</key>
+ <key name="reg-trans-jump-multiple-splits" type="i">
+ <default>0</default>
+ <summary>Jump when there are multiple other accounts</summary>
+ <description>This dialog is presented when you are unable to jump on a transaction because it has splits for multiple other accounts. A specific split must be selected to jump to the other account.</description>
+ </key>
+ <key name="reg-trans-jump-single-account" type="i">
+ <default>0</default>
+ <summary>Jump when there are no other accounts</summary>
+ <description>This dialog is presented when you are unable to jump on a transaction because it only has splits for the current account.</description>
+ </key>
</schema>
</schemalist>
commit 76b257584843150ad8c111c61b591dfabf7ac629
Author: Simon Arlott <sa.me.uk>
Date: Mon Jun 5 20:17:37 2023 +0100
Allow warning dialogs to be the dismiss-only variant
All existing dialogs are either QUESTION or WARNING.
Allow INFO, ERROR and OTHER to remember being dismissed without asking a
question.
diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
index 01f8c49b75..e96e4d77e3 100644
--- a/gnucash/gnome-utils/dialog-utils.c
+++ b/gnucash/gnome-utils/dialog-utils.c
@@ -749,18 +749,12 @@ gnc_dialog_run (GtkDialog *dialog, const gchar *pref_name)
return response;
/* Add in the checkboxes to find out if the answer should be remembered. */
-#if 0
if (GTK_IS_MESSAGE_DIALOG(dialog))
{
GtkMessageType type;
g_object_get(dialog, "message-type", &type, (gchar*)NULL);
- ask = (type == GTK_MESSAGE_QUESTION);
+ ask = (type == GTK_MESSAGE_QUESTION || type == GTK_MESSAGE_WARNING);
}
- else
- {
- ask = FALSE;
- }
-#endif
perm = gtk_check_button_new_with_mnemonic
(ask
? _("Remember and don't _ask me again.")
commit ac2511bd5ad5889c24f827d2e513faf676241bf2
Author: Simon Arlott <sa.me.uk>
Date: Mon Jun 5 12:41:20 2023 +0100
Fallback register "Jump" operation to the only other account
There may be multiple splits but only one other account. In this scenario
we can jump to the first split for that account.
diff --git a/gnucash/gnome/gnc-plugin-page-register.cpp b/gnucash/gnome/gnc-plugin-page-register.cpp
index 970d8f45b7..f8f3843ffc 100644
--- a/gnucash/gnome/gnc-plugin-page-register.cpp
+++ b/gnucash/gnome/gnc-plugin-page-register.cpp
@@ -4862,6 +4862,44 @@ gnc_plugin_page_register_cmd_exchange_rate (GSimpleAction *simple,
LEAVE (" ");
}
+static Split*
+jump_multiple_splits_by_single_account (Account *account, Split *split)
+{
+ Transaction *trans;
+ SplitList *splits;
+ Account *other_account = NULL;
+ Split *other_split = NULL;
+
+ trans = xaccSplitGetParent(split);
+ if (!trans)
+ return NULL;
+
+ for (splits = xaccTransGetSplitList(trans); splits; splits = splits->next)
+ {
+ Split *s = (Split*)splits->data;
+ Account *a = xaccSplitGetAccount(s);
+
+ if (!xaccTransStillHasSplit(trans, s))
+ continue;
+
+ if (a == account)
+ continue;
+
+ if (other_split)
+ {
+ if (other_account != a)
+ return NULL;
+
+ continue;
+ }
+
+ other_account = a;
+ other_split = s;
+ }
+
+ return other_split;
+}
+
static Split*
jump_multiple_splits_by_value (Account *account, Split *split, gboolean largest)
{
@@ -4921,7 +4959,8 @@ jump_multiple_splits (Account* account, Split *split)
break;
}
- return NULL;
+ // If there's only one other account, use that one
+ return jump_multiple_splits_by_single_account (account, split);
}
static void
commit d924e3f6248ba5f46b638f00845ae97757e23751
Author: Simon Arlott <sa.me.uk>
Date: Sat Jun 3 21:18:54 2023 +0100
Register preference "Jump action for multiple splits"
Make the behaviour when the "Jump" operation encounters a transaction with
more than two splits configurable.
This can be configured as:
* Do nothing (this is the default)
* Use the split with the largest value
* Use the split with the smallest value
This makes it much easier to jump between accounts for stock transactions
that include splits for fees and taxes, or dividend transactions that have
a zero value split for the stock account.
diff --git a/gnucash/gnome/gnc-plugin-page-register.cpp b/gnucash/gnome/gnc-plugin-page-register.cpp
index 2069b40fc6..970d8f45b7 100644
--- a/gnucash/gnome/gnc-plugin-page-register.cpp
+++ b/gnucash/gnome/gnc-plugin-page-register.cpp
@@ -91,6 +91,14 @@
#include "qofbookslots.h"
#include "gnc-gtk-utils.h"
+/* gschema: org.gnucash.GnuCash.general.register.JumpMultipleSplits */
+typedef enum : gint
+{
+ JUMP_DEFAULT = 0, /* Do nothing */
+ JUMP_LARGEST_VALUE_FIRST_SPLIT = 1,
+ JUMP_SMALLEST_VALUE_FIRST_SPLIT = 2,
+} GncPrefJumpMultSplits;
+
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_GUI;
@@ -4854,6 +4862,68 @@ gnc_plugin_page_register_cmd_exchange_rate (GSimpleAction *simple,
LEAVE (" ");
}
+static Split*
+jump_multiple_splits_by_value (Account *account, Split *split, gboolean largest)
+{
+ Transaction *trans;
+ SplitList *splits;
+ Split *other_split = NULL;
+ gnc_numeric best;
+ int cmp = largest ? 1 : -1;
+
+ trans = xaccSplitGetParent(split);
+ if (!trans)
+ return NULL;
+
+ for (splits = xaccTransGetSplitList(trans); splits; splits = splits->next)
+ {
+ Split *s = (Split*)splits->data;
+ gnc_numeric value;
+
+ if (!xaccTransStillHasSplit(trans, s))
+ continue;
+
+ if (xaccSplitGetAccount(s) == account)
+ continue;
+
+ value = gnc_numeric_abs(xaccSplitGetValue(s));
+ if (gnc_numeric_check(value))
+ continue;
+
+ /* For splits with the same value as the best, the first split
+ * encountered is used.
+ */
+ if (other_split && gnc_numeric_compare(value, best) != cmp)
+ continue;
+
+ best = value;
+ other_split = s;
+ }
+
+ return other_split;
+}
+
+static Split*
+jump_multiple_splits (Account* account, Split *split)
+{
+ GncPrefJumpMultSplits mode = (GncPrefJumpMultSplits)gnc_prefs_get_enum(GNC_PREFS_GROUP_GENERAL_REGISTER, GNC_PREF_JUMP_MULT_SPLITS);
+
+ switch (mode)
+ {
+ case JUMP_LARGEST_VALUE_FIRST_SPLIT:
+ return jump_multiple_splits_by_value (account, split, TRUE);
+
+ case JUMP_SMALLEST_VALUE_FIRST_SPLIT:
+ return jump_multiple_splits_by_value (account, split, FALSE);
+
+ case JUMP_DEFAULT:
+ default:
+ break;
+ }
+
+ return NULL;
+}
+
static void
gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
GVariant *paramter,
@@ -4911,7 +4981,9 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
*
* If you've selected a split for this account, for consistency with
* selecting the split of another account we should do nothing.
- * You're already on the account for the split you selected.
+ * You're already on the account for the split you selected. Jumping
+ * to the "other" account now would make the "multiple split"
+ * options confusing.
*
* We could jump to a different anchoring split but that'll be very
* subtle and only cause problems because it'll have to save any
@@ -4921,13 +4993,19 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
return;
}
- split = xaccSplitGetOtherSplit (split);
- if (split == NULL)
+ Split* other_split = xaccSplitGetOtherSplit (split);
+ if (other_split == NULL)
+ {
+ other_split = jump_multiple_splits (account, split);
+ }
+ if (other_split == NULL)
{
LEAVE ("no split (2)");
return;
}
+ split = other_split;
+
account = xaccSplitGetAccount (split);
if (account == NULL)
{
diff --git a/gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in b/gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in
index 933a6507c0..3d32c99b5a 100644
--- a/gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in
@@ -235,6 +235,12 @@
<child name="report" schema="org.gnucash.GnuCash.general.report"/>
</schema>
+ <enum id="org.gnucash.GnuCash.general.register.JumpMultipleSplits"><!-- enum GncPrefJumpMultSplits -->
+ <value nick="default" value="0"/>
+ <value nick="largest-value-first-split" value="1"/>
+ <value nick="smallest-value-first-split" value="2"/>
+ </enum>
+
<schema id="org.gnucash.GnuCash.general.register" path="/org/gnucash/GnuCash/general/register/">
<key name="use-gnucash-color-theme" type="b">
<default>true</default>
@@ -256,6 +262,11 @@
<summary>Move to Transfer field when memorised transaction auto filled</summary>
<description>If active then after a memorised transaction is automatically filled in the cursor will move to the Transfer field. If not active then it skips to the value field.</description>
</key>
+ <key name="jump-multiple-splits" enum="org.gnucash.GnuCash.general.register.JumpMultipleSplits">
+ <default>'default'</default>
+ <summary>"Jump" behaviour when there are multiple splits</summary>
+ <description>Select how the "Jump" operation should behave when a transaction has multiple splits.</description>
+ </key>
<key name="use-new-window" type="b">
<default>false</default>
<summary>Create a new window for each new register</summary>
@@ -337,7 +348,7 @@
<description>This sets the number of characters before auto complete starts for description, notes and memo fields.</description>
</key>
</schema>
-
+
<schema id="org.gnucash.GnuCash.general.report" path="/org/gnucash/GnuCash/general/report/">
<key name="use-new-window" type="b">
<default>false</default>
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index ee6977bf9f..0545d7c32a 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -2578,7 +2578,9 @@ many months before the current month</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"><b>Reconciling</b></property>
+ <property name="label" translatable="yes"><b>Jump action for multiple splits</b></property>
+ <property name="tooltip-markup">Transaction jump action when there are more than two splits.</property>
+ <property name="tooltip-text" translatable="yes">Transaction jump action when there are more than two splits.</property>
<property name="use-markup">True</property>
</object>
<packing>
@@ -2586,6 +2588,88 @@ many months before the current month</property>
<property name="top-attach">5</property>
</packing>
</child>
+ <child>
+ <object class="GtkRadioButton" id="pref/general.register/jump-multiple-splits=default">
+ <property name="label" translatable="yes">Do _nothing</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="has-tooltip">True</property>
+ <property name="tooltip-markup">Do nothing.</property>
+ <property name="tooltip-text" translatable="yes">Do nothing.</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="pref/general.register/jump-multiple-splits=largest-value-first-split">
+ <property name="label" translatable="yes">Go to the first split with the _largest value</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="has-tooltip">True</property>
+ <property name="tooltip-markup">Use the first split with the largest value to determine the other account.</property>
+ <property name="tooltip-text" translatable="yes">Use the first split with the largest value to determine the other account.</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">pref/general.register/jump-multiple-splits=default</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="pref/general.register/jump-multiple-splits=smallest-value-first-split">
+ <property name="label" translatable="yes">Go to the first split with the _smallest value</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="has-tooltip">True</property>
+ <property name="tooltip-markup">Use the first split with the smallest value to determine the other account.</property>
+ <property name="tooltip-text" translatable="yes">Use the first split with the smallest value to determine the other account.</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">pref/general.register/jump-multiple-splits=default</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"><b>Reconciling</b></property>
+ <property name="use-markup">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">10</property>
+ </packing>
+ </child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.reconcile/check-cleared">
<property name="label" translatable="yes">Check cleared _transactions</property>
@@ -2601,7 +2685,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">6</property>
+ <property name="top-attach">11</property>
</packing>
</child>
<child>
@@ -2619,7 +2703,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">7</property>
+ <property name="top-attach">12</property>
</packing>
</child>
<child>
@@ -2637,7 +2721,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">8</property>
+ <property name="top-attach">13</property>
</packing>
</child>
<child>
@@ -2647,7 +2731,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">9</property>
+ <property name="top-attach">14</property>
</packing>
</child>
<child>
@@ -2660,7 +2744,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">10</property>
+ <property name="top-attach">15</property>
</packing>
</child>
<child>
@@ -2678,7 +2762,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">11</property>
+ <property name="top-attach">16</property>
</packing>
</child>
<child>
@@ -2696,7 +2780,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">12</property>
+ <property name="top-attach">17</property>
</packing>
</child>
<child>
@@ -2714,7 +2798,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">13</property>
+ <property name="top-attach">18</property>
</packing>
</child>
<child>
@@ -2732,7 +2816,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">14</property>
+ <property name="top-attach">19</property>
</packing>
</child>
<child>
@@ -2742,7 +2826,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">15</property>
+ <property name="top-attach">20</property>
</packing>
</child>
<child>
@@ -2757,7 +2841,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">16</property>
+ <property name="top-attach">21</property>
</packing>
</child>
<child>
@@ -2775,7 +2859,7 @@ many months before the current month</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">17</property>
+ <property name="top-attach">22</property>
</packing>
</child>
</object>
diff --git a/libgnucash/core-utils/gnc-prefs.h b/libgnucash/core-utils/gnc-prefs.h
index 6e6a9f30f6..00549dd2e8 100644
--- a/libgnucash/core-utils/gnc-prefs.h
+++ b/libgnucash/core-utils/gnc-prefs.h
@@ -79,6 +79,7 @@
#define GNC_PREF_USE_GNUCASH_COLOR_THEME "use-gnucash-color-theme"
#define GNC_PREF_TAB_TRANS_MEMORISED "tab-to-transfer-on-memorised"
#define GNC_PREF_FUTURE_AFTER_BLANK "future-after-blank-transaction"
+#define GNC_PREF_JUMP_MULT_SPLITS "jump-multiple-splits"
/* Date preferences */
#define GNC_PREF_START_CHOICE_ABS "start-choice-absolute"
#define GNC_PREF_START_CHOICE_REL "start-choice-relative"
commit 6be4c3c36378ae64117ba7b8e9c47bdeb189c7ae
Author: Simon Arlott <sa.me.uk>
Date: Sat Sep 21 19:01:21 2024 +0100
Support for enums as GtkRadioButton preferences
The "=" in the widget name will separate the pref name from the enum
string value that is used when the radio button is activated. When the
radio button is deactivated, its preference update is ignored because
another button must have been made active.
diff --git a/gnucash/gnome-utils/dialog-preferences.c b/gnucash/gnome-utils/dialog-preferences.c
index 2904d011e9..f4de4a5510 100644
--- a/gnucash/gnome-utils/dialog-preferences.c
+++ b/gnucash/gnome-utils/dialog-preferences.c
@@ -781,14 +781,18 @@ gnc_prefs_sort_pages (GtkNotebook *notebook)
/*******************************/
static void
-gnc_prefs_split_widget_name (const gchar *name, gchar **group, gchar **pref)
+gnc_prefs_split_widget_name (const gchar *name, gchar **group, gchar **pref, gchar **value)
{
const gchar *group_with_pref = name + PREF_PREFIX_LEN;
gchar **splits = g_strsplit (group_with_pref, "/", 0);
+ gchar **value_splits = g_strsplit (splits[1], "=", 0);
*group = g_strdup (splits[0]);
- *pref = g_strdup (splits[1]);
+ *pref = g_strdup (value_splits[0]);
+ if (value)
+ *value = g_strdup (value_splits[1]); /* may be NULL */
g_strfreev (splits);
+ g_strfreev (value_splits);
}
/****************************************************************************/
@@ -806,8 +810,8 @@ gnc_prefs_connect_font_button (GtkFontButton *fb)
g_return_if_fail (GTK_IS_FONT_BUTTON(fb));
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(fb)), &group, &pref);
- gnc_prefs_bind (group, pref, G_OBJECT (fb), "font-name");
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(fb)), &group, &pref, NULL);
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT (fb), "font-name");
g_free (group);
g_free (pref);
@@ -873,9 +877,9 @@ gnc_prefs_connect_file_chooser_button (GtkFileChooserButton *fcb, const gchar *b
g_return_if_fail (GTK_FILE_CHOOSER_BUTTON(fcb));
if (boxname == NULL)
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(fcb)), &group, &pref);
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(fcb)), &group, &pref, NULL);
else
- gnc_prefs_split_widget_name (boxname, &group, &pref);
+ gnc_prefs_split_widget_name (boxname, &group, &pref, NULL);
uri = gnc_prefs_get_string (group, pref);
@@ -990,16 +994,17 @@ file_chooser_clear_cb (GtkButton *button, gpointer user_data)
static void
gnc_prefs_connect_radio_button (GtkRadioButton *button)
{
- gchar *group, *pref;
+ gchar *group, *pref, *value;
g_return_if_fail (GTK_IS_RADIO_BUTTON(button));
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(button)), &group, &pref);
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(button)), &group, &pref, &value);
- gnc_prefs_bind (group, pref, G_OBJECT(button), "active");
+ gnc_prefs_bind (group, pref, value, G_OBJECT(button), "active");
g_free (group);
g_free (pref);
+ g_free (value);
}
/****************************************************************************/
@@ -1014,16 +1019,17 @@ gnc_prefs_connect_radio_button (GtkRadioButton *button)
static void
gnc_prefs_connect_check_button (GtkCheckButton *button)
{
- gchar *group, *pref;
+ gchar *group, *pref, *value;
g_return_if_fail (GTK_IS_CHECK_BUTTON(button));
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(button)), &group, &pref);
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(button)), &group, &pref, &value);
- gnc_prefs_bind (group, pref, G_OBJECT(button), "active");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(button), "active");
g_free (group);
g_free (pref);
+ g_free (value);
}
/****************************************************************************/
@@ -1042,9 +1048,9 @@ gnc_prefs_connect_spin_button (GtkSpinButton *spin)
g_return_if_fail (GTK_IS_SPIN_BUTTON(spin));
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(spin)), &group, &pref);
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(spin)), &group, &pref, NULL);
- gnc_prefs_bind (group, pref, G_OBJECT(spin), "value");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(spin), "value");
g_free (group);
g_free (pref);
@@ -1065,9 +1071,9 @@ gnc_prefs_connect_combo_box (GtkComboBox *box)
g_return_if_fail (GTK_IS_COMBO_BOX(box));
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(box)), &group, &pref);
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(box)), &group, &pref, NULL);
- gnc_prefs_bind (group, pref, G_OBJECT(box), "active");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(box), "active");
g_free (group);
g_free (pref);
@@ -1088,9 +1094,9 @@ gnc_prefs_connect_currency_edit (GNCCurrencyEdit *gce, const gchar *boxname )
g_return_if_fail (GNC_IS_CURRENCY_EDIT(gce));
- gnc_prefs_split_widget_name (boxname, &group, &pref);
+ gnc_prefs_split_widget_name (boxname, &group, &pref, NULL);
- gnc_prefs_bind (group, pref, G_OBJECT(gce), "mnemonic");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(gce), "mnemonic");
g_free (group);
g_free (pref);
@@ -1113,9 +1119,9 @@ gnc_prefs_connect_entry (GtkEntry *entry)
g_return_if_fail (GTK_IS_ENTRY(entry));
- gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(entry)), &group, &pref);
+ gnc_prefs_split_widget_name (gtk_buildable_get_name (GTK_BUILDABLE(entry)), &group, &pref, NULL);
- gnc_prefs_bind (group, pref, G_OBJECT(entry), "text");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(entry), "text");
g_free (group);
g_free (pref);
@@ -1136,9 +1142,9 @@ gnc_prefs_connect_period_select (GncPeriodSelect *period, const gchar *boxname )
g_return_if_fail (GNC_IS_PERIOD_SELECT(period));
- gnc_prefs_split_widget_name (boxname, &group, &pref);
+ gnc_prefs_split_widget_name (boxname, &group, &pref, NULL);
- gnc_prefs_bind (group, pref, G_OBJECT(period), "active");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(period), "active");
g_free (group);
g_free (pref);
@@ -1159,9 +1165,9 @@ gnc_prefs_connect_date_edit (GNCDateEdit *gde , const gchar *boxname )
g_return_if_fail (GNC_IS_DATE_EDIT(gde));
- gnc_prefs_split_widget_name (boxname, &group, &pref);
+ gnc_prefs_split_widget_name (boxname, &group, &pref, NULL);
- gnc_prefs_bind (group, pref, G_OBJECT(gde), "time");
+ gnc_prefs_bind (group, pref, NULL, G_OBJECT(gde), "time");
g_free (group);
g_free (pref);
diff --git a/gnucash/gnome/dialog-lot-viewer.c b/gnucash/gnome/dialog-lot-viewer.c
index cf1d4a69ca..061617a9ab 100644
--- a/gnucash/gnome/dialog-lot-viewer.c
+++ b/gnucash/gnome/dialog-lot-viewer.c
@@ -1129,10 +1129,10 @@ lv_create (GNCLotViewer *lv, GtkWindow *parent)
{
GObject *object;
object = gtk_builder_get_object (builder, "lot_vpaned");
- gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_VPOS, object, "position");
+ gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_VPOS, NULL, object, "position");
object = gtk_builder_get_object (builder, "lot_hpaned");
- gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_HPOS, object, "position");
+ gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_HPOS, NULL, object, "position");
}
lv->selected_lot = NULL;
diff --git a/gnucash/gnome/dialog-tax-info.c b/gnucash/gnome/dialog-tax-info.c
index dd1feb2f79..dcb093b34a 100644
--- a/gnucash/gnome/dialog-tax-info.c
+++ b/gnucash/gnome/dialog-tax-info.c
@@ -1509,7 +1509,7 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
{
GObject *object = gtk_builder_get_object (builder, "paned");
- gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_PANED_POS, object, "position");
+ gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_PANED_POS, NULL, object, "position");
}
g_object_unref (builder);
}
diff --git a/gnucash/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c
index a4c62e83f5..136e6d1082 100644
--- a/gnucash/gnome/gnc-plugin-business.c
+++ b/gnucash/gnome/gnc-plugin-business.c
@@ -968,7 +968,7 @@ bind_extra_toolbuttons_visibility (GncMainWindow *mainwindow)
{
gnc_prefs_bind (GNC_PREFS_GROUP_INVOICE,
GNC_PREF_EXTRA_TOOLBUTTONS,
- G_OBJECT(tool_item), "visible");
+ NULL, G_OBJECT(tool_item), "visible");
}
}
@@ -984,7 +984,7 @@ bind_extra_toolbuttons_visibility (GncMainWindow *mainwindow)
{
gnc_prefs_bind (GNC_PREFS_GROUP_INVOICE,
GNC_PREF_EXTRA_TOOLBUTTONS,
- G_OBJECT(tool_item), "visible");
+ NULL, G_OBJECT(tool_item), "visible");
}
}
}
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.c b/gnucash/import-export/csv-exp/assistant-csv-export.c
index eb0be03544..89fab55db0 100644
--- a/gnucash/import-export/csv-exp/assistant-csv-export.c
+++ b/gnucash/import-export/csv-exp/assistant-csv-export.c
@@ -991,7 +991,7 @@ csv_export_assistant_create (CsvExportInfo *info)
if (gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
{
GObject *object = gtk_builder_get_object (builder, "paned");
- gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_PANED_POS, object, "position");
+ gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_PANED_POS, NULL, object, "position");
}
gtk_builder_connect_signals (builder, info);
diff --git a/gnucash/import-export/import-match-picker.cpp b/gnucash/import-export/import-match-picker.cpp
index 732012b698..f43c20b572 100644
--- a/gnucash/import-export/import-match-picker.cpp
+++ b/gnucash/import-export/import-match-picker.cpp
@@ -394,7 +394,7 @@ init_match_picker_gui(GtkWidget *parent, GNCImportMatchPicker * matcher)
gtk_window_set_transient_for (GTK_WINDOW (matcher->transaction_matcher), GTK_WINDOW(parent));
- gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_DISPLAY_RECONCILED,
+ gnc_prefs_bind (GNC_PREFS_GROUP, GNC_PREF_DISPLAY_RECONCILED, nullptr,
matcher->reconciled_chk, "active");
gnc_import_match_picker_init_downloaded_view(matcher);
diff --git a/libgnucash/app-utils/gnc-gsettings.cpp b/libgnucash/app-utils/gnc-gsettings.cpp
index fcc60ed248..40aac9dd71 100644
--- a/libgnucash/app-utils/gnc-gsettings.cpp
+++ b/libgnucash/app-utils/gnc-gsettings.cpp
@@ -279,8 +279,36 @@ gnc_gsettings_remove_any_cb_by_func (const gchar *schema,
}
+static gboolean gnc_gsettings_enum_bool_mapping_get (GValue *value,
+ GVariant *variant,
+ gpointer user_data)
+{
+ g_value_set_boolean (value,
+ !g_strcmp0 ((const gchar *)user_data,
+ g_variant_get_string (variant, nullptr)));
+
+ return true;
+}
+
+static GVariant* gnc_gsettings_enum_bool_mapping_set (const GValue *value,
+ const GVariantType *expected_type,
+ gpointer user_data)
+{
+ if (g_value_get_boolean (value))
+ {
+ return g_variant_new_string ((const gchar *)user_data);
+ }
+ else
+ {
+ /* GtkRadioButtons will set the value to false when another option is
+ * selected, just ignore this. */
+ return nullptr;
+ }
+}
+
void gnc_gsettings_bind (const gchar *schema,
/*@ null @*/ const gchar *key,
+ /*@ null @*/ const gchar *value,
gpointer object,
const gchar *property)
{
@@ -288,9 +316,24 @@ void gnc_gsettings_bind (const gchar *schema,
g_return_if_fail (G_IS_SETTINGS (gs_obj));
if (gnc_gsettings_is_valid_key (gs_obj, key))
- g_settings_bind (gs_obj, key, object, property, G_SETTINGS_BIND_DEFAULT);
+ {
+ if (value)
+ {
+ g_settings_bind_with_mapping (gs_obj, key, object, property,
+ G_SETTINGS_BIND_DEFAULT,
+ gnc_gsettings_enum_bool_mapping_get,
+ gnc_gsettings_enum_bool_mapping_set,
+ g_strdup (value), g_free);
+ }
+ else
+ {
+ g_settings_bind (gs_obj, key, object, property, G_SETTINGS_BIND_DEFAULT);
+ }
+ }
else
+ {
PERR ("Invalid key %s for schema %s", key, schema);
+ }
}
diff --git a/libgnucash/app-utils/gnc-gsettings.h b/libgnucash/app-utils/gnc-gsettings.h
index 9c9059897a..2f60b7ad49 100644
--- a/libgnucash/app-utils/gnc-gsettings.h
+++ b/libgnucash/app-utils/gnc-gsettings.h
@@ -199,12 +199,15 @@ void gnc_gsettings_remove_any_cb_by_func (const gchar *schema,
* @param key This string is the name of the particular key within
* the named schema of gsettings.
*
+ * @param value This string is the enum value of the particular setting.
+ *
* @param object The object to be bound.
*
* @param property The property of the object to bind to.
*/
void gnc_gsettings_bind (const gchar *schema,
/*@ null @*/ const gchar *key,
+ /*@ null @*/ const gchar *value,
gpointer object,
const gchar *property);
diff --git a/libgnucash/core-utils/gnc-prefs-p.h b/libgnucash/core-utils/gnc-prefs-p.h
index a5ab85580e..7897fe4e26 100644
--- a/libgnucash/core-utils/gnc-prefs-p.h
+++ b/libgnucash/core-utils/gnc-prefs-p.h
@@ -54,6 +54,7 @@ typedef struct
void (*bind) (const gchar *group,
/*@ null @*/ const gchar *pref_name,
+ /*@ null @*/ const gchar *pref_value,
gpointer object,
const gchar *property);
diff --git a/libgnucash/core-utils/gnc-prefs.c b/libgnucash/core-utils/gnc-prefs.c
index dec3b23421..f3d8503454 100644
--- a/libgnucash/core-utils/gnc-prefs.c
+++ b/libgnucash/core-utils/gnc-prefs.c
@@ -180,11 +180,12 @@ void gnc_prefs_remove_group_cb_by_func (const gchar *group,
void gnc_prefs_bind (const gchar *group,
/*@ null @*/ const gchar *pref_name,
+ /*@ null @*/ const gchar *pref_value,
gpointer object,
const gchar *property)
{
if (prefsbackend && prefsbackend->bind)
- (prefsbackend->bind) (group, pref_name, object, property);
+ (prefsbackend->bind) (group, pref_name, pref_value, object, property);
}
diff --git a/libgnucash/core-utils/gnc-prefs.h b/libgnucash/core-utils/gnc-prefs.h
index 5010bfc951..6e6a9f30f6 100644
--- a/libgnucash/core-utils/gnc-prefs.h
+++ b/libgnucash/core-utils/gnc-prefs.h
@@ -254,15 +254,18 @@ void gnc_prefs_remove_group_cb_by_func (const gchar *group,
*
* @param group This string contains the group name of the preference to bind to.
*
- * @param preference This string is the name of the particular preference to
+ * @param pref_name This string is the name of the particular preference to
* bind to.
*
+ * @param pref_value This string is the enum value of the preference to bind to.
+ *
* @param object The object to be bound.
*
* @param property The property of the object to bind to.
*/
void gnc_prefs_bind (const gchar *group,
/*@ null @*/ const gchar *pref_name,
+ /*@ null @*/ const gchar *pref_value,
gpointer object,
const gchar *property);
commit 79c6c3732f1e5fc44323978a37877367e245e3a1
Author: Simon Arlott <sa.me.uk>
Date: Mon Jun 5 20:11:34 2023 +0100
Disallow using "Jump" on an expanded split for the current account
If you've selected a split for this account, for consistency with selecting
the split of another account we should do nothing. You're already on the
account for the split you selected.
Previously it would still go to the "other" account but that's going to
make the "multiple split" options confusing.
diff --git a/gnucash/gnome/gnc-plugin-page-register.cpp b/gnucash/gnome/gnc-plugin-page-register.cpp
index 49d594b11d..2069b40fc6 100644
--- a/gnucash/gnome/gnc-plugin-page-register.cpp
+++ b/gnucash/gnome/gnc-plugin-page-register.cpp
@@ -4899,6 +4899,28 @@ gnc_plugin_page_register_cmd_jump (GSimpleAction *simple,
leader = gnc_ledger_display_leader (priv->ledger);
if (account == leader)
{
+ CursorClass cursor_class = gnc_split_register_get_current_cursor_class (reg);
+ if (cursor_class == CURSOR_CLASS_SPLIT)
+ {
+ /* If you've selected the transaction itself, we jump to the "other"
+ * account corresponding to the anchoring split.
+ *
+ * If you've selected the split for another account, we jump to that
+ * split's account (account != leader, so this block is never
+ * reached).
+ *
+ * If you've selected a split for this account, for consistency with
+ * selecting the split of another account we should do nothing.
+ * You're already on the account for the split you selected.
+ *
+ * We could jump to a different anchoring split but that'll be very
+ * subtle and only cause problems because it'll have to save any
+ * modifications to the current register.
+ */
+ LEAVE ("split for this account");
+ return;
+ }
+
split = xaccSplitGetOtherSplit (split);
if (split == NULL)
{
Summary of changes:
gnucash/gnome-utils/dialog-preferences.c | 54 +++---
gnucash/gnome-utils/dialog-utils.c | 8 +-
gnucash/gnome/dialog-lot-viewer.c | 4 +-
gnucash/gnome/dialog-tax-info.c | 2 +-
gnucash/gnome/gnc-plugin-business.c | 4 +-
gnucash/gnome/gnc-plugin-page-register.cpp | 202 ++++++++++++++++++++-
.../gschemas/org.gnucash.GnuCash.gschema.xml.in | 13 +-
.../org.gnucash.GnuCash.warnings.gschema.xml.in | 20 ++
gnucash/gtkbuilder/dialog-preferences.glade | 110 +++++++++--
.../import-export/csv-exp/assistant-csv-export.c | 2 +-
gnucash/import-export/import-match-picker.cpp | 2 +-
libgnucash/app-utils/gnc-gsettings.cpp | 45 ++++-
libgnucash/app-utils/gnc-gsettings.h | 3 +
libgnucash/core-utils/gnc-prefs-p.h | 1 +
libgnucash/core-utils/gnc-prefs.c | 3 +-
libgnucash/core-utils/gnc-prefs.h | 6 +-
16 files changed, 422 insertions(+), 57 deletions(-)
More information about the gnucash-changes
mailing list