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 GtkAlignment and use GtkGrids in glade files - Part2

Browse Source 
A couple of source files were also altered to set hexpand
This commit is contained in:
Robert Fewell 2019-11-29 16:29:26 +00:00
parent 87b9725573
commit dee3c47489
12 changed files with 1632 additions and 1767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnucash/gtkbuilder/assistant-acct-period.glade
View File

@ -129,6 +129,7 @@ Books will be closed at midnight on the selected date.</property>
<object class="GtkLabel" id="book_title"> <object class="GtkLabel" id="book_title">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="label" translatable="yes">Title</property> <property name="label" translatable="yes">Title</property>
</object> </object>
@ -141,6 +142,7 @@ Books will be closed at midnight on the selected date.</property>
<object class="GtkLabel" id="book_notes"> <object class="GtkLabel" id="book_notes">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Notes</property> <property name="label" translatable="yes">Notes</property>
<property name="wrap">True</property> <property name="wrap">True</property>
</object> </object>

14
gnucash/gtkbuilder/assistant-csv-account-import.glade
View File

@ -139,7 +139,8 @@ Enter file name and location for the Import...
<object class="GtkGrid" id="table4"> <object class="GtkGrid" id="table4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">12</property> <property name="border_width">6</property>
<property name="column_spacing">6</property>
<child> <child>
<object class="GtkRadioButton" id="radio_comma"> <object class="GtkRadioButton" id="radio_comma">
<property name="label" translatable="yes">Comma Separated</property> <property name="label" translatable="yes">Comma Separated</property>
@ -185,7 +186,7 @@ Enter file name and location for the Import...
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -210,15 +211,6 @@ Enter file name and location for the Import...
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
<child type="label"> <child type="label">

429
gnucash/gtkbuilder/assistant-csv-export.glade
View File

