diff --git a/ChangeLog b/ChangeLog index f756eee10e..6a33586ba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,18 @@ +2001-05-20 Dave Peticolas + + * src/gnome/new-user-funs.h: add api & glade work for new + user choices dialog. + 2001-05-21 Robert Graham Merkel - * doc/sgml/C/xacc-multicolumn-view-reports.sgml: preliminary description. + * doc/sgml/C/xacc-multicolumn-view-reports.sgml: preliminary + description. * doc/sgml/C/xacc-report.sgml, xacc-balancesheet.sgml, xacc-asset-liability-piecharts.sgml : more updates. * src/scm/tip-list.scm: more tips. - 2001-05-19 Dave Peticolas * src/engine/sixtp.c (gnc_is_our_xml_file): fix mem leak @@ -31,7 +36,8 @@ pointer to NULL (xaccAccountRemoveGroup): set parent's child pointer to NULL - * src/engine/sixtp-dom-parsers.c (dom_tree_to_integer): fix mem leak + * src/engine/sixtp-dom-parsers.c (dom_tree_to_integer): fix mem + leak 2001-05-18 James LewisMoss diff --git a/src/gnome/new-user-funs.h b/src/gnome/new-user-funs.h index abeceeba9a..69e288694a 100644 --- a/src/gnome/new-user-funs.h +++ b/src/gnome/new-user-funs.h @@ -32,6 +32,8 @@ int gnc_ui_show_new_user_window(void); int gnc_ui_delete_new_user_window(void); +int gnc_ui_show_new_user_choice_window(void); + int gnc_ui_show_nu_cancel_dialog(void); int gnc_ui_delete_nu_cancel_dialog(void); diff --git a/src/gnome/new-user-interface.c b/src/gnome/new-user-interface.c index 950a56f95d..1669a796d5 100644 --- a/src/gnome/new-user-interface.c +++ b/src/gnome/new-user-interface.c @@ -105,7 +105,7 @@ create_newUserDialog (void) gnome_druid_page_start_set_logo_bg_color (GNOME_DRUID_PAGE_START (newUserStartPage), &newUserStartPage_logo_bg_color); gnome_druid_page_start_set_title_color (GNOME_DRUID_PAGE_START (newUserStartPage), &newUserStartPage_title_color); gnome_druid_page_start_set_title (GNOME_DRUID_PAGE_START (newUserStartPage), _("New Account List Setup")); - gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (newUserStartPage), _("This wizard will help you to set up a default set of accounts to use. If this is the first\ntime you have run GnuCash this dialog will appear. If you choose New File in the\nFile menu this dialog will also appear unless you have set the \"No account list setup\non new file\" option.")); + gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (newUserStartPage), _("This wizard will help you to set up a default set of accounts to use. This wizard\nwill appear If you choose New File in the File menu unless you have set the\n\"No account list setup on new file\" option in the Preferences window.")); newAccountCurrencyChoosePage = gnome_druid_page_standard_new_with_vals ("", NULL); gtk_widget_set_name (newAccountCurrencyChoosePage, "newAccountCurrencyChoosePage"); @@ -543,3 +543,100 @@ create_addAccountCancelDialog (void) return addAccountCancelDialog; } +GtkWidget* +create_newUserChoiceWindow (void) +{ + GtkWidget *newUserChoiceWindow; + GtkWidget *dialog_vbox1; + GtkWidget *frame4; + GtkWidget *vbox6; + GSList *new_user_group_group = NULL; + GtkWidget *radiobutton1; + GtkWidget *radiobutton2; + GtkWidget *radiobutton3; + GtkWidget *dialog_action_area2; + GtkWidget *button1; + GtkWidget *button3; + + newUserChoiceWindow = gnome_dialog_new (_("Welcome to GnuCash 1.6!"), NULL); + gtk_widget_set_name (newUserChoiceWindow, "newUserChoiceWindow"); + gtk_object_set_data (GTK_OBJECT (newUserChoiceWindow), "newUserChoiceWindow", newUserChoiceWindow); + gtk_window_set_policy (GTK_WINDOW (newUserChoiceWindow), FALSE, FALSE, FALSE); + + dialog_vbox1 = GNOME_DIALOG (newUserChoiceWindow)->vbox; + gtk_widget_set_name (dialog_vbox1, "dialog_vbox1"); + gtk_object_set_data (GTK_OBJECT (newUserChoiceWindow), "dialog_vbox1", dialog_vbox1); + gtk_widget_show (dialog_vbox1); + + frame4 = gtk_frame_new (NULL); + gtk_widget_set_name (frame4, "frame4"); + gtk_widget_ref (frame4); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "frame4", frame4, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (frame4); + gtk_box_pack_start (GTK_BOX (dialog_vbox1), frame4, FALSE, FALSE, 0); + + vbox6 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox6, "vbox6"); + gtk_widget_ref (vbox6); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "vbox6", vbox6, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox6); + gtk_container_add (GTK_CONTAINER (frame4), vbox6); + gtk_container_set_border_width (GTK_CONTAINER (vbox6), 3); + + radiobutton1 = gtk_radio_button_new_with_label (new_user_group_group, _("Create a new set of accounts")); + new_user_group_group = gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton1)); + gtk_widget_set_name (radiobutton1, "radiobutton1"); + gtk_widget_ref (radiobutton1); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "radiobutton1", radiobutton1, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (radiobutton1); + gtk_box_pack_start (GTK_BOX (vbox6), radiobutton1, FALSE, FALSE, 0); + + radiobutton2 = gtk_radio_button_new_with_label (new_user_group_group, _("Import my QIF files")); + new_user_group_group = gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton2)); + gtk_widget_set_name (radiobutton2, "radiobutton2"); + gtk_widget_ref (radiobutton2); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "radiobutton2", radiobutton2, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (radiobutton2); + gtk_box_pack_start (GTK_BOX (vbox6), radiobutton2, FALSE, FALSE, 0); + + radiobutton3 = gtk_radio_button_new_with_label (new_user_group_group, _("Open the new user tutorial")); + new_user_group_group = gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton3)); + gtk_widget_set_name (radiobutton3, "radiobutton3"); + gtk_widget_ref (radiobutton3); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "radiobutton3", radiobutton3, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (radiobutton3); + gtk_box_pack_start (GTK_BOX (vbox6), radiobutton3, FALSE, FALSE, 0); + + dialog_action_area2 = GNOME_DIALOG (newUserChoiceWindow)->action_area; + gtk_widget_set_name (dialog_action_area2, "dialog_action_area2"); + gtk_object_set_data (GTK_OBJECT (newUserChoiceWindow), "dialog_action_area2", dialog_action_area2); + gtk_widget_show (dialog_action_area2); + gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), GTK_BUTTONBOX_END); + gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area2), 8); + + gnome_dialog_append_button (GNOME_DIALOG (newUserChoiceWindow), GNOME_STOCK_BUTTON_OK); + button1 = GTK_WIDGET (g_list_last (GNOME_DIALOG (newUserChoiceWindow)->buttons)->data); + gtk_widget_set_name (button1, "button1"); + gtk_widget_ref (button1); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "button1", button1, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (button1); + GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT); + + gnome_dialog_append_button (GNOME_DIALOG (newUserChoiceWindow), GNOME_STOCK_BUTTON_CANCEL); + button3 = GTK_WIDGET (g_list_last (GNOME_DIALOG (newUserChoiceWindow)->buttons)->data); + gtk_widget_set_name (button3, "button3"); + gtk_widget_ref (button3); + gtk_object_set_data_full (GTK_OBJECT (newUserChoiceWindow), "button3", button3, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (button3); + GTK_WIDGET_SET_FLAGS (button3, GTK_CAN_DEFAULT); + + return newUserChoiceWindow; +} + diff --git a/src/gnome/new-user-interface.h b/src/gnome/new-user-interface.h index e7d837092e..31f1cbbec6 100644 --- a/src/gnome/new-user-interface.h +++ b/src/gnome/new-user-interface.h @@ -4,3 +4,4 @@ GtkWidget* create_newUserDialog (void); GtkWidget* create_addAccountCancelDialog (void); +GtkWidget* create_newUserChoiceWindow (void); diff --git a/src/gnome/new-user.glade b/src/gnome/new-user.glade index 57f32d0880..66d0d328e2 100644 --- a/src/gnome/new-user.glade +++ b/src/gnome/new-user.glade @@ -55,10 +55,9 @@ Tue, 09 Jan 2001 18:04:50 GMT New Account List Setup - This wizard will help you to set up a default set of accounts to use. If this is the first -time you have run GnuCash this dialog will appear. If you choose New File in the -File menu this dialog will also appear unless you have set the "No account list setup -on new file" option. + This wizard will help you to set up a default set of accounts to use. This wizard +will appear If you choose New File in the File menu unless you have set the +"No account list setup on new file" option in the Preferences window. 255,255,255 0,0,0 25,25,112 @@ -665,4 +664,130 @@ on new file" option. + + GnomeDialog + newUserChoiceWindow + Welcome to GnuCash 1.6! + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox1 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area2 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button1 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button3 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkFrame + frame4 + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkVBox + vbox6 + 3 + False + 0 + + + GtkRadioButton + radiobutton1 + True + + False + True + new_user_group + + 0 + False + False + + + + + GtkRadioButton + radiobutton2 + True + + False + True + new_user_group + + 0 + False + False + + + + + GtkRadioButton + radiobutton3 + True + + False + True + new_user_group + + 0 + False + False + + + + + + +