From 45025303ea79e35c06fdfe14ff338a7c5a9de784 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Sat, 21 Jan 2006 16:35:58 +0000 Subject: [PATCH] HIG rework on a couple of dialogs. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12921 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 13 + .../business-gnome/glade/billterms.glade | 934 +++++++++--------- .../dialog-tax-table/dialog-tax-table.c | 26 +- .../dialog-tax-table/tax-tables.glade | 890 +++++++++-------- 4 files changed, 966 insertions(+), 897 deletions(-) diff --git a/ChangeLog b/ChangeLog index fed8ff9fea..b6e6966358 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-01-21 David Hampton + + * src/business/business-gnome/glade/billterms.glade: + * src/business/dialog-tax-table/dialog-tax-table.c: + * src/business/dialog-tax-table/tax-tables.glade: HIG rework on a + couple of dialogs. + + * src/import-export/qif-import/qif.glade: + * src/import-export/binary-import/binary-import.glade: + * src/import-export/import-provider-format.glade: + * src/import-export/hbci/glade/hbci.glade: Do some HIG cleanup. + Remove extraneous newline characters from strings. + 2006-01-21 Christian Stimming * src/import-export/hbci/glade/hbci.glade: Add field length limits diff --git a/src/business/business-gnome/glade/billterms.glade b/src/business/business-gnome/glade/billterms.glade index b4af7c41c8..07bdb1c25d 100644 --- a/src/business/business-gnome/glade/billterms.glade +++ b/src/business/business-gnome/glade/billterms.glade @@ -40,7 +40,7 @@ True GTK_RELIEF_NORMAL True - -7 + -6 @@ -57,22 +57,46 @@ True False - 0 + 6 - - 1 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 2 + True - False - 0 + <b>Terms</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 @@ -110,81 +134,65 @@ - - 0 - True - True - + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - True - 0 - - - - True - Create a new Billing Term - True - New... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - + GTK_BUTTONBOX_SPREAD + 6 True Delete the current Billing Term True - Delete - True + gtk-delete + True GTK_RELIEF_NORMAL True - - 0 - False - False - + + + + + True + Create a new Billing Term + True + gtk-new + True + GTK_RELIEF_NORMAL + True + + - - 0 - False - True - GTK_PACK_END - - - - - - True - Terms - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + False + True @@ -196,86 +204,119 @@ - - 1 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + + + 0 + False + True + + + + + + True + False + 0 - - 2 + True - False - 0 + <b>Term Definition</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 - + + 2 True False - 0 + 6 - + True - True - 0 + 3 + 2 + False + 0 + 12 True - Description: - False + De_scription: + True False GTK_JUSTIFY_RIGHT False False - 1 + 0 0.5 0 0 + desc_entry - 0 - False - False + 0 + 1 + 0 + 1 + fill + True - Type: - False + _Type: + True False GTK_JUSTIFY_RIGHT False False - 1 + 0 0.5 0 0 - 0 - False - False + 0 + 1 + 1 + 2 + fill + - - - 0 - False - False - - - - - - True - True - 0 @@ -288,47 +329,58 @@ 0 True - * + * True - 0 - False - False + 1 + 2 + 0 + 1 + - + + True + (type) + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + True False 0 - - True - (type) - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - + - 0 - False - False + 1 + 2 + 2 + 3 + fill @@ -338,81 +390,40 @@ True - - - 0 - False - True - - - - - - True - False - 0 - - - - - 0 - False - True - - - - - - True - True - 0 - - - + True - Edit the current Billing Term - True - Edit... - True - GTK_RELIEF_NORMAL - True - + GTK_BUTTONBOX_SPREAD + 0 + + + + True + Edit the current Billing Term + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + 0 False - False + True + GTK_PACK_END - - 0 - False - True - GTK_PACK_END - - - - - - True - Term Definition - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -496,295 +507,295 @@ - + True + 7 + 2 False - 0 + 0 + 0 - - 2 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - 3 - True - False - 0 - - - - True - Name: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - The internal name of the Billing Term. - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - - - - True - New Billing Terms - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - + The internal name of the Billing Term. + True + True + True + 0 + + True + * + True - 0 - False - True + 1 + 2 + 1 + 2 + - - 1 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + The description of the Billing Term, printed on invoices + True + True + True + True + 0 + + True + * + True + + + 1 + 2 + 4 + 5 + + + - - - 2 + + + True + Choose the type of Billing Term + True + 0 + + + True - False - 0 - + True - False - 0 - - - - True - True - 0 - - - - True - Description: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Type: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - True - 0 - - - - True - The description of the Billing Term, printed on invoices - True - True - True - True - 0 - - True - * - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Choose the type of Billing Term - True - 0 - - - - True - - - - True - Type Menu - True - - - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - + Type Menu + True - - 0 - False - True - - - - - - True - False - 0 - - - - - - - 0 - False - True - - - - - True - Term Definition - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - 0 - True - True + 1 + 2 + 5 + 6 + fill + + + + + + + True + False + 0 + + + + + + + 1 + 2 + 6 + 7 + fill + + + + + + True + <b>New Billing Term</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + <b>Term Definition</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 3 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + _Name: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + name_entry + + + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + De_scription: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + desc_entry + + + + + 0 + 1 + 4 + 5 + fill + fill + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + _Type: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + type_menu + + + + + 0 + 1 + 5 + 6 + fill + fill @@ -838,7 +849,8 @@ True - False + True + True False GTK_POS_TOP False diff --git a/src/business/dialog-tax-table/dialog-tax-table.c b/src/business/dialog-tax-table/dialog-tax-table.c index 3982e16ce5..8d7a54f7aa 100644 --- a/src/business/dialog-tax-table/dialog-tax-table.c +++ b/src/business/dialog-tax-table/dialog-tax-table.c @@ -39,6 +39,7 @@ #include "dialog-tax-table.h" #define DIALOG_TAX_TABLE_CM_CLASS "tax-table-dialog" +#define GCONF_SECTION "dialogs/business/tax_tables" void tax_table_new_table_cb (GtkButton *button, TaxTableWindow *ttw); void tax_table_delete_table_cb (GtkButton *button, TaxTableWindow *ttw); @@ -256,12 +257,19 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table, ntt->acct_tree = GTK_WIDGET(gnc_tree_view_account_new (FALSE)); gtk_container_add (GTK_CONTAINER (box), ntt->acct_tree); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(ntt->acct_tree), FALSE); + gnc_tree_view_configure_columns (GNC_TREE_VIEW(ntt->acct_tree), NULL); /* Make 'enter' do the right thing */ gtk_entry_set_activates_default(GTK_ENTRY (gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (ntt->amount_entry))), TRUE); + /* Fix mnemonics for generated target widgets */ + widget = glade_xml_get_widget (xml, "value_label"); + gtk_label_set_mnemonic_widget (GTK_LABEL (widget), ntt->amount_entry); + widget = glade_xml_get_widget (xml, "account_label"); + gtk_label_set_mnemonic_widget (GTK_LABEL (widget), ntt->acct_tree); + /* Fill in the widgets appropriately */ if (entry) { gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (ntt->amount_entry), @@ -281,13 +289,23 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table, /* Show what we should */ gtk_widget_show_all (ntt->dialog); if (new_table == FALSE) { - widget = glade_xml_get_widget (xml, "table_frame"); - gtk_widget_hide_all (widget); + gtk_widget_hide (glade_xml_get_widget (xml, "table_title")); + gtk_widget_hide (glade_xml_get_widget (xml, "table_name")); + gtk_widget_hide (glade_xml_get_widget (xml, "spacer")); + gtk_widget_hide (ntt->name_entry); + /* Tables are great for layout, but a pain when you hide widgets */ + widget = glade_xml_get_widget (xml, "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))); } else gtk_widget_grab_focus (ntt->name_entry); + /* Display the dialog now that we're done manipulating it */ + gtk_widget_show (ntt->dialog); + done = FALSE; while (!done) { response = gtk_dialog_run (GTK_DIALOG (ntt->dialog)); @@ -615,6 +633,7 @@ tax_table_window_close (GtkWidget *widget, gpointer data) { TaxTableWindow *ttw = data; + gnc_save_window_size (GCONF_SECTION, GTK_WINDOW (ttw->dialog)); gnc_ui_tax_table_window_destroy (ttw); } @@ -649,7 +668,7 @@ gnc_ui_tax_table_window_new (GNCBook *book) if (!book) return NULL; /* - * Find an existing tax-tab;e window. If found, bring it to + * Find an existing tax-table window. If found, bring it to * the front. If we have an actual owner, then set it in * the window. */ @@ -683,6 +702,7 @@ gnc_ui_tax_table_window_new (GNCBook *book) ttw); tax_table_window_refresh (ttw); + gnc_restore_window_size (GCONF_SECTION, GTK_WINDOW (ttw->dialog)); gtk_widget_show_all (ttw->dialog); return ttw; } diff --git a/src/business/dialog-tax-table/tax-tables.glade b/src/business/dialog-tax-table/tax-tables.glade index 43c14623f2..5bf05143aa 100644 --- a/src/business/dialog-tax-table/tax-tables.glade +++ b/src/business/dialog-tax-table/tax-tables.glade @@ -14,7 +14,7 @@ True False False - GDK_WINDOW_TYPE_HINT_DIALOG + GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True @@ -39,7 +39,7 @@ True GTK_RELIEF_NORMAL True - 0 + -6 @@ -53,24 +53,50 @@ - + True - True + False + 12 - - 1 + + 6 True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 2 + True - False - 0 + <b>Tax Tables</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 @@ -108,101 +134,112 @@ - - 0 - True - True - + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - True - 0 - - - - True - True - New... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - + GTK_BUTTONBOX_SPREAD + 6 True True - Delete - True + gtk-delete + True GTK_RELIEF_NORMAL True - - 0 - False - False - + + + + + True + True + gtk-new + True + GTK_RELIEF_NORMAL + True + + - - 0 - False - True - + + 0 + False + True + + + + 0 + True + True + + + + + + 6 + True + False + 6 - + True - Tax Tables + <b>Tax Table Entries</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - True - False - - - - - - 1 - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 2 + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 @@ -240,101 +277,82 @@ - - 0 - True - True - + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - True - 0 - - - - True - True - New... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - + GTK_BUTTONBOX_SPREAD + 6 True True - Edit... - True + gtk-edit + True GTK_RELIEF_NORMAL True - - 0 - False - False - True True - Delete - True + gtk-delete + True GTK_RELIEF_NORMAL True - - 0 - False - False - + + + + + True + True + gtk-new + True + GTK_RELIEF_NORMAL + True + + - - 0 - False - True - - - - - - True - Tax Table Entries - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + False + True - True - True + 0 + True + True @@ -349,7 +367,7 @@ - True + 6 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -410,328 +428,334 @@ - + True + 7 + 2 False - 0 + 6 + 12 - - 2 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - 3 - True - False - 0 - - - - True - Name: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - - - - True - Tax Table - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - + True + True + True + 0 + + True + * + True - 0 - False - True + 1 + 2 + 1 + 2 + - - 3 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + <b>Tax Table Entry</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 3 + 4 + fill + + + + + + + True + <b>Tax Table</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - - 3 + True - False - 0 - - - - True - False - 0 - - - - True - True - 0 - - - - True - Type: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Value: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - True - 0 - - - - True - False - 0 - - - - True - True - 0 - - - - True - - - - True - Value ($) - True - - - - - - True - Percent (%) - True - - - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - 4 - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - - - - True - Tax Account - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - - - True - Tax Table Entry - False + _Account: + True False GTK_JUSTIFY_LEFT False False - 0.5 + 0 + 0 + 0 + 0 + + + + + 0 + 1 + 6 + 7 + fill + fill + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + _Value: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 0.5 0 0 - - label_item - - 0 - True - True + 0 + 1 + 5 + 6 + fill + fill + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + _Type: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + type_menu + + + + + 0 + 1 + 4 + 5 + fill + fill + + + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + + 1 + 2 + 6 + 7 + + + + + + True + True + 0 + + + + True + + + + True + Value ($) + True + + + + + + True + Percent (%) + True + + + + + + + 1 + 2 + 4 + 5 + + + + + + + True + False + 0 + + + + + + + 1 + 2 + 5 + 6 + fill + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + _Name: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + name_entry + + + + + 0 + 1 + 1 + 2 + fill + fill