IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove cruft (extra window no longer used)

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4204 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
James LewisMoss
2001-05-15 15:50:46 +00:00
parent 6ff268fdd1
commit 36f9f20f01
7 changed files with 2 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gnome/new-user-callbacks.c
View File

@@ -109,12 +109,8 @@ on_newUserDruidFinishPage_finish (GnomeDruidPage *gnomedruidpage,
NULL, TRUE);
gnc_ui_delete_new_user_window();
gnc_ui_delete_nu_account_list();
gh_eval_str("(gnc:default-ui-start)");
/* now we need to load all the accounts into the program */
gh_eval_str("(gnc:show-main-window)");
gh_eval_str("(gnc:hook-run-danglers gnc:*book-opened-hook* #f)");
@@ -122,10 +118,8 @@ on_newUserDruidFinishPage_finish (GnomeDruidPage *gnomedruidpage,
if(our_final_group)
{
AccountGroup *group;
group = gnc_book_get_group(gncGetCurrentBook());
xaccGroupConcatGroup(group, our_final_group);
xaccGroupConcatGroup(gnc_book_get_group(gncGetCurrentBook()),
our_final_group);
}
}
@@ -156,7 +150,6 @@ on_newAccountCancelDialog_OKButton_clicked
gnc_ui_delete_new_user_window();
gnc_ui_delete_nu_cancel_dialog();
gnc_ui_delete_nu_account_list();
gh_eval_str("(gnc:default-ui-start)");
gh_eval_str("(gnc:show-main-window)");
@@ -231,18 +224,6 @@ on_chooseAccountTypesPage_prepare (GnomeDruidPage *gnomedruidpage,
}
void
on_newUserDruidFinishPage_prepare (GnomeDruidPage *gnomedruidpage,
gpointer arg1,
gpointer user_data)
{
/* gnc_ui_show_nu_account_list(); */
/* need to reset the account guids merge the lists and replace the
commodity with the one determined earlier here */
/* need to fill up the account list info here */
}
static gpointer
add_to_tree_account(Account* toadd, gpointer data)
{

5
src/gnome/new-user-callbacks.h
View File

@@ -61,11 +61,6 @@ on_chooseAccountTypesPage_prepare (GnomeDruidPage *gnomedruidpage,
gpointer arg1,
gpointer user_data);
void
on_newUserDruidFinishPage_prepare (GnomeDruidPage *gnomedruidpage,
gpointer arg1,
gpointer user_data);
void
on_newAccountTypesList_select_row (GtkCList *clist,
gint row,

12
src/gnome/new-user-funs.c
View File

@@ -41,7 +41,6 @@
static GtkWidget *newUserDialog = NULL;
static GtkWidget *cancelDialog = NULL;
static GtkWidget *accountList = NULL;
static Account*
clone_account(const Account* from, gnc_commodity *com)
@@ -351,14 +350,3 @@ gnc_ui_delete_nu_cancel_dialog(void)
return deleteit(&cancelDialog);
}
int
gnc_ui_show_nu_account_list(void)
{
return createit(create_newAccountList, &accountList);
}
int
gnc_ui_delete_nu_account_list(void)
{
return deleteit(&accountList);
}

3
src/gnome/new-user-funs.h
View File

@@ -35,9 +35,6 @@ int gnc_ui_delete_new_user_window(void);
int gnc_ui_show_nu_cancel_dialog(void);
int gnc_ui_delete_nu_cancel_dialog(void);
int gnc_ui_show_nu_account_list(void);
int gnc_ui_delete_nu_account_list(void);
void gnc_new_user_set_balance (Account *account, gnc_numeric balance);
gnc_numeric gnc_new_user_get_balance (Account *account);

178
src/gnome/new-user-interface.c
View File

@@ -467,188 +467,10 @@ create_newUserDialog (void)
gtk_signal_connect (GTK_OBJECT (newUserDruidFinishPage), "finish",
GTK_SIGNAL_FUNC (on_newUserDruidFinishPage_finish),
NULL);
gtk_signal_connect (GTK_OBJECT (newUserDruidFinishPage), "prepare",
GTK_SIGNAL_FUNC (on_newUserDruidFinishPage_prepare),
NULL);
return newUserDialog;
}
GtkWidget*
create_newAccountList (void)
{
GtkWidget *newAccountList;
GtkWidget *newAccountTopVBox;
GtkWidget *newAccountLable;
GtkWidget *newAccountHPaned;
GtkWidget *newAccountTreeScrolledWindow;
GtkWidget *newAccountTree;
GtkWidget *newAccountTreeAccountLabel;
GtkWidget *newAccountTreeDestriptionLabel;
GtkWidget *newAccountTreeStartingBalanceLabel;
GtkWidget *vbox4;
GtkWidget *newAccountAccountNameLabel;
GtkWidget *newAccountEnterStartingBalanceLabel;
GtkWidget *newAccountStartingBalanceEntry;
GtkWidget *hbox2;
GtkWidget *newAccountSelectAllButton;
GtkWidget *newAccountOKButton;
newAccountList = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (newAccountList, "newAccountList");
gtk_object_set_data (GTK_OBJECT (newAccountList), "newAccountList", newAccountList);
gtk_widget_set_usize (newAccountList, 200, 400);
gtk_window_set_title (GTK_WINDOW (newAccountList), _("New Account List"));
gtk_window_set_default_size (GTK_WINDOW (newAccountList), 640, 480);
newAccountTopVBox = gtk_vbox_new (FALSE, 0);
gtk_widget_set_name (newAccountTopVBox, "newAccountTopVBox");
gtk_widget_ref (newAccountTopVBox);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountTopVBox", newAccountTopVBox,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountTopVBox);
gtk_container_add (GTK_CONTAINER (newAccountList), newAccountTopVBox);
newAccountLable = gtk_label_new (_("If you would like the accounts to have a starting balance click on the account line and enter the starting balance in the text entry box on the right."));
gtk_widget_set_name (newAccountLable, "newAccountLable");
gtk_widget_ref (newAccountLable);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountLable", newAccountLable,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountLable);
gtk_box_pack_start (GTK_BOX (newAccountTopVBox), newAccountLable, FALSE, TRUE, 0);
gtk_label_set_justify (GTK_LABEL (newAccountLable), GTK_JUSTIFY_FILL);
gtk_label_set_line_wrap (GTK_LABEL (newAccountLable), TRUE);
gtk_misc_set_alignment (GTK_MISC (newAccountLable), 0.0800003, 0.08);
gtk_misc_set_padding (GTK_MISC (newAccountLable), 1, 1);
newAccountHPaned = gtk_hpaned_new ();
gtk_widget_set_name (newAccountHPaned, "newAccountHPaned");
gtk_widget_ref (newAccountHPaned);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountHPaned", newAccountHPaned,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountHPaned);
gtk_box_pack_start (GTK_BOX (newAccountTopVBox), newAccountHPaned, TRUE, TRUE, 0);
gtk_paned_set_position (GTK_PANED (newAccountHPaned), 1);
newAccountTreeScrolledWindow = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_name (newAccountTreeScrolledWindow, "newAccountTreeScrolledWindow");
gtk_widget_ref (newAccountTreeScrolledWindow);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountTreeScrolledWindow", newAccountTreeScrolledWindow,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountTreeScrolledWindow);
gtk_paned_pack1 (GTK_PANED (newAccountHPaned), newAccountTreeScrolledWindow, FALSE, FALSE);
newAccountTree = gtk_ctree_new (3, 0);
gtk_widget_set_name (newAccountTree, "newAccountTree");
gtk_widget_ref (newAccountTree);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountTree", newAccountTree,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountTree);
gtk_container_add (GTK_CONTAINER (newAccountTreeScrolledWindow), newAccountTree);
gtk_clist_set_column_width (GTK_CLIST (newAccountTree), 0, 86);
gtk_clist_set_column_width (GTK_CLIST (newAccountTree), 1, 233);
gtk_clist_set_column_width (GTK_CLIST (newAccountTree), 2, 80);
gtk_clist_column_titles_show (GTK_CLIST (newAccountTree));
newAccountTreeAccountLabel = gtk_label_new (_("Account Name"));
gtk_widget_set_name (newAccountTreeAccountLabel, "newAccountTreeAccountLabel");
gtk_widget_ref (newAccountTreeAccountLabel);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountTreeAccountLabel", newAccountTreeAccountLabel,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountTreeAccountLabel);
gtk_clist_set_column_widget (GTK_CLIST (newAccountTree), 0, newAccountTreeAccountLabel);
newAccountTreeDestriptionLabel = gtk_label_new (_("Description"));
gtk_widget_set_name (newAccountTreeDestriptionLabel, "newAccountTreeDestriptionLabel");
gtk_widget_ref (newAccountTreeDestriptionLabel);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountTreeDestriptionLabel", newAccountTreeDestriptionLabel,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountTreeDestriptionLabel);
gtk_clist_set_column_widget (GTK_CLIST (newAccountTree), 1, newAccountTreeDestriptionLabel);
newAccountTreeStartingBalanceLabel = gtk_label_new (_("Starting Balance"));
gtk_widget_set_name (newAccountTreeStartingBalanceLabel, "newAccountTreeStartingBalanceLabel");
gtk_widget_ref (newAccountTreeStartingBalanceLabel);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountTreeStartingBalanceLabel", newAccountTreeStartingBalanceLabel,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountTreeStartingBalanceLabel);
gtk_clist_set_column_widget (GTK_CLIST (newAccountTree), 2, newAccountTreeStartingBalanceLabel);
vbox4 = gtk_vbox_new (FALSE, 0);
gtk_widget_set_name (vbox4, "vbox4");
gtk_widget_ref (vbox4);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "vbox4", vbox4,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (vbox4);
gtk_paned_pack2 (GTK_PANED (newAccountHPaned), vbox4, TRUE, TRUE);
newAccountAccountNameLabel = gtk_label_new (_("Account: "));
gtk_widget_set_name (newAccountAccountNameLabel, "newAccountAccountNameLabel");
gtk_widget_ref (newAccountAccountNameLabel);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountAccountNameLabel", newAccountAccountNameLabel,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountAccountNameLabel);
gtk_box_pack_start (GTK_BOX (vbox4), newAccountAccountNameLabel, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (newAccountAccountNameLabel), GTK_JUSTIFY_RIGHT);
gtk_label_set_line_wrap (GTK_LABEL (newAccountAccountNameLabel), TRUE);
gtk_misc_set_alignment (GTK_MISC (newAccountAccountNameLabel), 0.49, 0.5);
newAccountEnterStartingBalanceLabel = gtk_label_new (_("Enter Starting Balance"));
gtk_widget_set_name (newAccountEnterStartingBalanceLabel, "newAccountEnterStartingBalanceLabel");
gtk_widget_ref (newAccountEnterStartingBalanceLabel);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountEnterStartingBalanceLabel", newAccountEnterStartingBalanceLabel,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountEnterStartingBalanceLabel);
gtk_box_pack_start (GTK_BOX (vbox4), newAccountEnterStartingBalanceLabel, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (newAccountEnterStartingBalanceLabel), GTK_JUSTIFY_RIGHT);
newAccountStartingBalanceEntry = gtk_entry_new ();
gtk_widget_set_name (newAccountStartingBalanceEntry, "newAccountStartingBalanceEntry");
gtk_widget_ref (newAccountStartingBalanceEntry);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountStartingBalanceEntry", newAccountStartingBalanceEntry,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountStartingBalanceEntry);
gtk_box_pack_start (GTK_BOX (vbox4), newAccountStartingBalanceEntry, FALSE, FALSE, 0);
gtk_widget_set_usize (newAccountStartingBalanceEntry, 100, -2);
hbox2 = gtk_hbox_new (FALSE, 5);
gtk_widget_set_name (hbox2, "hbox2");
gtk_widget_ref (hbox2);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "hbox2", hbox2,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (newAccountTopVBox), hbox2, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox2), 5);
newAccountSelectAllButton = gtk_button_new_with_label (_("Select All"));
gtk_widget_set_name (newAccountSelectAllButton, "newAccountSelectAllButton");
gtk_widget_ref (newAccountSelectAllButton);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountSelectAllButton", newAccountSelectAllButton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountSelectAllButton);
gtk_box_pack_start (GTK_BOX (hbox2), newAccountSelectAllButton, FALSE, FALSE, 5);
newAccountOKButton = gtk_button_new_with_label (_("OK"));
gtk_widget_set_name (newAccountOKButton, "newAccountOKButton");
gtk_widget_ref (newAccountOKButton);
gtk_object_set_data_full (GTK_OBJECT (newAccountList), "newAccountOKButton", newAccountOKButton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountOKButton);
gtk_box_pack_start (GTK_BOX (hbox2), newAccountOKButton, FALSE, FALSE, 5);
gtk_signal_connect (GTK_OBJECT (newAccountTree), "select_row",
GTK_SIGNAL_FUNC (on_newAccountTree_select_row),
NULL);
gtk_signal_connect (GTK_OBJECT (newAccountSelectAllButton), "clicked",
GTK_SIGNAL_FUNC (on_newAccountSelectAllButton_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (newAccountOKButton), "clicked",
GTK_SIGNAL_FUNC (on_newAccountOKButton_clicked),
NULL);
return newAccountList;
}
GtkWidget*
create_addAccountCancelDialog (void)
{

1
src/gnome/new-user-interface.h
View File

@@ -3,5 +3,4 @@
*/
GtkWidget* create_newUserDialog (void);
GtkWidget* create_newAccountList (void);
GtkWidget* create_addAccountCancelDialog (void);

236
src/gnome/new-user.glade
View File

@@ -550,11 +550,6 @@
<handler>on_newUserDruidFinishPage_finish</handler>
<last_modification_time>Tue, 09 Jan 2001 18:08:04 GMT</last_modification_time>
</signal>
<signal>
<name>prepare</name>
<handler>on_newUserDruidFinishPage_prepare</handler>
<last_modification_time>Sun, 14 Jan 2001 18:14:22 GMT</last_modification_time>
</signal>
<title>Finish Account Setup</title>
<text>Press `Finish' if everything is OK.</text>
<background_color>25,25,112</background_color>
@@ -566,237 +561,6 @@
</widget>
</widget>
<widget>
<class>GtkWindow</class>
<name>newAccountList</name>
<width>200</width>
<height>400</height>
<title>New Account List</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<default_width>640</default_width>
<default_height>480</default_height>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<widget>
<class>GtkVBox</class>
<name>newAccountTopVBox</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkLabel</class>
<name>newAccountLable</name>
<label>If you would like the accounts to have a starting balance click on the account line and enter the starting balance in the text entry box on the right.</label>
<justify>GTK_JUSTIFY_FILL</justify>
<wrap>True</wrap>
<xalign>0.0800003</xalign>
<yalign>0.08</yalign>
<xpad>1</xpad>
<ypad>1</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkHPaned</class>
<name>newAccountHPaned</name>
<handle_size>10</handle_size>
<gutter_size>6</gutter_size>
<position>1</position>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkScrolledWindow</class>
<name>newAccountTreeScrolledWindow</name>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<shrink>False</shrink>
<resize>False</resize>
</child>
<widget>
<class>GtkCTree</class>
<name>newAccountTree</name>
<can_focus>True</can_focus>
<signal>
<name>select_row</name>
<handler>on_newAccountTree_select_row</handler>
<last_modification_time>Tue, 03 Apr 2001 19:46:19 GMT</last_modification_time>
</signal>
<columns>3</columns>
<column_widths>86,233,80</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type>
<widget>
<class>GtkLabel</class>
<child_name>CTree:title</child_name>
<name>newAccountTreeAccountLabel</name>
<label>Account Name</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>CTree:title</child_name>
<name>newAccountTreeDestriptionLabel</name>
<label>Description</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>CTree:title</child_name>
<name>newAccountTreeStartingBalanceLabel</name>
<label>Starting Balance</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
</widget>
</widget>
<widget>
<class>GtkVBox</class>
<name>vbox4</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<shrink>True</shrink>
<resize>True</resize>
</child>
<widget>
<class>GtkLabel</class>
<name>newAccountAccountNameLabel</name>
<label>Account: </label>
<justify>GTK_JUSTIFY_RIGHT</justify>
<wrap>True</wrap>
<xalign>0.49</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>newAccountEnterStartingBalanceLabel</name>
<label>Enter Starting Balance</label>
<justify>GTK_JUSTIFY_RIGHT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>newAccountStartingBalanceEntry</name>
<width>100</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>hbox2</name>
<border_width>5</border_width>
<homogeneous>False</homogeneous>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkButton</class>
<name>newAccountSelectAllButton</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_newAccountSelectAllButton_clicked</handler>
<last_modification_time>Tue, 10 Apr 2001 16:54:25 GMT</last_modification_time>
</signal>
<label>Select All</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>newAccountOKButton</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_newAccountOKButton_clicked</handler>
<last_modification_time>Tue, 10 Apr 2001 16:54:32 GMT</last_modification_time>
</signal>
<label>OK</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GnomeDialog</class>
<name>addAccountCancelDialog</name>