@ -57,47 +57,40 @@ Select the type of Export required and the separator that will be used.
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment1"> <object class="GtkGrid" id="table1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">20</property> <property name="row_spacing">3</property>
<property name="column_spacing">6</property>
<child> <child>
<object class="GtkGrid" id="table1"> <object class="GtkCheckButton" id="quote_tbutton">
<property name="label" translatable="yes">Use Quotes</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="row_spacing">3</property> <property name="receives_default">False</property>
<property name="column_spacing">3</property> <property name="halign">start</property>
<child> <property name="draw_indicator">True</property>
<object class="GtkCheckButton" id="quote_tbutton"> <signal name="toggled" handler="csv_export_quote_cb" swapped="no"/>
<property name="label" translatable="yes">Use Quotes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="csv_export_quote_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="simple_layout">
<property name="label" translatable="yes">Simple Layout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="csv_export_simple_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="simple_layout">
<property name="label" translatable="yes">Simple Layout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="csv_export_simple_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -106,7 +99,9 @@ Select the type of Export required and the separator that will be used.
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property> <property name="label" translatable="yes">Options</property>
<property name="use_markup">True</property> <attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
@ -124,99 +119,92 @@ Select the type of Export required and the separator that will be used.
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment2"> <object class="GtkGrid" id="table2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">20</property> <property name="row_spacing">3</property>
<property name="column_spacing">6</property>
<child> <child>
<object class="GtkGrid" id="table2"> <object class="GtkRadioButton" id="comma_radio">
<property name="label" translatable="yes">Comma (,)</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="row_spacing">3</property> <property name="receives_default">False</property>
<property name="column_spacing">3</property> <property name="halign">start</property>
<child> <property name="active">True</property>
<object class="GtkRadioButton" id="comma_radio"> <property name="draw_indicator">True</property>
<property name="label" translatable="yes">Comma (,)</property> <signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="colon_radio">
<property name="label" translatable="yes">Colon (:)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">comma_radio</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="semicolon_radio">
<property name="label" translatable="yes">Semicolon (;)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">comma_radio</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="custom_radio">
<property name="label" translatable="yes">Custom</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">comma_radio</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="custom_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<signal name="changed" handler="csv_export_custom_entry_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="colon_radio">
<property name="label" translatable="yes">Colon (:)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">comma_radio</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="semicolon_radio">
<property name="label" translatable="yes">Semicolon (;)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">comma_radio</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="custom_radio">
<property name="label" translatable="yes">Custom</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">comma_radio</property>
<signal name="toggled" handler="csv_export_sep_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="custom_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<signal name="changed" handler="csv_export_custom_entry_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -225,7 +213,9 @@ Select the type of Export required and the separator that will be used.
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Separators</property> <property name="label" translatable="yes">Separators</property>
<property name="use_markup">True</property> <attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
@ -289,135 +279,129 @@ Select the type of Export required and the separator that will be used.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment3"> <object class="GtkBox" id="vbox96">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="vbox96"> <object class="GtkScrolledWindow" id="account_scroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox98">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="border_width">3</property>
<property name="spacing">2</property>
<child> <child>
<object class="GtkScrolledWindow" id="account_scroll"> <object class="GtkLabel" id="label42">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="shadow_type">in</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox98"> <object class="GtkLabel" id="label847733">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">3</property> <property name="label" translatable="yes">Accounts Selected:</property>
<property name="spacing">2</property> <property name="justify">center</property>
<child>
<object class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847733">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Accounts Selected:</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="num_accounts_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">0</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButtonBox" id="hbox99"> <object class="GtkLabel" id="num_accounts_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="label" translatable="yes">0</property>
<child> <property name="justify">center</property>
<object class="GtkButton" id="select_subaccounts_button">
<property name="label" translatable="yes">_Select Subaccounts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="border_width">3</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<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="receives_default">True</property>
<property name="border_width">3</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">2</property> <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="hbox99">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="select_subaccounts_button">
<property name="label" translatable="yes">_Select Subaccounts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="border_width">3</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<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="receives_default">True</property>
<property name="border_width">3</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -488,11 +472,13 @@ Select the type of Export required and the separator that will be used.
<object class="GtkGrid" id="select_range_table"> <object class="GtkGrid" id="select_range_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_top">12</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label847682"> <object class="GtkLabel" id="label847682">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Start</property> <property name="label" translatable="yes">Start</property>
</object> </object>
<packing> <packing>
@ -582,6 +568,7 @@ Select the type of Export required and the separator that will be used.
<object class="GtkLabel" id="label847684"> <object class="GtkLabel" id="label847684">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">End</property> <property name="label" translatable="yes">End</property>
</object> </object>
<packing> <packing>

1097
gnucash/gtkbuilder/assistant-csv-price-import.glade
View File

File diff suppressed because it is too large Load Diff

1023
gnucash/gtkbuilder/assistant-csv-trans-import.glade
View File

File diff suppressed because it is too large Load Diff

9
gnucash/gtkbuilder/assistant-hierarchy.glade
View File

@ -18,8 +18,9 @@
<object class="GtkLabel" id="intro_page_label"> <object class="GtkLabel" id="intro_page_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">5</property> <property name="valign">start</property>
<property name="margin_right">5</property> <property name="margin_left">12</property>
<property name="margin_right">12</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. <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.
You can pick a set of accounts here that seem close to your needs. After the assistant completes you will be able to add, rename, modify, and remove accounts, at any time later on. You will also be able to add sub-accounts, as well as move accounts (along with their sub-accounts) from one parent to another. You can pick a set of accounts here that seem close to your needs. After the assistant completes you will be able to add, rename, modify, and remove accounts, at any time later on. You will also be able to add sub-accounts, as well as move accounts (along with their sub-accounts) from one parent to another.
@ -370,8 +371,8 @@ Select categories that correspond to the ways that you foresee you will use GnuC
<object class="GtkLabel" id="finalAccountLabel"> <object class="GtkLabel" id="finalAccountLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">5</property> <property name="margin_left">12</property>
<property name="margin_right">5</property> <property name="margin_right">12</property>
<property name="label" translatable="yes"> <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. 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.

485
gnucash/gtkbuilder/assistant-loan.glade
View File

