IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Read-Only register warning non specific

Browse Source 
If you have a place holder account register or sub account register
which are read only open when you close Gnucash, the next time you open
Gnucash a read only warning dialog is raised but has no indication of
what register it applies to so this commit adds the account name to the
warning text.
This commit is contained in:
Robert Fewell 2020-11-29 14:53:32 +00:00
parent 66cdce8d51
commit f0fc1e537d
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnucash/gnome/gnc-split-reg.c
View File

@ -2444,8 +2444,30 @@ gboolean
gtk_callback_bug_workaround (gpointer argp) gtk_callback_bug_workaround (gpointer argp)
{ {
dialog_args *args = argp; dialog_args *args = argp;
const gchar *read_only = _("This account register is read-only."); const gchar *read_only_this = _("This account register is read-only.");
const gchar *read_only_acc = _("The '%s' account register is read-only.");
gchar *read_only = NULL;
GtkWidget *dialog; GtkWidget *dialog;
GNCLedgerDisplayType ledger_type = gnc_ledger_display_type (args->gsr->ledger);
Account *acc = gnc_ledger_display_leader (args->gsr->ledger);
const gchar *acc_name = NULL;
gchar *tmp = NULL;
if (acc)
{
acc_name = xaccAccountGetName (acc);
if (ledger_type == LD_SINGLE)
read_only = g_strdup_printf (read_only_acc, acc_name);
else
{
gchar *tmp = g_strconcat (acc_name, "+", NULL);
read_only = g_strdup_printf (read_only_acc, tmp);
g_free (tmp);
}
}
else
read_only = g_strdup (read_only_this);
dialog = gtk_message_dialog_new(GTK_WINDOW(args->gsr->window), dialog = gtk_message_dialog_new(GTK_WINDOW(args->gsr->window),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
@ -2456,6 +2478,7 @@ gtk_callback_bug_workaround (gpointer argp)
"%s", args->string); "%s", args->string);
gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_REG_IS_READ_ONLY); gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_REG_IS_READ_ONLY);
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
g_free(read_only);
g_free(args); g_free(args);
return FALSE; return FALSE;
} }

25
gnucash/gnome/gnc-split-reg2.c
View File

@ -934,8 +934,30 @@ gboolean
gtk_callback_bug_workaround (gpointer argp) gtk_callback_bug_workaround (gpointer argp)
{ {
dialog_args *args = argp; dialog_args *args = argp;
const gchar *read_only = _("This account register is read-only."); const gchar *read_only_this = _("This account register is read-only.");
const gchar *read_only_acc = _("The '%s' account register is read-only.");
gchar *read_only = NULL;
GtkWidget *dialog; GtkWidget *dialog;
GNCLedgerDisplay2Type ledger_type = gnc_ledger_display2_type (args->gsr->ledger);
Account *acc = gnc_ledger_display2_leader (args->gsr->ledger);
const gchar *acc_name = NULL;
gchar *tmp = NULL;
if (acc)
{
acc_name = xaccAccountGetName (acc);
if (ledger_type == LD2_SINGLE)
read_only = g_strdup_printf (read_only_acc, acc_name);
else
{
gchar *tmp = g_strconcat (acc_name, "+", NULL);
read_only = g_strdup_printf (read_only_acc, tmp);
g_free (tmp);
}
}
else
read_only = g_strdup (read_only_this);
dialog = gtk_message_dialog_new (GTK_WINDOW(args->gsr->window), dialog = gtk_message_dialog_new (GTK_WINDOW(args->gsr->window),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
@ -946,6 +968,7 @@ gtk_callback_bug_workaround (gpointer argp)
"%s", args->string); "%s", args->string);
gnc_dialog_run (GTK_DIALOG (dialog), GNC_PREF_WARN_REG_IS_READ_ONLY); gnc_dialog_run (GTK_DIALOG (dialog), GNC_PREF_WARN_REG_IS_READ_ONLY);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
g_free(read_only);
g_free (args); g_free (args);
return FALSE; return FALSE;
} }