gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Fri Dec 30 17:44:28 EST 2022
Updated via https://github.com/Gnucash/gnucash/commit/fb29ed9d (commit)
via https://github.com/Gnucash/gnucash/commit/73ccb1c0 (commit)
via https://github.com/Gnucash/gnucash/commit/00becc61 (commit)
from https://github.com/Gnucash/gnucash/commit/a9756b19 (commit)
commit fb29ed9d4fffcc61f932bf5bc5ab6e51676a107c
Merge: a9756b195 73ccb1c0a
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 30 14:43:52 2022 -0800
Merge Bob Fewell's 'bug769256' into master.
diff --cc gnucash/gnome-utils/dialog-account.c
index 5d3eba4ef,66f511b07..1c74d9cd3
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@@ -1449,20 -1461,27 +1461,13 @@@ gnc_account_window_create (GtkWindow *p
gnc_commodity_edit_new_select,
&aw->commodity_mode);
++ gtk_box_pack_start (GTK_BOX(box), aw->commodity_edit, TRUE, TRUE, 0);
++ gtk_widget_show (aw->commodity_edit);
// If the account has transactions, prevent changes by displaying a label and tooltip
if (xaccAccountGetSplitList (aw_get_account (aw)) != NULL)
{
- GtkStyleContext *stylectxt = gtk_widget_get_style_context (GTK_WIDGET(box));
-- const gchar *sec_name = gnc_commodity_get_printname (xaccAccountGetCommodity (
-- aw_get_account (aw)));
-- GtkWidget *label = gtk_label_new (sec_name);
-- gtk_widget_set_tooltip_text (label, tt);
-- gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 0);
-
- g_signal_connect (G_OBJECT(aw->name_entry), "realize",
- G_CALLBACK(gnc_name_entry_realize), box);
- gtk_style_context_add_class (stylectxt, GTK_STYLE_CLASS_FRAME);
- gtk_widget_set_margin_start (label, 6);
- gtk_widget_set_margin_end (label, 6);
-- gtk_widget_show (label);
-- }
-- else
-- {
-- gtk_box_pack_start (GTK_BOX(box), aw->commodity_edit, TRUE, TRUE, 0);
-- gtk_widget_show (aw->commodity_edit);
++ gtk_widget_set_tooltip_text (aw->commodity_edit, tt);
++ gtk_widget_set_sensitive (aw->commodity_edit, FALSE);
}
label = GTK_WIDGET(gtk_builder_get_object (builder, "security_label"));
diff --cc gnucash/gtkbuilder/dialog-account.glade
index 9c4b93d32,3e8bc1fdf..c66285227
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@@ -1588,15 -1542,15 +1542,15 @@@
</packing>
</child>
<child>
- <object class="GtkLabel" id="parent_label">
+ <object class="GtkCheckButton" id="hidden_button">
+ <property name="label" translatable="yes">H_idden</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register. To reset this option, you will first need to open the "Filter By..." dialog for the account tree and check the "show hidden accounts" option. Doing so will allow you to select the account and reopen this dialog.</property>
++ <property name="tooltip-text" translatable="yes">This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register. To reset this option, you will first need to open the "Filter By…" dialog for the account tree and check the "show hidden accounts" option. Doing so will allow you to select the account and reopen this dialog.</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">_Parent Account</property>
<property name="use-underline">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="left-attach">1</property>
commit 73ccb1c0adb6e6f94cc5698b82664463e93b521b
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Nov 11 14:40:14 2022 +0000
Change the size for the dialog account commodity
When displaying a label for the commodity, set the size of the gtk box
to be based on the the size of the name_entry so it looks better.
diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index 12b3a9ee6..66f511b07 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -1390,6 +1390,16 @@ opening_equity_cb (GtkWidget *w, gpointer data)
gtk_widget_set_sensitive (aw->transfer_account_scroll, !use_equity);
}
+static void
+gnc_name_entry_realize (GtkWidget *widget, gpointer user_data)
+{
+ GtkWidget *commodity_box = user_data;
+ GtkAllocation alloc;
+
+ gtk_widget_get_allocation (widget, &alloc);
+ gtk_widget_set_size_request (commodity_box, -1, alloc.height);
+}
+
/********************************************************************\
* gnc_account_window_create *
* creates a window to create a new account. *
@@ -1454,11 +1464,18 @@ gnc_account_window_create (GtkWindow *parent, AccountWindow *aw)
// If the account has transactions, prevent changes by displaying a label and tooltip
if (xaccAccountGetSplitList (aw_get_account (aw)) != NULL)
{
+ GtkStyleContext *stylectxt = gtk_widget_get_style_context (GTK_WIDGET(box));
const gchar *sec_name = gnc_commodity_get_printname (xaccAccountGetCommodity (
aw_get_account (aw)));
GtkWidget *label = gtk_label_new (sec_name);
gtk_widget_set_tooltip_text (label, tt);
gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 0);
+
+ g_signal_connect (G_OBJECT(aw->name_entry), "realize",
+ G_CALLBACK(gnc_name_entry_realize), box);
+ gtk_style_context_add_class (stylectxt, GTK_STYLE_CLASS_FRAME);
+ gtk_widget_set_margin_start (label, 6);
+ gtk_widget_set_margin_end (label, 6);
gtk_widget_show (label);
}
else
commit 00becc6177c46fd19d4ae0845b1de0f4afafb34a
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Oct 10 13:28:51 2022 +0100
Bug769256 - Change New Account Dialog
This commit changes the account type field from a tree view to a combo
and rearranges the fields to aid in flow.
diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index 63ab3808a..12b3a9ee6 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -102,7 +102,7 @@ typedef struct _AccountWindow
guint32 valid_types;
GNCAccountType preferred_account_type;
- GtkWidget *type_view;
+ GtkWidget *type_combo;
GtkTreeView *parent_tree;
GtkWidget *parent_scroll;
@@ -1084,9 +1084,9 @@ gnc_account_parent_changed_cb (GtkTreeSelection *selection, gpointer data)
AccountWindow *aw = data;
Account *parent_account;
guint32 types, old_types;
+ GtkTreeModelSort *s_model;
GtkTreeModel *type_model;
- GtkTreeSelection *type_selection;
- gboolean scroll_to = FALSE;
+ gboolean combo_set = FALSE;
g_return_if_fail (aw);
@@ -1104,8 +1104,8 @@ gnc_account_parent_changed_cb (GtkTreeSelection *selection, gpointer data)
types = aw->valid_types &
xaccParentAccountTypesCompatibleWith (xaccAccountGetType (parent_account));
}
-
- type_model = gtk_tree_view_get_model (GTK_TREE_VIEW(aw->type_view));
+ s_model = GTK_TREE_MODEL_SORT(gtk_combo_box_get_model (GTK_COMBO_BOX(aw->type_combo)));
+ type_model = gtk_tree_model_sort_get_model (s_model);
if (!type_model)
return;
@@ -1114,7 +1114,7 @@ gnc_account_parent_changed_cb (GtkTreeSelection *selection, gpointer data)
{
/* we can change back to the preferred account type */
aw->type = aw->preferred_account_type;
- scroll_to = TRUE;
+ combo_set = TRUE;
}
else if ((types & (1 << aw->type)) == 0)
{
@@ -1126,16 +1126,14 @@ gnc_account_parent_changed_cb (GtkTreeSelection *selection, gpointer data)
/* no type change, but maybe list of valid types changed */
old_types = gnc_tree_model_account_types_get_mask (type_model);
if (old_types != types)
- scroll_to = TRUE;
+ combo_set = TRUE;
}
gnc_tree_model_account_types_set_mask (type_model, types);
- if (scroll_to)
- {
- type_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(aw->type_view));
- gnc_tree_model_account_types_set_selection (type_selection, 1 << aw->type);
- }
+ if (combo_set)
+ gnc_tree_model_account_types_set_active_combo (GTK_COMBO_BOX(aw->type_combo),
+ 1 << aw->type);
gnc_account_window_set_name (aw);
}
@@ -1152,7 +1150,7 @@ set_auto_interest_box(AccountWindow *aw)
}
static void
-gnc_account_type_changed_cb (GtkTreeSelection *selection, gpointer data)
+gnc_account_type_combo_changed_cb (GtkComboBox *combo, gpointer data)
{
AccountWindow *aw = data;
gboolean sensitive;
@@ -1162,7 +1160,8 @@ gnc_account_type_changed_cb (GtkTreeSelection *selection, gpointer data)
sensitive = FALSE;
- type_id = gnc_tree_model_account_types_get_selection_single (selection);
+ type_id = gnc_tree_model_account_types_get_active_combo (combo);
+
if (type_id == ACCT_TYPE_NONE)
{
aw->type = ACCT_TYPE_INVALID;
@@ -1194,10 +1193,8 @@ gnc_account_type_changed_cb (GtkTreeSelection *selection, gpointer data)
static void
gnc_account_type_view_create (AccountWindow *aw, guint32 compat_types)
{
- GtkTreeModel *model;
- GtkTreeSelection *selection;
+ GtkTreeModel *fmodel, *smodel;
GtkCellRenderer *renderer;
- GtkTreeView *view;
aw->valid_types &= compat_types;
if (aw->valid_types == 0)
@@ -1231,23 +1228,28 @@ gnc_account_type_view_create (AccountWindow *aw, guint32 compat_types)
}
}
- model = gnc_tree_model_account_types_filter_using_mask (aw->valid_types);
+ fmodel = gnc_tree_model_account_types_filter_using_mask (aw->valid_types);
+
+ smodel = gtk_tree_model_sort_new_with_model (fmodel);
+
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(smodel),
+ GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME,
+ GTK_SORT_ASCENDING);
- view = GTK_TREE_VIEW(aw->type_view);
- gtk_tree_view_set_model (view, model);
- g_object_unref (G_OBJECT(model));
+ gtk_combo_box_set_model (GTK_COMBO_BOX(aw->type_combo), smodel);
renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes (view, -1, NULL, renderer, "text",
- GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME,
- NULL);
- gtk_tree_view_set_search_column (view, GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME);
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(aw->type_combo), renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(aw->type_combo), renderer,
+ "text", GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME, NULL);
- selection = gtk_tree_view_get_selection (view);
- g_signal_connect (G_OBJECT(selection), "changed",
- G_CALLBACK(gnc_account_type_changed_cb), aw);
+ g_signal_connect (G_OBJECT(aw->type_combo), "changed",
+ G_CALLBACK(gnc_account_type_combo_changed_cb), aw);
+
+ g_object_unref (G_OBJECT(fmodel));
- gnc_tree_model_account_types_set_selection (selection, 1 << aw->type);
+ gnc_tree_model_account_types_set_active_combo (GTK_COMBO_BOX(aw->type_combo),
+ 1 << aw->type);
}
void
@@ -1529,7 +1531,7 @@ gnc_account_window_create (GtkWindow *parent, AccountWindow *aw)
gtk_label_set_mnemonic_widget (GTK_LABEL(label), GTK_WIDGET(aw->parent_tree));
/* This goes at the end so the select callback has good data. */
- aw->type_view = GTK_WIDGET(gtk_builder_get_object (builder, "type_view"));
+ aw->type_combo = GTK_WIDGET(gtk_builder_get_object (builder, "account_type_combo"));
// If the account has transactions, reduce the available account types
// to change the current account type to based on the following
diff --git a/gnucash/gnome-utils/gnc-tree-model-account-types.c b/gnucash/gnome-utils/gnc-tree-model-account-types.c
index e5f50cd1c..8fdebcac4 100644
--- a/gnucash/gnome-utils/gnc-tree-model-account-types.c
+++ b/gnucash/gnome-utils/gnc-tree-model-account-types.c
@@ -217,11 +217,54 @@ gnc_tree_model_account_types_get_selection_single(GtkTreeSelection *sel)
return ACCT_TYPE_NONE;
}
+GNCAccountType
+gnc_tree_model_account_types_get_active_combo (GtkComboBox *combo)
+{
+ GtkTreeModelSort *s_model;
+ GtkTreeModelFilter *f_model;
+ GtkTreeIter iter;
+ guint32 bits = 0;
+ gint i;
+
+ g_return_val_if_fail (GTK_IS_COMBO_BOX(combo), 0);
+
+ if (gtk_combo_box_get_active_iter (combo, &iter))
+ {
+ s_model = GTK_TREE_MODEL_SORT(gtk_combo_box_get_model (combo));
+ f_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_sort_get_model (s_model));
+
+ if (gtk_tree_model_filter_get_model (f_model) != account_types_tree_model)
+ PERR("TreeSelection's TreeModel is not the account-types Model");
+ else
+ {
+ GtkTreePath *s_path = gtk_tree_model_get_path (GTK_TREE_MODEL(s_model), &iter);
+ GtkTreePath *f_path = gtk_tree_model_sort_convert_path_to_child_path (s_model, s_path);
+ GtkTreePath *path = gtk_tree_model_filter_convert_path_to_child_path (f_model, f_path);
+
+ gtk_tree_path_free (f_path);
+ gtk_tree_path_free (s_path);
+
+ if (!path || gtk_tree_path_get_depth (path) != 1)
+ {
+ PERR("Invalid Account-types TreePath.");
+ gtk_tree_path_free (path);
+ return ACCT_TYPE_NONE;
+ }
+ bits |= (1 << gtk_tree_path_get_indices (path)[0]);
+ gtk_tree_path_free (path);
+ }
+ }
+ for (i = 0; i < NUM_ACCOUNT_TYPES; i++)
+ if (bits & (1 << i))
+ return i;
+ return ACCT_TYPE_NONE;
+}
+
void
gnc_tree_model_account_types_set_selection (GtkTreeSelection *sel,
guint32 selected)
{
- GtkTreePath *path, *f_path;
+ GtkTreePath *path;
GtkTreeModelFilter *f_model;
gint i;
GtkTreeView *view;
@@ -239,16 +282,54 @@ gnc_tree_model_account_types_set_selection (GtkTreeSelection *sel,
{
if (selected & (1 << i))
{
- f_path = gtk_tree_model_filter_convert_child_path_to_path(
- f_model, path);
+ GtkTreePath *f_path = gtk_tree_model_filter_convert_child_path_to_path(
+ f_model, path);
gtk_tree_selection_select_path(sel, f_path);
gtk_tree_view_scroll_to_cell(view, f_path, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_path_free(f_path);
}
gtk_tree_path_next(path);
}
gtk_tree_path_free(path);
}
+void
+gnc_tree_model_account_types_set_active_combo (GtkComboBox *combo,
+ guint32 selected)
+{
+ GtkTreePath *path;
+ GtkTreeModelFilter *f_model;
+ GtkTreeModelSort *s_model;
+ gint i;
+
+ g_return_if_fail (GTK_IS_COMBO_BOX(combo));
+
+ s_model = GTK_TREE_MODEL_SORT(gtk_combo_box_get_model (combo));
+ f_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_sort_get_model (s_model));
+ g_return_if_fail (gtk_tree_model_filter_get_model (f_model) ==
+ account_types_tree_model);
+
+ gtk_combo_box_set_active (combo, -1);
+
+ path = gtk_tree_path_new_first ();
+
+ for (i = 0; i < NUM_ACCOUNT_TYPES; i++)
+ {
+ if (selected & (1 << i))
+ {
+ GtkTreeIter iter;
+ GtkTreePath *f_path = gtk_tree_model_filter_convert_child_path_to_path (f_model, path);
+ GtkTreePath *s_path = gtk_tree_model_sort_convert_child_path_to_path (s_model, f_path);
+
+ gtk_tree_model_get_iter (GTK_TREE_MODEL(s_model), &iter, s_path);
+ gtk_combo_box_set_active_iter (combo, &iter);
+ gtk_tree_path_free (f_path);
+ gtk_tree_path_free (s_path);
+ }
+ gtk_tree_path_next (path);
+ }
+ gtk_tree_path_free (path);
+}
/* Static functions implementing GtkTreeModel */
diff --git a/gnucash/gnome-utils/gnc-tree-model-account-types.h b/gnucash/gnome-utils/gnc-tree-model-account-types.h
index a3f4bfa2d..b383b4c1a 100644
--- a/gnucash/gnome-utils/gnc-tree-model-account-types.h
+++ b/gnucash/gnome-utils/gnc-tree-model-account-types.h
@@ -131,12 +131,22 @@ guint32 gnc_tree_model_account_types_get_selection(GtkTreeSelection *sel);
GNCAccountType
gnc_tree_model_account_types_get_selection_single(GtkTreeSelection *sel);
+/* Gets the selected account type. If no types are active, returns
+ ACCT_TYPE_NONE. */
+GNCAccountType
+gnc_tree_model_account_types_get_active_combo (GtkComboBox *combo);
+
/* Set the selection state of the tree selection to match the bitmask
of account-type enums in 'selected'. This will also scroll to a
selected row in the TreeView.*/
void gnc_tree_model_account_types_set_selection(GtkTreeSelection *sel,
guint32 selected);
+/* Set the active entry to match the bitmask of account-type enums in
+ 'selected' */
+void gnc_tree_model_account_types_set_active_combo (GtkComboBox *combo,
+ guint32 selected);
+
/**************** Method 2 functions **************/
diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
index 3447f545e..3e8bc1fdf 100644
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@ -1177,29 +1177,47 @@
<property name="can-focus">True</property>
<property name="border-width">5</property>
<child>
- <object class="GtkBox" id="vbox301">
+ <!-- n-columns=1 n-rows=3 -->
+ <object class="GtkGrid" id="grid300">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-start">6</property>
+ <property name="margin-end">6</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="border-width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">18</property>
<child>
- <!-- n-columns=1 n-rows=2 -->
- <object class="GtkGrid" id="grid300">
+ <object class="GtkLabel" id="label300">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Identification</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <!-- n-columns=2 n-rows=9 -->
+ <object class="GtkGrid" id="grid301">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
- <object class="GtkLabel" id="label300">
+ <object class="GtkLabel" id="label301">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Identification</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Account _name</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">name_entry</property>
+ <property name="ellipsize">middle</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -1207,369 +1225,300 @@
</packing>
</child>
<child>
- <!-- n-columns=2 n-rows=12 -->
- <object class="GtkGrid" id="grid301">
+ <object class="GtkLabel" id="label302">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Account code</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">code_entry</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label304">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Description</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">description_entry</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="security_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Security/currency</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="commodity_hbox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="row-spacing">3</property>
- <property name="column-spacing">6</property>
- <child>
- <object class="GtkLabel" id="label301">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Account _name</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">name_entry</property>
- <property name="ellipsize">middle</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label302">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">_Account code</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">code_entry</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label304">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">_Description</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">description_entry</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="security_label">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">_Security/currency</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="commodity_hbox">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label305">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Smallest _fraction</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">account_scu</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label306">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Account _Color</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">color_entry_button</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="color_hbox">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="spacing">2</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkColorButton" id="color_entry_button">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="color_default_button">
- <property name="label" translatable="yes">Default</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <signal name="clicked" handler="gnc_account_color_default_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
<child>
- <object class="GtkLabel" id="label307">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">end</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes">No_tes</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">notes_text</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">6</property>
- </packing>
+ <placeholder/>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label305">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Smallest _fraction</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">account_scu</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label306">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Account _Color</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">color_entry_button</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="color_hbox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">2</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkEntry" id="name_entry">
+ <object class="GtkColorButton" id="color_entry_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="has-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <signal name="changed" handler="gnc_account_name_changed_cb" swapped="no"/>
- <signal name="insert-text" handler="gnc_account_name_insert_text_cb" swapped="no"/>
+ <property name="receives-default">True</property>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="code_entry">
+ <object class="GtkButton" id="color_default_button">
+ <property name="label" translatable="yes">Default</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="activates-default">True</property>
+ <property name="receives-default">True</property>
+ <signal name="clicked" handler="gnc_account_color_default_cb" swapped="no"/>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label307">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="label" translatable="yes">No_tes</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">notes_text</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="name_entry">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="has-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <signal name="changed" handler="gnc_account_name_changed_cb" swapped="no"/>
+ <signal name="insert-text" handler="gnc_account_name_insert_text_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="code_entry">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="description_entry">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow300">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="shadow-type">in</property>
+ <property name="min-content-height">60</property>
<child>
- <object class="GtkEntry" id="description_entry">
+ <object class="GtkTextView" id="notes_text">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="activates-default">True</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
+ <property name="wrap-mode">word</property>
+ <property name="accepts-tab">False</property>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow300">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="shadow-type">in</property>
- <property name="min-content-height">60</property>
- <child>
- <object class="GtkTextView" id="notes_text">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="margin-start">3</property>
- <property name="margin-end">3</property>
- <property name="wrap-mode">word</property>
- <property name="accepts-tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">6</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEventBox" id="eventbox300">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes">Smallest fraction of this commodity that can be referenced.</property>
<child>
- <object class="GtkEventBox" id="eventbox300">
+ <object class="GtkComboBox" id="account_scu">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes">Smallest fraction of this commodity that can be referenced.</property>
+ <property name="model">fraction_liststore</property>
<child>
- <object class="GtkComboBox" id="account_scu">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="model">fraction_liststore</property>
- <child>
- <object class="GtkCellRendererText" id="acct_scu_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererText" id="acct_scu_renderer"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="placeholder_button">
- <property name="label" translatable="yes">Placeholde_r</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account.</property>
- <property name="halign">start</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hidden_button">
- <property name="label" translatable="yes">H_idden</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register. To reset this option, you will first need to open the "Filter By..." dialog for the account tree and check the "show hidden accounts" option. Doing so will allow you to select the account and reopen this dialog.</property>
- <property name="halign">start</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="auto_interest_button">
- <property name="label" translatable="yes">Auto _interest transfer</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Prior to reconciling an account which charges or pays interest, prompt the user to enter a transaction for the interest charge or payment. Currently only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts.</property>
- <property name="halign">start</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">10</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="tax_related_button">
- <property name="label" translatable="yes">Ta_x related</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes" comments="Translators: use the same words here as in 'Ta_x Report Options'.">Use Edit->Tax Report Options to set the tax-related flag and assign a tax code to this account.</property>
- <property name="halign">start</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="opening_balance_button">
- <property name="label" translatable="yes">Opening balance</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">This account holds opening balance transactions. Only one account per commodity can hold opening balance transactions.</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">11</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="parent_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="label" translatable="yes">_Parent Account</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Acco_unt Type</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">account_type_combo</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="account_type_combo">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="parent_scroll">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <!-- n-columns=2 n-rows=2 -->
+ <!-- n-columns=3 n-rows=2 -->
<object class="GtkGrid" id="grid302">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="row-spacing">3</property>
- <property name="column-spacing">12</property>
+ <property name="halign">center</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkLabel" id="type_label">
+ <object class="GtkCheckButton" id="placeholder_button">
+ <property name="label" translatable="yes">Placeholde_r</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account.</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"><b>Acco_unt Type</b></property>
- <property name="use-markup">True</property>
<property name="use-underline">True</property>
- <property name="mnemonic-widget">type_view</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -1577,26 +1526,31 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label8">
+ <object class="GtkCheckButton" id="auto_interest_button">
+ <property name="label" translatable="yes">Auto _interest transfer</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label"> </property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Prior to reconciling an account which charges or pays interest, prompt the user to enter a transaction for the interest charge or payment. Currently only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts.</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="parent_label">
+ <object class="GtkCheckButton" id="hidden_button">
+ <property name="label" translatable="yes">H_idden</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register. To reset this option, you will first need to open the "Filter By..." dialog for the account tree and check the "show hidden accounts" option. Doing so will allow you to select the account and reopen this dialog.</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">_Parent Account</property>
<property name="use-underline">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -1604,71 +1558,47 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="parent_scroll">
+ <object class="GtkCheckButton" id="opening_balance_button">
+ <property name="label" translatable="yes">Opening balance</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow-type">in</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">This account holds opening balance transactions. Only one account per commodity can hold opening balance transactions.</property>
+ <property name="halign">start</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left-attach">1</property>
+ <property name="left-attach">2</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="type_vbox">
+ <object class="GtkCheckButton" id="tax_related_button">
+ <property name="label" translatable="yes">Ta_x related</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow32">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hscrollbar-policy">never</property>
- <property name="shadow-type">in</property>
- <child>
- <object class="GtkTreeView" id="type_view">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="halign">start</property>
- <property name="vexpand">True</property>
- <property name="headers-visible">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes" comments="Translators: use the same words here as in 'Ta_x Report Options'.">Use Edit->Tax Report Options to set the tax-related flag and assign a tax code to this account.</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
- <style>
- <class name="gnc-class-account"/>
- </style>
</object>
- <packing>
- <property name="tab-expand">True</property>
- </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label308">
Summary of changes:
gnucash/gnome-utils/dialog-account.c | 87 +--
gnucash/gnome-utils/gnc-tree-model-account-types.c | 87 ++-
gnucash/gnome-utils/gnc-tree-model-account-types.h | 10 +
gnucash/gtkbuilder/dialog-account.glade | 698 +++++++++------------
4 files changed, 454 insertions(+), 428 deletions(-)
More information about the gnucash-changes
mailing list