@ -101,10 +101,12 @@
<object class="GtkLabel" id="loan_intro_page"> <object class="GtkLabel" id="loan_intro_page">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="label" translatable="yes">This is a step-by-step method for creating a loan repayment within GnuCash. In this assistant, you can input the details of your loan and its repayment along with the details of its payback. Using that information, the appropriate Scheduled Transactions will be created. <property name="label" translatable="yes">This is a step-by-step method for creating a loan repayment within GnuCash. In this assistant, you can input the details of your loan and its repayment along with the details of its payback. Using that information, the appropriate Scheduled Transactions will be created.
If you make a mistake or want to make changes later, you can edit the created Scheduled Transactions directly.</property> If you make a mistake or want to make changes later, you can edit the created Scheduled Transactions directly.</property>
<property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
</object> </object>
<packing> <packing>
@ -140,9 +142,10 @@ If you make a mistake or want to make changes later, you can edit the created Sc
<object class="GtkGrid" id="param_table"> <object class="GtkGrid" id="param_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">6</property>
<property name="column_spacing">5</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label847897"> <object class="GtkLabel" id="label847897">
<property name="visible">True</property> <property name="visible">True</property>
@ -266,86 +269,6 @@ If you make a mistake or want to make changes later, you can edit the created Sc
<property name="top_attach">5</property> <property name="top_attach">5</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xscale">0.25</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xscale">0.5</property>
<child>
<object class="GtkBox" id="hbox170">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkComboBox" id="irate_type_combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">rate_liststore</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="irate_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans.</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="climb_rate">1</property>
<property name="digits">3</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847921">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="label847898"> <object class="GtkLabel" id="label847898">
<property name="visible">True</property> <property name="visible">True</property>
@ -373,40 +296,6 @@ If you make a mistake or want to make changes later, you can edit the created Sc
<property name="top_attach">5</property> <property name="top_attach">5</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="alignment23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0.5</property>
<property name="yscale">0.75</property>
<child>
<object class="GtkFrame" id="type_freq_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0.5</property>
<child>
<object class="GtkBox" id="type_freq_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label847976">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Interest Rate Change Frequency</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">4</property>
</packing>
</child>
<child> <child>
<object class="GtkComboBox" id="type_combobox"> <object class="GtkComboBox" id="type_combobox">
<property name="visible">True</property> <property name="visible">True</property>
@ -424,6 +313,95 @@ If you make a mistake or want to make changes later, you can edit the created Sc
<property name="top_attach">2</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="hbox170">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkComboBox" id="irate_type_combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">rate_liststore</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="irate_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans.</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="climb_rate">1</property>
<property name="digits">3</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847921">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="type_freq_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0.5</property>
<child>
<object class="GtkBox" id="type_freq_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label847976">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Interest Rate Change Frequency</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">4</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
@ -507,33 +485,29 @@ Do you utilise an escrow account, if so an account must be specified...</propert
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment19"> <object class="GtkBox" id="opt_escrow_hbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xscale">0.75</property> <property name="halign">start</property>
<property name="margin_left">12</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="opt_escrow_hbox"> <object class="GtkLabel" id="label847963">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <property name="label" translatable="yes">Escrow Account</property>
<object class="GtkLabel" id="label847963"> <property name="justify">center</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Escrow Account</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -586,9 +560,10 @@ All accounts must have valid entries to continue.
<object class="GtkGrid" id="repay_table"> <object class="GtkGrid" id="repay_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">6</property>
<property name="column_spacing">5</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label847910"> <object class="GtkLabel" id="label847910">
<property name="visible">True</property> <property name="visible">True</property>
@ -655,19 +630,12 @@ All accounts must have valid entries to continue.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment13"> <object class="GtkEntry" id="txn_title">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="xalign">0</property> <property name="invisible_char">●</property>
<child> <property name="primary_icon_activatable">False</property>
<object class="GtkEntry" id="txn_title"> <property name="secondary_icon_activatable">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -676,20 +644,13 @@ All accounts must have valid entries to continue.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment14"> <object class="GtkEntry" id="amount_ent">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="xalign">0</property> <property name="editable">False</property>
<child> <property name="invisible_char">●</property>
<object class="GtkEntry" id="amount_ent"> <property name="primary_icon_activatable">False</property>
<property name="visible">True</property> <property name="secondary_icon_activatable">False</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -698,30 +659,22 @@ All accounts must have valid entries to continue.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment21"> <object class="GtkFrame" id="freq_frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xscale">0.5</property> <property name="label_xalign">0.5</property>
<property name="yscale">0.89999997615814209</property>
<child> <child>
<object class="GtkFrame" id="freq_frame"> <object class="GtkBox" id="freq_frame_hbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label_xalign">0.5</property> <property name="border_width">10</property>
<child> </object>
<object class="GtkBox" id="freq_frame_hbox"> </child>
<property name="visible">True</property> <child type="label">
<property name="can_focus">False</property> <object class="GtkLabel" id="label847977">
<property name="border_width">10</property> <property name="visible">True</property>
</object> <property name="can_focus">False</property>
</child> <property name="label" translatable="yes">Repayment Frequency</property>
<child type="label">
<object class="GtkLabel" id="label847977">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Repayment Frequency</property>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -784,6 +737,7 @@ All enabled option pages must contain valid entries to continue.
<object class="GtkEventBox" id="eventbox1"> <object class="GtkEventBox" id="eventbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<child> <child>
<object class="GtkBox" id="vbox158"> <object class="GtkBox" id="vbox158">
<property name="visible">True</property> <property name="visible">True</property>
@ -794,8 +748,8 @@ All enabled option pages must contain valid entries to continue.
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">6</property>
<property name="column_spacing">5</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label847916"> <object class="GtkLabel" id="label847916">
<property name="visible">True</property> <property name="visible">True</property>
@ -848,48 +802,6 @@ All enabled option pages must contain valid entries to continue.
<property name="top_attach">4</property> <property name="top_attach">4</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<child>
<object class="GtkEntry" id="pay_txn_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<child>
<object class="GtkEntry" id="pay_amt_ent">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">3</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="pay_escrow_from_label"> <object class="GtkLabel" id="pay_escrow_from_label">
<property name="visible">True</property> <property name="visible">True</property>
@ -946,6 +858,34 @@ All enabled option pages must contain valid entries to continue.
<property name="top_attach">2</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="pay_txn_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="pay_amt_ent">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">3</property>
</packing>
</child>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
@ -984,32 +924,50 @@ All enabled option pages must contain valid entries to continue.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment22"> <object class="GtkFrame" id="frame92">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xscale">0.5</property> <property name="halign">center</property>
<property name="yscale">0.75</property> <property name="label_xalign">0.5</property>
<child> <child>
<object class="GtkFrame" id="frame92"> <object class="GtkBox" id="vbox159">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="orientation">vertical</property>
<property name="label_xalign">0.5</property>
<child> <child>
<object class="GtkBox" id="vbox159"> <object class="GtkRadioButton" id="pay_txn_part_rb">
<property name="label" translatable="yes">Part of Payment Transaction</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox160">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">10</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkRadioButton" id="pay_txn_part_rb"> <object class="GtkRadioButton" id="pay_uniq_freq_rb">
<property name="label" translatable="yes">Part of Payment Transaction</property> <property name="label" translatable="yes">Other</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">pay_txn_part_rb</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1018,62 +976,36 @@ All enabled option pages must contain valid entries to continue.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="vbox160"> <object class="GtkBox" id="pay_freq_hbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">10</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="pay_uniq_freq_rb">
<property name="label" translatable="yes">Other</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pay_txn_part_rb</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="pay_freq_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child> </child>
<child type="label"> </object>
<object class="GtkLabel" id="label847978"> </child>
<property name="visible">True</property> <child type="label">
<property name="can_focus">False</property> <object class="GtkLabel" id="label847978">
<property name="label" translatable="yes">Payment Frequency</property> <property name="visible">True</property>
</object> <property name="can_focus">False</property>
</child> <property name="label" translatable="yes">Payment Frequency</property>
</object> </object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -1229,6 +1161,7 @@ Review the details below and if correct press Apply to create the schedule.</pro
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">10</property> <property name="border_width">10</property>
<property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label847971"> <object class="GtkLabel" id="label847971">
<property name="visible">True</property> <property name="visible">True</property>

