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

Use separate glade file per assistant

Browse Source 
Patch by Bob

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21119 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2011-08-07 09:14:51 +00:00
parent 4ff7cb3f5c
commit d689c0ecd0
8 changed files with 383 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gnome/assistant-acct-period.c
View File

@ -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;

2
src/gnome/assistant-hierarchy.c
View File

@ -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;

2
src/gnome/assistant-stock-split.c
View File

@ -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;

9
src/gnome/gtkbuilder/Makefile.am
View File

@ -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)

369
src/gnome/gtkbuilder/account.glade
View File

@ -1714,375 +1714,6 @@
<action-widget response="-5">okbutton2</action-widget>
</action-widgets>
</object>
<object class="GtkAssistant" id="Hierarchy Assistant">
<property name="visible">True</property>
<property name="border_width">12</property>
<signal name="prepare" handler="on_prepare"/>
<signal name="cancel" handler="on_cancel"/>
<signal name="close" handler="on_finish"/>
<child>
<object class="GtkLabel" id="intro_page_label">
<property name="visible">True</property>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="page_type">intro</property>
<property name="title" translatable="yes">New Account Hierarchy Setup</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="currency_page_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="choose_currency_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Please choose the currency to use for new accounts.</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="currency_chooser_alignment">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkVBox" id="currency_chooser_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="title" translatable="yes">Choose Currency</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="choose_account_types_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="pickAccountsDescriptionLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
<property name="width_chars">75</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHPaned" id="hpaned2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="position">336</property>
<property name="position_set">True</property>
<child>
<object class="GtkVPaned" id="vpaned2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="orientation">vertical</property>
<property name="position">150</property>
<property name="position_set">True</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label8477431">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Categories&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="account_categories_tree_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="select_all_button">
<property name="label" translatable="yes">_Select All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="select_all_clicked"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="clear_all_button">
<property name="label" translatable="yes">C_lear All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="clear_all_clicked"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox130">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label8477397">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Category Description&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow31">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="account_types_description">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="cursor_visible">False</property>
<property name="accepts_tab">False</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox131">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="accounts_in_category_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label">&lt;b&gt;Accounts in %s&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="accounts_in_category">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="title" translatable="yes">Choose accounts to create</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="final_account_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="finalAccountLabel">
<property name="visible">True</property>
<property name="xpad">1</property>
<property name="ypad">1</property>
<property name="label" translatable="yes">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.
</property>
<property name="wrap">True</property>
<property name="width_chars">75</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="final_account_tree_box">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="title" translatable="yes">Setup selected accounts</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="finish_page_label">
<property name="visible">True</property>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="page_type">confirm</property>
<property name="title" translatable="yes">Finish Account Setup</property>
</packing>
</child>
</object>
<object class="GtkAdjustment" id="interval_adjustment">
<property name="value">10</property>
<property name="lower">1</property>

0
src/gnome/gtkbuilder/acctperiod.glade → src/gnome/gtkbuilder/assistant-acct-period.glade
View File

374
src/gnome/gtkbuilder/assistant-hierarchy.glade Normal file
View File

@ -0,0 +1,374 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAssistant" id="Hierarchy Assistant">
<property name="visible">True</property>
<property name="border_width">12</property>
<signal name="prepare" handler="on_prepare"/>
<signal name="cancel" handler="on_cancel"/>
<signal name="close" handler="on_finish"/>
<child>
<object class="GtkLabel" id="intro_page_label">
<property name="visible">True</property>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="page_type">intro</property>
<property name="title" translatable="yes">New Account Hierarchy Setup</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="currency_page_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="choose_currency_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Please choose the currency to use for new accounts.</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="currency_chooser_alignment">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkVBox" id="currency_chooser_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="title" translatable="yes">Choose Currency</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="choose_account_types_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="pickAccountsDescriptionLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
<property name="width_chars">75</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHPaned" id="hpaned2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="position">336</property>
<property name="position_set">True</property>
<child>
<object class="GtkVPaned" id="vpaned2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="orientation">vertical</property>
<property name="position">150</property>
<property name="position_set">True</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label8477431">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Categories&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="account_categories_tree_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="select_all_button">
<property name="label" translatable="yes">_Select All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="select_all_clicked"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="clear_all_button">
<property name="label" translatable="yes">C_lear All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="clear_all_clicked"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox130">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label8477397">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Category Description&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow31">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="account_types_description">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="cursor_visible">False</property>
<property name="accepts_tab">False</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox131">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="accounts_in_category_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label">&lt;b&gt;Accounts in %s&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="accounts_in_category">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="title" translatable="yes">Choose accounts to create</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="final_account_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="finalAccountLabel">
<property name="visible">True</property>
<property name="xpad">1</property>
<property name="ypad">1</property>
<property name="label" translatable="yes">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.
</property>
<property name="wrap">True</property>
<property name="width_chars">75</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="final_account_tree_box">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="title" translatable="yes">Setup selected accounts</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="finish_page_label">
<property name="visible">True</property>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="page_type">confirm</property>
<property name="title" translatable="yes">Finish Account Setup</property>
</packing>
</child>
</object>
</interface>

0
src/gnome/gtkbuilder/stocks.glade → src/gnome/gtkbuilder/assistant-stock-split.glade
View File