diff --git a/src/gnome-utils/dialog-dup-trans.c b/src/gnome-utils/dialog-dup-trans.c index 94a8140b51..6d3279c47b 100644 --- a/src/gnome-utils/dialog-dup-trans.c +++ b/src/gnome-utils/dialog-dup-trans.c @@ -103,9 +103,9 @@ gnc_dup_trans_dialog_create (GtkWidget * parent, DupTransDialog *dt_dialog, builder = gtk_builder_new(); gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "num_adjustment"); gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "tnum_adjustment"); - gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "Duplicate Transaction Dialog"); + gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "duplicate_transaction_dialog"); - dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Duplicate Transaction Dialog")); + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "duplicate_transaction_dialog")); dt_dialog->dialog = dialog; /* parent */ diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index dcb069a4a0..7f674115e9 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -3053,8 +3053,8 @@ gnc_plugin_page_register_cmd_void_transaction (GtkAction *action, return; builder = gtk_builder_new(); - gnc_builder_add_from_file (builder , "gnc-plugin-page-register.glade", "Void Transaction"); - dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Void Transaction")); + gnc_builder_add_from_file (builder , "gnc-plugin-page-register.glade", "void_transaction_dialog"); + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "void_transaction_dialog")); entry = GTK_WIDGET(gtk_builder_get_object (builder, "reason")); result = gtk_dialog_run(GTK_DIALOG(dialog)); @@ -3161,8 +3161,8 @@ gnc_plugin_page_register_cmd_view_sort_by (GtkAction *action, /* Create the dialog */ builder = gtk_builder_new(); - gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "Sort By"); - dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Sort By")); + gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "sort_by_dialog"); + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "sort_by_dialog")); priv->sd.dialog = dialog; gtk_window_set_transient_for(GTK_WINDOW(dialog), gnc_window_get_gtk_window(GNC_WINDOW(GNC_PLUGIN_PAGE(page)->window))); @@ -3238,8 +3238,8 @@ gnc_plugin_page_register_cmd_view_filter_by (GtkAction *action, /* Create the dialog */ builder = gtk_builder_new(); - gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "Filter By"); - dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By")); + gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "filter_by_dialog"); + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "filter_by_dialog")); priv->fd.dialog = dialog; gtk_window_set_transient_for(GTK_WINDOW(dialog), gnc_window_get_gtk_window(GNC_WINDOW(GNC_PLUGIN_PAGE(page)->window))); diff --git a/src/gnome/gtkbuilder/gnc-plugin-page-register.glade b/src/gnome/gtkbuilder/gnc-plugin-page-register.glade index b6fcdab473..a04c1ff4e5 100644 --- a/src/gnome/gtkbuilder/gnc-plugin-page-register.glade +++ b/src/gnome/gtkbuilder/gnc-plugin-page-register.glade @@ -1,209 +1,8 @@ + - - - True - False - 6 - Duplicate Transaction - False - True - dialog - - - True - False - 6 - - - True - False - end - - - gtk-cancel - True - True - True - False - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 0 - <b>New Transaction Information</b> - True - - - False - False - 2 - - - - - True - False - 12 - - - True - False - 3 - 2 - 12 - 6 - - - True - False - 0 - _Date: - True - center - - - GTK_FILL - - - - - - True - False - 0 - _Number: - True - center - num_spin - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - False - False - True - True - num_adjustment - 1 - - - 1 - 2 - 1 - 2 - - - - - - True - False - - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - _Transaction Number: - True - center - tnum_spin - - - 2 - 3 - GTK_FILL - - - - - - True - True - False - False - tnum_adjustment - 1 - - - 1 - 2 - 2 - 3 - - - - - - - - True - True - 3 - - - - - - button76 - button77 - - - + + True False 6 @@ -216,6 +15,7 @@ True False + vertical 6 @@ -224,13 +24,12 @@ end - gtk-cancel + _Cancel True True True False - False - True + True False @@ -240,14 +39,13 @@ - gtk-ok + _OK True True True True False - False - True + True False @@ -268,17 +66,18 @@ True True - + True False 12 + vertical Show _All True True False - False + start True True @@ -292,7 +91,6 @@ True False - 0 False @@ -306,7 +104,7 @@ True True False - False + start True True filter_show_all @@ -319,23 +117,19 @@ - + True False - 7 - 3 6 True False - 0 Start: - GTK_FILL - - 12 + 0 + 0 @@ -344,16 +138,14 @@ True True False - False + start True True 1 - 2 - GTK_FILL - + 0 @@ -362,18 +154,14 @@ True True False - False + start True True 1 - 2 6 - 7 - GTK_FILL - @@ -382,7 +170,7 @@ True True False - False + start True True end_date_choose @@ -390,11 +178,7 @@ 1 - 2 5 - 6 - GTK_FILL - @@ -403,7 +187,7 @@ True True False - False + start True True end_date_choose @@ -411,39 +195,28 @@ 1 - 2 4 - 5 - GTK_FILL - True False - 0 + 0 3 - 4 - GTK_FILL - True False - 0 End: + 0 4 - 5 - GTK_FILL - - 12 @@ -452,7 +225,7 @@ True True False - False + start True True start_date_earliest @@ -460,11 +233,7 @@ 1 - 2 2 - 3 - GTK_FILL - @@ -473,7 +242,7 @@ True True False - False + start True True start_date_earliest @@ -481,15 +250,11 @@ 1 - 2 1 - 2 - GTK_FILL - - + True False @@ -498,13 +263,11 @@ 2 - 3 2 - 3 - + True False @@ -513,9 +276,7 @@ 2 - 3 6 - 7 @@ -569,31 +330,29 @@ - + True False + vertical - + True False 12 - 7 - 3 _Unreconciled True True False - False + start True True - 3 - GTK_FILL - + 0 + 0 @@ -602,17 +361,14 @@ True True False - False + start True True - 3 + 0 1 - 2 - GTK_FILL - @@ -621,17 +377,14 @@ True True False - False + start True True - 3 + 0 2 - 3 - GTK_FILL - @@ -640,17 +393,14 @@ True True False - False + start True True - 3 + 0 3 - 4 - GTK_FILL - @@ -659,17 +409,14 @@ True True False - False + start True True - 3 + 0 4 - 5 - GTK_FILL - @@ -678,37 +425,28 @@ True True True - False + center True - 1 - 2 + 0 6 - 7 - GTK_FILL - - + True False + 5 + 5 + True - 3 + 0 5 - 6 - GTK_EXPAND - - - - - - True @@ -741,7 +479,7 @@ - + True False @@ -750,9 +488,7 @@ True True False - False True - 1 True @@ -778,7 +514,12 @@ okbutton4 - + + 1000000000 + 1 + 10 + + True False 6 @@ -791,6 +532,7 @@ True False + vertical 6 @@ -799,13 +541,12 @@ end - gtk-cancel + _Cancel True True True False - False - True + True False @@ -815,14 +556,13 @@ - gtk-ok + _OK True True True True False - False - True + True False @@ -839,10 +579,11 @@ - + True False 12 + vertical _Standard Order @@ -850,7 +591,7 @@ True False Keep normal account order. - False + start True True @@ -862,7 +603,7 @@ - + True False @@ -879,7 +620,7 @@ True False Sort by date. - False + start True True BY_STANDARD @@ -898,7 +639,7 @@ True False Sort by the date of entry. - False + start True True BY_STANDARD @@ -917,7 +658,7 @@ True False Sort by the statement date (and group by cleared, unreconciled, reconciled). - False + start True True BY_STANDARD @@ -936,7 +677,7 @@ True False Sort by number. - False + start True True BY_STANDARD @@ -955,7 +696,7 @@ True False Sort by amount. - False + start True True BY_STANDARD @@ -974,7 +715,7 @@ True False Sort by memo. - False + start True True BY_STANDARD @@ -993,7 +734,7 @@ True False Sort by description. - False + start True True BY_STANDARD @@ -1012,7 +753,7 @@ True False Sort by action field. - False + start True True BY_STANDARD @@ -1031,7 +772,7 @@ True False Sort by notes field. - False + start True True BY_STANDARD @@ -1044,7 +785,7 @@ - + True False @@ -1066,7 +807,7 @@ - + True False @@ -1076,9 +817,8 @@ True False Save the sort order for this register. - False + start True - 1 True @@ -1097,8 +837,7 @@ True False Sort in descending order. - False - 0 + start True @@ -1129,34 +868,38 @@ okbutton2 - + + 1000000000 + 1 + 10 + + True False 6 - Void Transaction + Duplicate Transaction False True - center-on-parent dialog - + True False + vertical 6 - + True False end - - gtk-cancel + + _Cancel True True True False - False - True + True False @@ -1165,15 +908,14 @@ - - gtk-ok + + _OK True True True True False - False - True + True False @@ -1190,9 +932,196 @@ - + True False + start + <b>New Transaction Information</b> + True + + + False + False + 2 + + + + + True + False + 12 + + + True + False + 6 + 12 + + + True + False + start + _Date: + True + center + + + 0 + 0 + + + + + True + False + start + _Number: + True + center + num_spin + + + 0 + 1 + + + + + True + True + True + False + False + num_adjustment + 1 + + + 1 + 1 + + + + + True + False + + + + + + 1 + 0 + + + + + True + False + start + _Transaction Number: + True + center + tnum_spin + + + 0 + 2 + + + + + True + True + False + False + tnum_adjustment + 1 + + + 1 + 2 + + + + + + + True + True + 3 + + + + + + button76 + button77 + + + + True + False + 6 + Void Transaction + False + True + center-on-parent + dialog + + + True + False + vertical + 6 + + + True + False + end + + + _Cancel + True + True + True + False + True + + + False + False + 0 + + + + + _OK + True + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + vertical True @@ -1235,14 +1164,4 @@ okbutton1 - - 1000000000 - 1 - 10 - - - 1000000000 - 1 - 10 -