3
gnucash/gtkbuilder/assistant-qif-import.glade
View File

@ -39,6 +39,9 @@
<object class="GtkLabel" id="start_page"> <object class="GtkLabel" id="start_page">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">GnuCash can import financial data from QIF (Quicken Interchange Format) files written by Quicken/QuickBooks, MS Money, Moneydance, and many other programs. <property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">GnuCash can import financial data from QIF (Quicken Interchange Format) files written by Quicken/QuickBooks, MS Money, Moneydance, and many other programs.
The import process has several steps. Your GnuCash accounts will not be changed until you click "Apply" at the end of the process. The import process has several steps. Your GnuCash accounts will not be changed until you click "Apply" at the end of the process.

59
gnucash/gtkbuilder/assistant-stock-split.glade
View File

@ -19,6 +19,9 @@
<object class="GtkLabel" id="intro_page_label"> <object class="GtkLabel" id="intro_page_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="label" translatable="yes">This assistant will help you record a stock split or stock merger. <property name="label" translatable="yes">This assistant will help you record a stock split or stock merger.
</property> </property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -34,11 +37,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_left">12</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="stock_account_label"> <object class="GtkLabel" id="stock_account_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="label" translatable="yes">Select the account for which you want to record a stock split or merger.</property> <property name="label" translatable="yes">Select the account for which you want to record a stock split or merger.</property>
<property name="justify">center</property> <property name="justify">center</property>
</object> </object>
@ -80,11 +85,13 @@
<object class="GtkBox" id="stock_details_page"> <object class="GtkBox" id="stock_details_page">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="stock_detail_label"> <object class="GtkLabel" id="stock_detail_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="label" translatable="yes">Enter the date and the number of shares you gained or lost from the stock split or merger. For stock mergers (negative splits) use a negative value for the share distribution. You can also enter a description of the transaction, or accept the default one.</property> <property name="label" translatable="yes">Enter the date and the number of shares you gained or lost from the stock split or merger. For stock mergers (negative splits) use a negative value for the share distribution. You can also enter a description of the transaction, or accept the default one.</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -100,13 +107,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="row_spacing">12</property> <property name="row_spacing">3</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="date_label"> <object class="GtkLabel" id="date_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">end</property>
<property name="label" translatable="yes">_Date</property> <property name="label" translatable="yes">_Date</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -120,7 +127,7 @@
<object class="GtkLabel" id="distribution_label"> <object class="GtkLabel" id="distribution_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">end</property>
<property name="label" translatable="yes">_Shares</property> <property name="label" translatable="yes">_Shares</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -134,7 +141,7 @@
<object class="GtkLabel" id="description_label"> <object class="GtkLabel" id="description_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">end</property>
<property name="label" translatable="yes">Desc_ription</property> <property name="label" translatable="yes">Desc_ription</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -172,6 +179,7 @@
<object class="GtkLabel" id="text_label"> <object class="GtkLabel" id="text_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="label" translatable="yes">If you want to record a stock price for the split, enter it below. You may safely leave it blank.</property> <property name="label" translatable="yes">If you want to record a stock price for the split, enter it below. You may safely leave it blank.</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -187,7 +195,7 @@
<object class="GtkLabel" id="price_label"> <object class="GtkLabel" id="price_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">end</property>
<property name="label" translatable="yes">New _Price</property> <property name="label" translatable="yes">New _Price</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -201,7 +209,7 @@
<object class="GtkLabel" id="currency_label"> <object class="GtkLabel" id="currency_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">end</property>
<property name="label" translatable="yes">Currenc_y</property> <property name="label" translatable="yes">Currenc_y</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -247,6 +255,7 @@
<object class="GtkLabel" id="stock_cash_label"> <object class="GtkLabel" id="stock_cash_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="label" translatable="yes">If you received a cash disbursement as a result of the stock split, enter the details of that payment here. Otherwise, just click "Next".</property> <property name="label" translatable="yes">If you received a cash disbursement as a result of the stock split, enter the details of that payment here. Otherwise, just click "Next".</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -261,12 +270,13 @@
<object class="GtkGrid" id="cash_table"> <object class="GtkGrid" id="cash_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="row_spacing">6</property> <property name="row_spacing">3</property>
<property name="column_spacing">12</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="cash_label"> <object class="GtkLabel" id="cash_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Amount</property> <property name="label" translatable="yes">_Amount</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -280,6 +290,7 @@
<object class="GtkLabel" id="memo_label"> <object class="GtkLabel" id="memo_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Memo</property> <property name="label" translatable="yes">_Memo</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="justify">center</property> <property name="justify">center</property>
@ -325,7 +336,8 @@
<object class="GtkGrid" id="cash_table2"> <object class="GtkGrid" id="cash_table2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="column_spacing">12</property> <property name="row_spacing">3</property>
<property name="column_spacing">6</property>
<property name="column_homogeneous">True</property> <property name="column_homogeneous">True</property>
<child> <child>
<object class="GtkLabel" id="income_label"> <object class="GtkLabel" id="income_label">
@ -354,20 +366,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment2"> <object class="GtkScrolledWindow" id="income_scroll">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="left_padding">12</property> <property name="border_width">3</property>
<child>
<object class="GtkScrolledWindow" id="income_scroll">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -375,19 +379,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment3"> <object class="GtkScrolledWindow" id="asset_scroll">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child> <property name="border_width">3</property>
<object class="GtkScrolledWindow" id="asset_scroll">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@ -411,6 +408,8 @@
<object class="GtkLabel" id="finish_page_label"> <object class="GtkLabel" id="finish_page_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="label" translatable="yes">If you are finished creating the stock split or merger, press "Apply". You may also press "Back" to review your choices, or "Cancel" to quit without making any changes.</property> <property name="label" translatable="yes">If you are finished creating the stock split or merger, press "Apply". You may also press "Back" to review your choices, or "Cancel" to quit without making any changes.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
</object> </object>

