diff --git a/src/gnome/assistant-acct-period.c b/src/gnome/assistant-acct-period.c index 505bdbc141..f3ef4b6372 100644 --- a/src/gnome/assistant-acct-period.c +++ b/src/gnome/assistant-acct-period.c @@ -581,7 +581,7 @@ ap_assistant_create (AcctPeriodInfo *info) GtkWidget *box; builder = gtk_builder_new(); - gnc_builder_add_from_file (builder ,"acctperiod.glade", "Account Period Assistant"); + gnc_builder_add_from_file (builder ,"assistant-acct-period.glade", "Account Period Assistant"); window = GTK_WIDGET(gtk_builder_get_object (builder, "Account Period Assistant")); info->window = window; diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index 7806a0a6dd..e8b5fd4873 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -1064,7 +1064,7 @@ gnc_create_hierarchy_assistant (gboolean use_defaults, GncHierarchyAssistantFini data = g_new0 (hierarchy_data, 1); builder = gtk_builder_new(); - gnc_builder_add_from_file (builder, "account.glade", "Hierarchy Assistant"); + gnc_builder_add_from_file (builder, "assistant-hierarchy.glade", "Hierarchy Assistant"); dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Hierarchy Assistant")); data->dialog = dialog; diff --git a/src/gnome/assistant-stock-split.c b/src/gnome/assistant-stock-split.c index 5da46f63b5..30e022c06f 100644 --- a/src/gnome/assistant-stock-split.c +++ b/src/gnome/assistant-stock-split.c @@ -561,7 +561,7 @@ gnc_stock_split_assistant_create (StockSplitInfo *info) GtkWidget *window; builder = gtk_builder_new(); - gnc_builder_add_from_file (builder ,"stocks.glade", "Stock Split Assistant"); + gnc_builder_add_from_file (builder ,"assistant-stock-split.glade", "Stock Split Assistant"); window = GTK_WIDGET(gtk_builder_get_object (builder, "Stock Split Assistant")); info->window = window; diff --git a/src/gnome/gtkbuilder/Makefile.am b/src/gnome/gtkbuilder/Makefile.am index ec58045a2f..9dd508a928 100644 --- a/src/gnome/gtkbuilder/Makefile.am +++ b/src/gnome/gtkbuilder/Makefile.am @@ -1,8 +1,10 @@ gtkbuilderdir = $(GNC_GTKBUILDER_DIR) gtkbuilder_DATA = \ account.glade \ - acctperiod.glade \ + assistant-acct-period.glade \ + assistant-hierarchy.glade \ assistant-loan.glade \ + assistant-stock-split.glade \ autoclear.glade \ budget.glade \ commodities.glade \ @@ -15,9 +17,8 @@ gtkbuilder_DATA = \ progress.glade \ reconcile.glade \ register.glade \ - stocks.glade \ + sched-xact.glade \ tax.glade \ - userpass.glade \ - sched-xact.glade + userpass.glade EXTRA_DIST = $(gtkbuilder_DATA) diff --git a/src/gnome/gtkbuilder/account.glade b/src/gnome/gtkbuilder/account.glade index 2b7a9a4821..4fc42b2261 100644 --- a/src/gnome/gtkbuilder/account.glade +++ b/src/gnome/gtkbuilder/account.glade @@ -1714,375 +1714,6 @@ okbutton2 - - True - 12 - - - - - - True - This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have. - -Click 'Cancel' if you do not wish to create any new accounts now. - True - - - intro - New Account Hierarchy Setup - - - - - True - vertical - 5 - - - True - Please choose the currency to use for new accounts. - - - False - False - 0 - - - - - True - 0 - 0 - 0 - - - True - vertical - - - - - - - - 1 - - - - - Choose Currency - - - - - True - vertical - - - True - Select categories that correspond to the ways that you will use GnuCash. Each category you select will cause several accounts to be created. Select the categories that are relevant to you. You can always create additional accounts by hand later. - True - 75 - - - False - False - 0 - - - - - True - True - 336 - True - - - True - True - vertical - 150 - True - - - True - 6 - vertical - 6 - - - True - 0 - <b>Categories</b> - True - - - False - False - 0 - - - - - True - 12 - - - True - True - never - automatic - in - - - True - True - True - True - - - - - - - 1 - - - - - True - 12 - - - True - 6 - spread - - - _Select All - True - True - True - True - True - - - - False - False - 0 - - - - - C_lear All - True - True - True - True - True - - - - False - False - 1 - - - - - - - False - 2 - - - - - True - True - - - - - True - 6 - vertical - 6 - - - True - 0 - <b>Category Description</b> - True - - - False - False - 0 - - - - - True - 12 - - - True - True - automatic - automatic - in - - - True - False - True - False - word - False - False - - - - - - - 1 - - - - - True - True - - - - - True - True - - - - - True - 6 - vertical - 6 - - - True - 0 - <b>Accounts in %s</b> - True - - - False - False - 0 - - - - - True - 12 - - - True - True - automatic - automatic - in - - - - - - - - 1 - - - - - True - True - - - - - 1 - - - - - Choose accounts to create - - - - - True - vertical - - - True - 1 - 1 - If you would like to change an account's name, click on the row containing the account, then click on the account name and change it. - -Some accounts are marked as "Placeholder". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account. - -If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance. - -Note: all accounts except Equity and placeholder accounts may have an opening balance. - - True - 75 - - - False - False - 5 - 0 - - - - - True - True - automatic - automatic - in - - - - - - 1 - - - - - Setup selected accounts - - - - - True - Press `Apply' to create your new accounts. You will then be able to save them to a file or database. - -Press `Back' to review your selections. - -Press `Cancel' to close this dialog without creating any new accounts. - True - - - confirm - Finish Account Setup - - - 10 1 diff --git a/src/gnome/gtkbuilder/acctperiod.glade b/src/gnome/gtkbuilder/assistant-acct-period.glade similarity index 99% rename from src/gnome/gtkbuilder/acctperiod.glade rename to src/gnome/gtkbuilder/assistant-acct-period.glade index b669fff52f..b9124b7fd9 100644 --- a/src/gnome/gtkbuilder/acctperiod.glade +++ b/src/gnome/gtkbuilder/assistant-acct-period.glade @@ -245,4 +245,4 @@ Books will be closed at midnight on the selected date. - + \ No newline at end of file diff --git a/src/gnome/gtkbuilder/assistant-hierarchy.glade b/src/gnome/gtkbuilder/assistant-hierarchy.glade new file mode 100644 index 0000000000..b60c94ced7 --- /dev/null +++ b/src/gnome/gtkbuilder/assistant-hierarchy.glade @@ -0,0 +1,374 @@ + + + + + + True + 12 + + + + + + True + This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have. + +Click 'Cancel' if you do not wish to create any new accounts now. + True + + + intro + New Account Hierarchy Setup + + + + + True + vertical + 5 + + + True + Please choose the currency to use for new accounts. + + + False + False + 0 + + + + + True + 0 + 0 + 0 + + + True + vertical + + + + + + + + 1 + + + + + Choose Currency + + + + + True + vertical + + + True + Select categories that correspond to the ways that you will use GnuCash. Each category you select will cause several accounts to be created. Select the categories that are relevant to you. You can always create additional accounts by hand later. + True + 75 + + + False + False + 0 + + + + + True + True + 336 + True + + + True + True + vertical + 150 + True + + + True + 6 + vertical + 6 + + + True + 0 + <b>Categories</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + True + never + automatic + in + + + True + True + True + True + + + + + + + 1 + + + + + True + 12 + + + True + 6 + spread + + + _Select All + True + True + True + True + True + + + + False + False + 0 + + + + + C_lear All + True + True + True + True + True + + + + False + False + 1 + + + + + + + False + 2 + + + + + True + True + + + + + True + 6 + vertical + 6 + + + True + 0 + <b>Category Description</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + True + automatic + automatic + in + + + True + False + True + False + word + False + False + + + + + + + 1 + + + + + True + True + + + + + True + True + + + + + True + 6 + vertical + 6 + + + True + 0 + <b>Accounts in %s</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + True + automatic + automatic + in + + + + + + + + 1 + + + + + True + True + + + + + 1 + + + + + Choose accounts to create + + + + + True + vertical + + + True + 1 + 1 + If you would like to change an account's name, click on the row containing the account, then click on the account name and change it. + +Some accounts are marked as "Placeholder". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account. + +If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance. + +Note: all accounts except Equity and placeholder accounts may have an opening balance. + + True + 75 + + + False + False + 5 + 0 + + + + + True + True + automatic + automatic + in + + + + + + 1 + + + + + Setup selected accounts + + + + + True + Press `Apply' to create your new accounts. You will then be able to save them to a file or database. + +Press `Back' to review your selections. + +Press `Cancel' to close this dialog without creating any new accounts. + True + + + confirm + Finish Account Setup + + + + diff --git a/src/gnome/gtkbuilder/stocks.glade b/src/gnome/gtkbuilder/assistant-stock-split.glade similarity index 100% rename from src/gnome/gtkbuilder/stocks.glade rename to src/gnome/gtkbuilder/assistant-stock-split.glade