gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Wed Nov 3 17:16:56 EDT 2021
Updated via https://github.com/Gnucash/gnucash/commit/0660da07 (commit)
via https://github.com/Gnucash/gnucash/commit/f7f6f337 (commit)
from https://github.com/Gnucash/gnucash/commit/970e9af3 (commit)
commit 0660da074fb12a36a5cc181e0266bc0c512a0166
Merge: 970e9af34 f7f6f337d
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Nov 3 14:16:10 2021 -0700
Merge Simon Arlott's 'cut-txn-warning' into maint.
commit f7f6f337df4d03b1b5f370b25c4174f4f6c8df5e
Author: Simon Arlott <sa.me.uk>
Date: Thu Oct 28 21:30:48 2021 +0100
Separate the warnings for "cut split/transaction" and "delete split/transaction"
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index 38cfbfa6c..298adaaa3 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -964,11 +964,11 @@ gsr_default_cut_txn_handler (GNCSplitReg *gsr, gpointer data)
{
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
"%s", recn_warn);
- warning = GNC_PREF_WARN_REG_SPLIT_DEL_RECD;
+ warning = GNC_PREF_WARN_REG_SPLIT_CUT_RECD;
}
else
{
- warning = GNC_PREF_WARN_REG_SPLIT_DEL;
+ warning = GNC_PREF_WARN_REG_SPLIT_CUT;
}
gtk_dialog_add_button (GTK_DIALOG(dialog),
@@ -1003,11 +1003,11 @@ gsr_default_cut_txn_handler (GNCSplitReg *gsr, gpointer data)
{
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
"%s", recn_warn);
- warning = GNC_PREF_WARN_REG_TRANS_DEL_RECD;
+ warning = GNC_PREF_WARN_REG_TRANS_CUT_RECD;
}
else
{
- warning = GNC_PREF_WARN_REG_TRANS_DEL;
+ warning = GNC_PREF_WARN_REG_TRANS_CUT;
}
gtk_dialog_add_button (GTK_DIALOG(dialog),
_("_Cancel"), GTK_RESPONSE_CANCEL);
diff --git a/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in b/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in
index a599be194..02a8b590e 100644
--- a/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in
@@ -64,6 +64,16 @@
<summary>Mark transaction split as unreconciled</summary>
<description>This dialog is presented before allowing you to mark a transaction split as unreconciled. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations.</description>
</key>
+ <key name="reg-split-cut" type="i">
+ <default>0</default>
+ <summary>Cut a split from a transaction</summary>
+ <description>This dialog is presented before allowing you to cut a split from a transaction.</description>
+ </key>
+ <key name="reg-split-cut-recd" type="i">
+ <default>0</default>
+ <summary>Cut a reconciled split from a transaction</summary>
+ <description>This dialog is presented before allowing you to cut a reconciled split from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations.</description>
+ </key>
<key name="reg-split-del" type="i">
<default>0</default>
<summary>Remove a split from a transaction</summary>
@@ -84,6 +94,16 @@
<summary>Remove all the splits from a transaction</summary>
<description>This dialog is presented before allowing you to remove all splits (including some reconciled splits) from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations.</description>
</key>
+ <key name="reg-trans-cut" type="i">
+ <default>0</default>
+ <summary>Cut a transaction</summary>
+ <description>This dialog is presented before allowing you to cut a transaction.</description>
+ </key>
+ <key name="reg-trans-cut-recd" type="i">
+ <default>0</default>
+ <summary>Cut a transaction with reconciled splits</summary>
+ <description>This dialog is presented before allowing you to cut a transaction that contains reconciled splits. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations.</description>
+ </key>
<key name="reg-trans-del" type="i">
<default>0</default>
<summary>Delete a transaction</summary>
Summary of changes:
gnucash/gnome/gnc-split-reg.c | 8 ++++----
.../org.gnucash.GnuCash.warnings.gschema.xml.in | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list