271
gnucash/gtkbuilder/assistant-xml-encoding.glade
View File

@ -5,6 +5,7 @@
<object class="GtkAssistant" id="assistant_xml_encoding"> <object class="GtkAssistant" id="assistant_xml_encoding">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="default_width">500</property>
<signal name="cancel" handler="gxi_cancel_cb" swapped="no"/> <signal name="cancel" handler="gxi_cancel_cb" swapped="no"/>
<signal name="close" handler="gxi_finish_cb" swapped="no"/> <signal name="close" handler="gxi_finish_cb" swapped="no"/>
<signal name="prepare" handler="gxi_prepare_cb" swapped="no"/> <signal name="prepare" handler="gxi_prepare_cb" swapped="no"/>
@ -42,6 +43,7 @@
<object class="GtkBox" id="hbox10"> <object class="GtkBox" id="hbox10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkButton" id="edit_encs_button"> <object class="GtkButton" id="edit_encs_button">
<property name="label" translatable="yes">_Edit list of encodings</property> <property name="label" translatable="yes">_Edit list of encodings</property>
@ -102,25 +104,20 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment13"> <object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="xscale">0.75</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow4"> <object class="GtkViewport" id="viewport1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkViewport" id="viewport1"> <object class="GtkBox" id="string_box_container">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkAlignment" id="string_box_container"> <placeholder/>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="right_padding">12</property>
</object>
</child> </child>
</object> </object>
</child> </child>
@ -128,7 +125,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
@ -245,6 +242,7 @@
<object class="GtkLabel" id="label6"> <object class="GtkLabel" id="label6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;S_ystem input encodings&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;S_ystem input encodings&lt;/b&gt;</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -257,70 +255,58 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment7"> <object class="GtkBox" id="hbox8">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="vexpand">True</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="hbox8"> <object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="spacing">6</property> <property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow2"> <object class="GtkTreeView" id="available_encs_view">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property> <property name="headers_visible">False</property>
<property name="shadow_type">in</property> <child internal-child="selection">
<child> <object class="GtkTreeSelection" id="treeview-selection1"/>
<object class="GtkTreeView" id="available_encs_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkButton" id="add_enc_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="gxi_add_enc_clicked_cb" swapped="no"/>
<child>
<object class="GtkImage" id="image11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-next</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="add_enc_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<signal name="clicked" handler="gxi_add_enc_clicked_cb" swapped="no"/>
<child>
<object class="GtkImage" id="image11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-next</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -342,6 +328,7 @@
<object class="GtkLabel" id="label10"> <object class="GtkLabel" id="label10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;_Custom encoding&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;_Custom encoding&lt;/b&gt;</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -354,54 +341,47 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment6"> <object class="GtkBox" id="hbox7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="hbox7"> <object class="GtkEntry" id="custom_enc_entry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="spacing">6</property> <property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="add_custom_enc_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="gxi_add_custom_enc_clicked_cb" swapped="no"/>
<child> <child>
<object class="GtkEntry" id="custom_enc_entry"> <object class="GtkImage" id="image10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="invisible_char">●</property> <property name="icon_name">go-next</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="add_custom_enc_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="gxi_add_custom_enc_clicked_cb" swapped="no"/>
<child>
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-next</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -424,12 +404,14 @@
<object class="GtkBox" id="vbox7"> <object class="GtkBox" id="vbox7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label11"> <object class="GtkLabel" id="label11">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;_Selected encodings&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;_Selected encodings&lt;/b&gt;</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -442,70 +424,59 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment9"> <object class="GtkBox" id="hbox9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="vexpand">True</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="hbox9"> <object class="GtkButton" id="remove_enc_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="spacing">6</property> <property name="receives_default">True</property>
<property name="valign">center</property>
<signal name="clicked" handler="gxi_remove_enc_clicked_cb" swapped="no"/>
<child> <child>
<object class="GtkAlignment" id="alignment14"> <object class="GtkImage" id="image12">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="yscale">0</property> <property name="valign">center</property>
<child> <property name="icon_name">go-previous</property>
<object class="GtkButton" id="remove_enc_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="gxi_remove_enc_clicked_cb" swapped="no"/>
<child>
<object class="GtkImage" id="image12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous</property>
</object>
</child>
</object>
</child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="selected_encs_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="selected_encs_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>

