diff --git a/po/POTFILES.in b/po/POTFILES.in index 8b88752d51..3de35276ad 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -208,11 +208,8 @@ src/gnome/dialog-sx-editor.c src/gnome/dialog-sx-from-trans.c src/gnome/dialog-sx-since-last-run.c src/gnome/dialog-tax-info.c -src/gnome/glade/newuser.glade -src/gnome/glade/progress.glade src/gnome/glade/sched-xact.glade src/gnome/glade/tax.glade -src/gnome/glade/userpass.glade src/gnome/gnc-plugin-account-tree.c src/gnome/gnc-plugin-basic-commands.c src/gnome/gnc-plugin-budget.c @@ -230,17 +227,16 @@ src/gnome/gtkbuilder/assistant-stock-split.glade src/gnome/gtkbuilder/dialog-commodities.glade src/gnome/gtkbuilder/dialog-fincalc.glade src/gnome/gtkbuilder/dialog-lot-viewer.glade +src/gnome/gtkbuilder/dialog-new-user.glade src/gnome/gtkbuilder/dialog-price.glade src/gnome/gtkbuilder/dialog-print-check.glade +src/gnome/gtkbuilder/dialog-progress.glade src/gnome/gtkbuilder/dialog-sx.glade src/gnome/gtkbuilder/gnc-plugin-page-budget.glade src/gnome/gtkbuilder/gnc-plugin-page-register.glade -src/gnome/gtkbuilder/newuser.glade src/gnome/gtkbuilder/owner.glade -src/gnome/gtkbuilder/progress.glade src/gnome/gtkbuilder/sched-xact.glade src/gnome/gtkbuilder/tax.glade -src/gnome/gtkbuilder/userpass.glade src/gnome/gtkbuilder/window-autoclear.glade src/gnome/gtkbuilder/window-reconcile.glade src/gnome/reconcile-list.c diff --git a/src/gnome-utils/gtkbuilder/Makefile.am b/src/gnome-utils/gtkbuilder/Makefile.am index 380d52d979..7484176c22 100644 --- a/src/gnome-utils/gtkbuilder/Makefile.am +++ b/src/gnome-utils/gtkbuilder/Makefile.am @@ -2,6 +2,7 @@ gtkbuilderdir = $(GNC_GTKBUILDER_DIR) gtkbuilder_DATA = \ dialog-commodity.glade \ dialog-transfer.glade \ + dialog-userpass.glade \ gnc-date-format.glade \ gnc-frequency.glade \ gnc-recurrence.glade diff --git a/src/gnome/gtkbuilder/userpass.glade b/src/gnome-utils/gtkbuilder/dialog-userpass.glade similarity index 78% rename from src/gnome/gtkbuilder/userpass.glade rename to src/gnome-utils/gtkbuilder/dialog-userpass.glade index b17cc89af7..d8264a1a23 100644 --- a/src/gnome/gtkbuilder/userpass.glade +++ b/src/gnome-utils/gtkbuilder/dialog-userpass.glade @@ -1,19 +1,67 @@ - + True + False Username and Password dialog True - vertical + False 8 + + + 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 Enter your username and password center @@ -26,6 +74,7 @@ True + False 6 2 2 @@ -34,6 +83,7 @@ True + False _Username: True center @@ -47,6 +97,7 @@ True + False _Password: True center @@ -65,6 +116,10 @@ True True True + False + False + True + True 1 @@ -78,6 +133,10 @@ True False True + False + False + True + True 1 @@ -89,56 +148,16 @@ + True + True 3 - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - cancelbutton - okbutton + cancel_button + ok_button diff --git a/src/gnome/dialog-new-user.c b/src/gnome/dialog-new-user.c index 83a3e52f95..35cc32af57 100644 --- a/src/gnome/dialog-new-user.c +++ b/src/gnome/dialog-new-user.c @@ -80,17 +80,18 @@ gnc_ui_new_user_dialog (void) GtkWidget *new_accounts_button; GtkWidget *import_qif_button; GtkWidget *tutorial_button; - GladeXML *xml; + GtkBuilder *builder; gint result; ENTER(" "); - xml = gnc_glade_xml_new ("newuser.glade", "New User Dialog"); + builder = gtk_builder_new(); + gnc_builder_add_from_file (builder, "dialog-new-user.glade", "New User Dialog"); - dialog = glade_xml_get_widget (xml, "New User Dialog"); + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "New User Dialog")); - new_accounts_button = glade_xml_get_widget (xml, "new_accounts_button"); - import_qif_button = glade_xml_get_widget (xml, "import_qif_button"); - tutorial_button = glade_xml_get_widget (xml, "tutorial_button"); + new_accounts_button = GTK_WIDGET(gtk_builder_get_object (builder, "new_accounts_button")); + import_qif_button = GTK_WIDGET(gtk_builder_get_object (builder, "import_qif_button")); + tutorial_button = GTK_WIDGET(gtk_builder_get_object (builder, "tutorial_button")); /* Set the sensitivity of the qif-import button based on the availability * of the qif-import druid. @@ -128,6 +129,7 @@ gnc_ui_new_user_dialog (void) g_assert_not_reached (); } + g_object_unref(G_OBJECT(builder)); gtk_widget_destroy (dialog); LEAVE(" "); } @@ -136,13 +138,14 @@ static void gnc_ui_new_user_cancel_dialog (void) { GtkWidget *dialog; - GladeXML *xml; + GtkBuilder *builder; gint result; gboolean keepshowing; - xml = gnc_glade_xml_new ("newuser.glade", "New User Cancel Dialog"); + builder = gtk_builder_new(); + gnc_builder_add_from_file (builder, "dialog-new-user.glade", "New User Cancel Dialog"); - dialog = glade_xml_get_widget (xml, "New User Cancel Dialog"); + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "New User Cancel Dialog")); result = gtk_dialog_run (GTK_DIALOG (dialog)); keepshowing = (result == GTK_RESPONSE_YES); @@ -150,6 +153,7 @@ gnc_ui_new_user_cancel_dialog (void) gnc_set_first_startup (keepshowing); gncp_new_user_finish (); + g_object_unref(G_OBJECT(builder)); gtk_widget_destroy(dialog); } diff --git a/src/gnome/dialog-progress.c b/src/gnome/dialog-progress.c index 9908990e00..644e5c2156 100644 --- a/src/gnome/dialog-progress.c +++ b/src/gnome/dialog-progress.c @@ -197,13 +197,15 @@ gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress) { GtkWidget *dialog; GtkObject *tdo; - GladeXML *xml; + GtkBuilder *builder; g_return_if_fail(progress); - xml = gnc_glade_xml_new("progress.glade", "Progress Dialog"); + builder = gtk_builder_new(); + gnc_builder_add_from_file (builder, "dialog-progress.glade", "Progress Dialog"); - dialog = glade_xml_get_widget(xml, "Progress Dialog"); + + dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Progress Dialog")); progress->dialog = dialog; tdo = GTK_OBJECT(dialog); @@ -215,24 +217,24 @@ gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress) g_signal_connect(tdo, "destroy", G_CALLBACK(destroy_cb), progress); - progress->primary_label = glade_xml_get_widget(xml, "primary_label"); + progress->primary_label = GTK_WIDGET(gtk_builder_get_object (builder, "primary_label")); gtk_widget_hide(progress->primary_label); - progress->secondary_label = glade_xml_get_widget(xml, "secondary_label"); + progress->secondary_label = GTK_WIDGET(gtk_builder_get_object (builder, "secondary_label")); gtk_widget_hide(progress->secondary_label); - progress->progress_bar = glade_xml_get_widget(xml, "progress_bar"); + progress->progress_bar = GTK_WIDGET(gtk_builder_get_object (builder, "progress_bar")); progress->total_offset = 0; progress->total_weight = 1; progress->bar_value = 0; - progress->sub_label = glade_xml_get_widget(xml, "sub_label"); + progress->sub_label = GTK_WIDGET(gtk_builder_get_object (builder, "sub_label")); gtk_widget_hide(progress->sub_label); - progress->log = glade_xml_get_widget(xml, "progress_log"); - gtk_widget_hide(glade_xml_get_widget(xml, "progress_log_window")); + progress->log = GTK_WIDGET(gtk_builder_get_object (builder, "progress_log")); + gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object (builder, "progress_log_window"))); - progress->ok_button = glade_xml_get_widget(xml, "ok_button"); + progress->ok_button = GTK_WIDGET(gtk_builder_get_object (builder, "ok_button")); g_signal_connect(progress->ok_button, "clicked", G_CALLBACK(ok_cb), progress); @@ -240,7 +242,7 @@ gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress) if (!progress->use_ok_button) gtk_widget_hide(progress->ok_button); - progress->cancel_button = glade_xml_get_widget(xml, "cancel_button"); + progress->cancel_button = GTK_WIDGET(gtk_builder_get_object (builder, "cancel_button")); g_signal_connect(progress->cancel_button, "clicked", G_CALLBACK(cancel_cb), progress); @@ -254,6 +256,9 @@ gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress) progress->finished = FALSE; progress->destroyed = FALSE; progress->title_set = FALSE; + + gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, progress); + g_object_unref(G_OBJECT(builder)); } diff --git a/src/gnome/glade/Makefile.am b/src/gnome/glade/Makefile.am index 4498a05d0e..375b21a4ee 100644 --- a/src/gnome/glade/Makefile.am +++ b/src/gnome/glade/Makefile.am @@ -1,9 +1,6 @@ gladedir = $(GNC_GLADE_DIR) glade_DATA = \ - newuser.glade \ - progress.glade \ tax.glade \ - userpass.glade \ sched-xact.glade EXTRA_DIST = $(glade_DATA) diff --git a/src/gnome/glade/newuser.glade b/src/gnome/glade/newuser.glade deleted file mode 100644 index a77cab2046..0000000000 --- a/src/gnome/glade/newuser.glade +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - True - 5 - False - True - center - dialog - False - - - True - vertical - 14 - - - True - 5 - 2 - 2 - 12 - 12 - - - True - 0 - gtk-home - 6 - - - 2 - GTK_FILL - - - - - True - 0 - <span size="larger" weight="bold">Welcome to GnuCash!</span> - True - - - 1 - 2 - GTK_FILL - - - - - - True - vertical - 6 - - - True - 0 - There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the <i>OK</i> button or press the <i>Cancel</i> button if you don't want to perform any of them. - True - True - - - False - False - 0 - - - - - C_reate a new set of accounts - True - True - True - False - True - True - - - False - False - 1 - - - - - _Import my QIF files - True - True - False - True - True - new_accounts_button - - - False - False - 2 - - - - - _Open the new user tutorial - True - True - False - True - True - new_accounts_button - - - False - False - 3 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - False - False - 1 - - - - - True - end - - - gtk-cancel - -6 - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - -5 - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - - True - 5 - False - True - center-on-parent - dialog - False - - - True - vertical - 14 - - - True - 5 - 2 - 2 - 12 - 12 - - - True - 0 - gtk-dialog-question - 6 - - - 2 - GTK_FILL - - - - - True - 0 - <span weight="bold" size="larger">Display Welcome Dialog Again?</span> - True - - - 1 - 2 - GTK_FILL - - - - - - True - If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again. - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - 1 - - - - - True - end - - - gtk-no - -9 - True - True - True - False - True - - - False - False - 0 - - - - - gtk-yes - -8 - True - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - diff --git a/src/gnome/glade/progress.glade b/src/gnome/glade/progress.glade deleted file mode 100644 index 0dd1a998bb..0000000000 --- a/src/gnome/glade/progress.glade +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - True - 6 - Working... - False - True - dialog - - - True - 5 - vertical - 12 - - - True - 0 - <span weight="bold" size="larger">Primary text</span> - True - True - - - False - False - 0 - - - - - True - 0 - Secondary text. - True - - - False - False - 1 - - - - - True - vertical - - - True - 0.10000000149 - - - False - False - 0 - - - - - True - 0 - <span style="italic">Sub-operation text</span> - True - True - - - False - False - 1 - - - - - False - False - 6 - 2 - - - - - True - False - automatic - automatic - in - - - True - True - False - word - False - False - 1234567890123456789012345678901234567890 - - - - - 3 - - - - - True - 6 - end - - - gtk-cancel - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - False - True - True - False - True - - - False - False - 1 - - - - - False - end - 4 - - - - - - diff --git a/src/gnome/glade/userpass.glade b/src/gnome/glade/userpass.glade deleted file mode 100644 index 310db4fc97..0000000000 --- a/src/gnome/glade/userpass.glade +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - True - Username and Password - dialog - - - True - vertical - 8 - - - True - Enter your username and password - center - - - False - False - 2 - - - - - True - 6 - 2 - 2 - 12 - 6 - - - True - _Username: - True - center - username_entry - - - GTK_FILL - - - - - - True - _Password: - True - center - password_entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - 3 - - - - - True - end - - - gtk-cancel - -6 - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - -5 - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - diff --git a/src/gnome/gtkbuilder/Makefile.am b/src/gnome/gtkbuilder/Makefile.am index 2b82f8e6bf..1d10868263 100644 --- a/src/gnome/gtkbuilder/Makefile.am +++ b/src/gnome/gtkbuilder/Makefile.am @@ -8,16 +8,15 @@ gtkbuilder_DATA = \ dialog-commodities.glade \ dialog-lot-viewer.glade \ dialog-fincalc.glade \ + dialog-new-user.glade \ dialog-price.glade \ dialog-print-check.glade \ + dialog-progress.glade \ dialog-sx.glade \ gnc-plugin-page-budget.glade \ gnc-plugin-page-register.glade \ - newuser.glade \ owner.glade \ - progress.glade \ tax.glade \ - userpass.glade \ window-autoclear.glade \ window-reconcile.glade diff --git a/src/gnome/gtkbuilder/newuser.glade b/src/gnome/gtkbuilder/dialog-new-user.glade similarity index 87% rename from src/gnome/gtkbuilder/newuser.glade rename to src/gnome/gtkbuilder/dialog-new-user.glade index 7e65dfe910..e5541e3243 100644 --- a/src/gnome/gtkbuilder/newuser.glade +++ b/src/gnome/gtkbuilder/dialog-new-user.glade @@ -1,22 +1,71 @@ - + - + True + False 5 False True - center + center-on-parent dialog True - vertical + False 14 + + + True + False + end + + + gtk-no + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-yes + True + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 5 2 2 @@ -25,6 +74,134 @@ True + False + 0 + gtk-dialog-question + 6 + + + 2 + GTK_FILL + + + + + True + False + 0 + <span weight="bold" size="larger">Display Welcome Dialog Again?</span> + True + + + 1 + 2 + GTK_FILL + + + + + + True + False + If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again. + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + True + 1 + + + + + + no_but + yes_but + + + + True + False + 5 + False + True + center + dialog + + + True + False + 14 + + + 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 + 5 + 2 + 2 + 12 + 12 + + + True + False 0 gtk-home 6 @@ -37,6 +214,7 @@ True + False 0 <span size="larger" weight="bold">Welcome to GnuCash!</span> True @@ -51,11 +229,12 @@ True - vertical + False 6 True + False 0 There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the <i>OK</i> button or press the <i>Cancel</i> button if you don't want to perform any of them. True @@ -74,6 +253,7 @@ True True False + False True True @@ -89,6 +269,7 @@ True True False + False True True new_accounts_button @@ -105,6 +286,7 @@ True True False + False True True new_accounts_button @@ -132,170 +314,11 @@ 1 - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - button - button1 - - - - True - 5 - False - True - center-on-parent - dialog - - - True - vertical - 14 - - - True - 5 - 2 - 2 - 12 - 12 - - - True - 0 - gtk-dialog-question - 6 - - - 2 - GTK_FILL - - - - - True - 0 - <span weight="bold" size="larger">Display Welcome Dialog Again?</span> - True - - - 1 - 2 - GTK_FILL - - - - - - True - If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again. - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - 1 - - - - - True - end - - - gtk-no - True - True - True - False - True - - - False - False - 0 - - - - - gtk-yes - True - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - button - button1 + cancel_but + ok_but diff --git a/src/gnome/gtkbuilder/progress.glade b/src/gnome/gtkbuilder/dialog-progress.glade similarity index 88% rename from src/gnome/gtkbuilder/progress.glade rename to src/gnome/gtkbuilder/dialog-progress.glade index a867e1b8b0..2c6f25afc1 100644 --- a/src/gnome/gtkbuilder/progress.glade +++ b/src/gnome/gtkbuilder/dialog-progress.glade @@ -1,9 +1,10 @@ - + True + False 6 Working... False @@ -12,12 +13,13 @@ True + False 5 - vertical 12 True + False 0 <span weight="bold" size="larger">Primary text</span> True @@ -32,6 +34,7 @@ True + False 0 Secondary text. True @@ -45,10 +48,11 @@ True - vertical + False True + False 0.10000000149 @@ -60,6 +64,7 @@ True + False 0 <span style="italic">Sub-operation text</span> True @@ -99,12 +104,15 @@ + True + True 3 - + True + False 6 end @@ -113,6 +121,7 @@ True True False + False True @@ -129,6 +138,7 @@ True True False + False True @@ -140,6 +150,7 @@ False + True end 4