From 4a81e94b6668021f22c81d281504bba4cfded2d4 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Sun, 18 Jun 2017 13:14:18 +0100 Subject: [PATCH] Files linked to dialog-tax-table.glade --- src/gnome-utils/dialog-tax-table.c | 11 +- .../gtkbuilder/dialog-tax-table.glade | 625 +++++++++--------- 2 files changed, 301 insertions(+), 335 deletions(-) diff --git a/src/gnome-utils/dialog-tax-table.c b/src/gnome-utils/dialog-tax-table.c index eac19e7078..15de019adf 100644 --- a/src/gnome-utils/dialog-tax-table.c +++ b/src/gnome-utils/dialog-tax-table.c @@ -230,9 +230,9 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table, /* Open and read the Glade File */ builder = gtk_builder_new(); gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "type_liststore"); - gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "New Tax Table Dialog"); + gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "new_tax_table_dialog"); - ntt->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "New Tax Table Dialog")); + ntt->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "new_tax_table_dialog")); ntt->name_entry = GTK_WIDGET(gtk_builder_get_object (builder, "name_entry")); if (name) gtk_entry_set_text (GTK_ENTRY (ntt->name_entry), name); @@ -291,9 +291,6 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table, gtk_widget_hide (ntt->name_entry); /* Tables are great for layout, but a pain when you hide widgets */ widget = GTK_WIDGET(gtk_builder_get_object (builder, "ttd_table")); - gtk_table_set_row_spacing (GTK_TABLE(widget), 0, 0); - gtk_table_set_row_spacing (GTK_TABLE(widget), 1, 0); - gtk_table_set_row_spacing (GTK_TABLE(widget), 2, 0); gtk_widget_grab_focus (gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (ntt->amount_entry))); } @@ -710,8 +707,8 @@ gnc_ui_tax_table_window_new (QofBook *book) /* Open and read the Glade File */ builder = gtk_builder_new(); - gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "Tax Table Window"); - ttw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Tax Table Window")); + gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "tax_table_window_dialog"); + ttw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "tax_table_window_dialog")); ttw->names_view = GTK_WIDGET(gtk_builder_get_object (builder, "tax_tables_view")); ttw->entries_view = GTK_WIDGET(gtk_builder_get_object (builder, "tax_table_entries")); diff --git a/src/gnome-utils/gtkbuilder/dialog-tax-table.glade b/src/gnome-utils/gtkbuilder/dialog-tax-table.glade index 6677ac27bf..077ea18344 100644 --- a/src/gnome-utils/gtkbuilder/dialog-tax-table.glade +++ b/src/gnome-utils/gtkbuilder/dialog-tax-table.glade @@ -1,325 +1,32 @@ - + + - - - - False - 6 - True - 370 - dialog - - - True - False - 8 - - - True - False - end - - - gtk-cancel - True - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 7 - 2 - 12 - 6 - - - True - True - - True - True - False - False - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - False - 0 - - - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - <b>Tax Table Entry</b> - True - - - 2 - 3 - 4 - GTK_FILL - - - - - - True - False - 0 - <b>Tax Table</b> - True - - - 2 - GTK_FILL - - - - - - True - False - 12 - - - True - False - 0 - 0 - _Account: - True - - - - - 6 - 7 - GTK_FILL - GTK_FILL - - - - - True - False - 12 - - - True - False - 0 - _Value: - True - right - - - - - 5 - 6 - GTK_FILL - GTK_FILL - - - - - True - False - 12 - - - True - False - 0 - _Type: - True - right - type_combobox - - - - - 4 - 5 - GTK_FILL - GTK_FILL - - - - - True - True - never - automatic - - - - - - 1 - 2 - 6 - 7 - - - - - True - False - - - - - - 1 - 2 - 5 - 6 - GTK_FILL - - - - - True - False - 12 - - - True - False - 0 - _Name: - True - right - name_entry - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - type_liststore - - - - 0 - - - - - 1 - 2 - 4 - 5 - GTK_FILL - GTK_FILL - - - - - - - - True - True - 2 - - - - - - cancel_button - ok_button - - - + + True False Tax Tables normal - + True False + vertical 8 - + True False end - gtk-close + _Close True True True True - False - True + True @@ -337,21 +44,22 @@ - + True False 12 - + True False 6 + vertical 6 True False - 0 + start <b>Tax Tables</b> True @@ -370,8 +78,6 @@ True True - automatic - automatic in @@ -379,6 +85,9 @@ True False True + + + @@ -396,19 +105,18 @@ False 12 - + True False 6 spread - gtk-delete + _Delete True True True - False - True + True @@ -419,12 +127,11 @@ - gtk-new + _New True True True - False - True + True @@ -450,16 +157,17 @@ - + True False 6 + vertical 6 True False - 0 + start <b>Tax Table Entries</b> True @@ -478,8 +186,6 @@ True True - automatic - automatic in @@ -487,6 +193,9 @@ True False True + + + @@ -504,19 +213,18 @@ False 12 - + True False 6 spread - _Edit + _Edit True True True - False - True + True @@ -527,12 +235,11 @@ - gtk-delete + De_lete True True True - False - True + True @@ -543,12 +250,11 @@ - gtk-new + Ne_w True True True - False - True + True @@ -600,4 +306,267 @@ + + False + 6 + True + 370 + dialog + + + True + False + vertical + 8 + + + True + False + end + + + _Cancel + True + True + True + True + True + + + False + False + 0 + + + + + _OK + True + True + True + True + True + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + True + + True + False + False + + + 1 + 1 + + + + + True + False + + + 0 + 2 + + + + + True + False + start + <b>Tax Table Entry</b> + True + + + 0 + 3 + 2 + + + + + True + False + start + <b>Tax Table</b> + True + + + 0 + 0 + 2 + + + + + True + False + 12 + + + True + False + start + start + _Account: + True + + + + + 0 + 6 + + + + + True + False + 12 + + + True + False + start + _Value: + True + right + + + + + 0 + 5 + + + + + True + False + 12 + + + True + False + start + _Type: + True + right + type_combobox + + + + + 0 + 4 + + + + + True + True + True + True + never + + + + + + 1 + 6 + + + + + True + False + + + + + + 1 + 5 + + + + + True + False + 12 + + + True + False + start + _Name: + True + right + name_entry + + + + + 0 + 1 + + + + + True + False + type_liststore + + + + 0 + + + + + 1 + 4 + + + + + + + + True + True + 2 + + + + + + cancel_button + ok_button + +