3
gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
View File

@ -624,6 +624,7 @@ CsvImpPriceAssist::CsvImpPriceAssist ()
auto encoding_container = GTK_CONTAINER(gtk_builder_get_object (builder, "encoding_container")); auto encoding_container = GTK_CONTAINER(gtk_builder_get_object (builder, "encoding_container"));
gtk_container_add (encoding_container, GTK_WIDGET(encselector)); gtk_container_add (encoding_container, GTK_WIDGET(encselector));
gtk_widget_set_hexpand (GTK_WIDGET(encselector), true);
gtk_widget_show_all (GTK_WIDGET(encoding_container)); gtk_widget_show_all (GTK_WIDGET(encoding_container));
/* Add commodity selection widget */ /* Add commodity selection widget */
@ -655,6 +656,7 @@ CsvImpPriceAssist::CsvImpPriceAssist ()
/* Add it to the assistant. */ /* Add it to the assistant. */
auto date_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "date_format_container")); auto date_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "date_format_container"));
gtk_container_add (date_format_container, GTK_WIDGET(date_format_combo)); gtk_container_add (date_format_container, GTK_WIDGET(date_format_combo));
gtk_widget_set_hexpand (GTK_WIDGET(date_format_combo), true);
gtk_widget_show_all (GTK_WIDGET(date_format_container)); gtk_widget_show_all (GTK_WIDGET(date_format_container));
/* Add in the currency format combo box and hook it up to an event handler. */ /* Add in the currency format combo box and hook it up to an event handler. */
@ -671,6 +673,7 @@ CsvImpPriceAssist::CsvImpPriceAssist ()
/* Add it to the assistant. */ /* Add it to the assistant. */
auto currency_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "currency_format_container")); auto currency_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "currency_format_container"));
gtk_container_add (currency_format_container, GTK_WIDGET(currency_format_combo)); gtk_container_add (currency_format_container, GTK_WIDGET(currency_format_combo));
gtk_widget_set_hexpand (GTK_WIDGET(currency_format_combo), true);
gtk_widget_show_all (GTK_WIDGET(currency_format_container)); gtk_widget_show_all (GTK_WIDGET(currency_format_container));
/* Connect the CSV/Fixed-Width radio button event handler. */ /* Connect the CSV/Fixed-Width radio button event handler. */

4
gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
View File

@ -563,6 +563,7 @@ CsvImpTransAssist::CsvImpTransAssist ()
acct_selector = gnc_account_sel_new(); acct_selector = gnc_account_sel_new();
auto account_hbox = GTK_WIDGET(gtk_builder_get_object (builder, "account_hbox")); auto account_hbox = GTK_WIDGET(gtk_builder_get_object (builder, "account_hbox"));
gtk_box_pack_start (GTK_BOX(account_hbox), acct_selector, TRUE, TRUE, 6); gtk_box_pack_start (GTK_BOX(account_hbox), acct_selector, TRUE, TRUE, 6);
gtk_widget_set_hexpand (GTK_WIDGET(acct_selector), true);
gtk_widget_show (acct_selector); gtk_widget_show (acct_selector);
g_signal_connect(G_OBJECT(acct_selector), "account_sel_changed", g_signal_connect(G_OBJECT(acct_selector), "account_sel_changed",
@ -577,6 +578,7 @@ CsvImpTransAssist::CsvImpTransAssist ()
auto encoding_container = GTK_CONTAINER(gtk_builder_get_object (builder, "encoding_container")); auto encoding_container = GTK_CONTAINER(gtk_builder_get_object (builder, "encoding_container"));
gtk_container_add (encoding_container, GTK_WIDGET(encselector)); gtk_container_add (encoding_container, GTK_WIDGET(encselector));
gtk_widget_set_hexpand (GTK_WIDGET(encselector), true);
gtk_widget_show_all (GTK_WIDGET(encoding_container)); gtk_widget_show_all (GTK_WIDGET(encoding_container));
/* The instructions label and image */ /* The instructions label and image */
@ -594,6 +596,7 @@ CsvImpTransAssist::CsvImpTransAssist ()
/* Add it to the assistant. */ /* Add it to the assistant. */
auto date_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "date_format_container")); auto date_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "date_format_container"));
gtk_container_add (date_format_container, GTK_WIDGET(date_format_combo)); gtk_container_add (date_format_container, GTK_WIDGET(date_format_combo));
gtk_widget_set_hexpand (GTK_WIDGET(date_format_combo), true);
gtk_widget_show_all (GTK_WIDGET(date_format_container)); gtk_widget_show_all (GTK_WIDGET(date_format_container));
/* Add in the currency format combo box and hook it up to an event handler. */ /* Add in the currency format combo box and hook it up to an event handler. */
@ -610,6 +613,7 @@ CsvImpTransAssist::CsvImpTransAssist ()
/* Add it to the assistant. */ /* Add it to the assistant. */
auto currency_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "currency_format_container")); auto currency_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "currency_format_container"));
gtk_container_add (currency_format_container, GTK_WIDGET(currency_format_combo)); gtk_container_add (currency_format_container, GTK_WIDGET(currency_format_combo));
gtk_widget_set_hexpand (GTK_WIDGET(currency_format_combo), true);
gtk_widget_show_all (GTK_WIDGET(currency_format_container)); gtk_widget_show_all (GTK_WIDGET(currency_format_container));
/* Connect the CSV/Fixed-Width radio button event handler. */ /* Connect the CSV/Fixed-Width radio button event handler. */