diff --git a/gnucash/gtkbuilder/assistant-acct-period.glade b/gnucash/gtkbuilder/assistant-acct-period.glade index 212edd6165..bcd2219687 100644 --- a/gnucash/gtkbuilder/assistant-acct-period.glade +++ b/gnucash/gtkbuilder/assistant-acct-period.glade @@ -129,6 +129,7 @@ Books will be closed at midnight on the selected date. True False + end False Title @@ -141,6 +142,7 @@ Books will be closed at midnight on the selected date. True False + end Notes True diff --git a/gnucash/gtkbuilder/assistant-csv-account-import.glade b/gnucash/gtkbuilder/assistant-csv-account-import.glade index 4c301ff5de..4c2130f470 100644 --- a/gnucash/gtkbuilder/assistant-csv-account-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-account-import.glade @@ -139,7 +139,8 @@ Enter file name and location for the Import... True False - 12 + 6 + 6 Comma Separated @@ -185,7 +186,7 @@ Enter file name and location for the Import... 0 - 2 + 1 @@ -210,15 +211,6 @@ Enter file name and location for the Import... - - - - - - - - - diff --git a/gnucash/gtkbuilder/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade index ea8e71b0ee..6d9c7b96e6 100644 --- a/gnucash/gtkbuilder/assistant-csv-export.glade +++ b/gnucash/gtkbuilder/assistant-csv-export.glade @@ -57,47 +57,40 @@ Select the type of Export required and the separator that will be used. 0 none - + True False - 20 + 3 + 6 - + + Use Quotes True - False - 3 - 3 - - - Use Quotes - True - True - False - start - True - - - - 0 - 0 - - - - - Simple Layout - True - True - False - start - True - - - - 1 - 0 - - + True + False + start + True + + + 0 + 0 + + + + + Simple Layout + True + True + False + start + True + + + + 1 + 0 + @@ -106,7 +99,9 @@ Select the type of Export required and the separator that will be used. True False Options - True + + + @@ -124,99 +119,92 @@ Select the type of Export required and the separator that will be used. 0 none - + True False - 20 + 3 + 6 - + + Comma (,) True - False - 3 - 3 - - - Comma (,) - True - True - False - start - True - True - - - - 0 - 0 - - - - - Colon (:) - True - True - False - start - True - True - comma_radio - - - - 1 - 0 - - - - - Semicolon (;) - True - True - False - start - True - True - comma_radio - - - - 2 - 0 - - - - - Custom - True - True - False - start - True - True - comma_radio - - - - 0 - 1 - - - - - True - True - ● - False - False - - - - 1 - 1 - 2 - - + True + False + start + True + True + + + 0 + 0 + + + + + Colon (:) + True + True + False + start + True + True + comma_radio + + + + 1 + 0 + + + + + Semicolon (;) + True + True + False + start + True + True + comma_radio + + + + 2 + 0 + + + + + Custom + True + True + False + start + True + True + comma_radio + + + + 0 + 1 + + + + + True + True + ● + False + False + + + + 1 + 1 + 2 + @@ -225,7 +213,9 @@ Select the type of Export required and the separator that will be used. True False Separators - True + + + @@ -289,135 +279,129 @@ Select the type of Export required and the separator that will be used. - + True False - 12 + True + vertical - + + True + True + in + + + True + True + 0 + + + + True False - vertical + 3 + 2 - + True - True - in + False True - True + False 0 - + True False - 3 - 2 - - - True - False - - - True - False - 0 - - - - - True - False - Accounts Selected: - center - - - False - False - 1 - - - - - True - False - 0 - center - - - False - False - 1 - - - - - True - False - - - True - False - 3 - - + Accounts Selected: + center False - True + False 1 - + True False - vertical - - - _Select Subaccounts - True - True - True - 3 - True - - - False - False - 0 - - - - - Select _All - True - True - True - 3 - True - - - False - False - 1 - - + 0 + center False - True - 2 + False + 1 + + + + + True + False + + + True + False + 3 + + False + True + 1 + + + + + True + False + vertical + + + _Select Subaccounts + True + True + True + 3 + True + + + False + False + 0 + + + + + Select _All + True + True + True + 3 + True + + + False + False + 1 + + + + + False + True + 2 + - True + False True 1 @@ -488,11 +472,13 @@ Select the type of Export required and the separator that will be used. True False + 12 6 True False + end Start @@ -582,6 +568,7 @@ Select the type of Export required and the separator that will be used. True False + end End diff --git a/gnucash/gtkbuilder/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade index 85a96ca5e4..cf98f4ee4b 100644 --- a/gnucash/gtkbuilder/assistant-csv-price-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-price-import.glade @@ -50,6 +50,9 @@ True False + start + 12 + 12 This assistant will help you import Prices from a CSV file. There is a minimum number of columns that have to be present for a successful import, these are Date, Amount, From Namespace, From Symbol and Currency To. If all entries are for the same Commodity / Currency then you can select them and then the columns will be Date and Amount. @@ -113,8 +116,9 @@ Select location and file name for the Import, then click "OK"... True False - 5 - 5 + start + 6 + 6 True @@ -122,61 +126,53 @@ Select location and file name for the Import, then click "OK"... 0 in - + True False - 5 - 5 - 5 + 3 - + True - False + True + True + Delete Settings + - + True - True - True - Delete Settings - - - - True - False - edit-delete - - + False + edit-delete - - False - False - end - 0 - - - - - True - True - True - Save Settings - - - - True - False - document-save - - - - - False - False - end - 2 - + + False + False + end + 0 + + + + + True + True + True + Save Settings + + + + True + False + document-save + + + + + False + False + end + 2 + @@ -185,7 +181,7 @@ Select location and file name for the Import, then click "OK"... True False start - <b>Load and Save Settings</b> + <b>Load and Save Settings</b> True False @@ -202,90 +198,244 @@ Select location and file name for the Import, then click "OK"... False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - none - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 5 + 6 + 6 + vertical + 3 - + True False - vertical - + + Separators + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + True + + + + 0 + 0 + + + + + Fixed-Width + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + csv_button + + + 1 + 0 + + + + True False - - - Separators - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - True - - - - 0 - 0 - - - - - Fixed-Width - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - csv_button - - - 1 - 0 - - - - - True - False - - - 0 - 1 - 2 - - + True + + + 0 + 1 + 2 + + + + + False + False + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + + + Space + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 0 + 0 + + + + + Tab + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 1 + 0 + + + + + Comma (,) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + True + + + + 2 + 0 + + + + + Colon (:) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 2 + 1 + + + + + Semicolon (;) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 0 + 1 + + + + + Hyphen (-) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 1 + 1 + + + + + Custom + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 0 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + False + False + + + + 1 + 2 + + + + + + + + False + False + 1 + + + + + False + True + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dialog-information False - False + True + 2 0 - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + 5 - - Space + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - + False + • + True + True 0 @@ -293,15 +443,14 @@ Select location and file name for the Import, then click "OK"... - - Tab + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False start - True - + Double-click anywhere on the table below to insert a column break + True + True + 0 1 @@ -309,48 +458,12 @@ Select location and file name for the Import, then click "OK"... - - Comma (,) + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - True - - - - 2 - 0 - - - - - Colon (:) - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - - 2 - 1 - - - - - Semicolon (;) - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - + False + • + True + True 0 @@ -358,193 +471,73 @@ Select location and file name for the Import, then click "OK"... - - Hyphen (-) + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False start - True - + Right-click anywhere in a column to modify it (widen, narrow, merge) + True + True + 0 1 1 - - - Custom - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - - 0 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - False - False - - - - 1 - 2 - - - - - - False - False + True + True 1 + + + False + False + 2 + + + + + True + False - + + True False - True - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dialog-information - - - False - True - 2 - 0 - - - - - True - False - 5 - - - True - False - • - True - True - - - 0 - 0 - - - - - True - False - start - Double-click anywhere on the table below to insert a column break - True - True - 0 - - - 1 - 0 - - - - - True - False - • - True - True - - - 0 - 1 - - - - - True - False - start - Right-click anywhere in a column to modify it (widen, narrow, merge) - True - True - 0 - - - 1 - 1 - - - - - True - True - 1 - - + 3 + 3 + True - False - False - 2 + 0 + 0 - + + Allow existing prices to be over written. True - False - - - True - False - - - 0 - 0 - - - - - Allow existing prices to be over written. - True - True - False - False - Normally prices are not over written, select this to change that. This setting is not saved. - True - - - - 0 - 1 - - + True + False + False + Normally prices are not over written, select this to change that. This setting is not saved. + True + - False - False - 3 + 0 + 1 + + False + False + 3 + @@ -569,212 +562,213 @@ Select location and file name for the Import, then click "OK"... True False 0 - none - + True False - 5 - 5 + 6 + 6 + 6 + 6 + 6 - + + True + False + end + Date Format + + + 0 + 1 + + + + + True + False + end + Currency Format + + + 0 + 2 + + + + + True + False + end + Encoding + + + 0 + 0 + + + + + True + False + end + Leading Lines to Skip + + + 0 + 4 + + + + + True + False + end + Trailing Lines to Skip + + + 0 + 5 + + + + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - + True - False - 5 - 5 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - 1 - 1 - - - - - True - False - start - Date Format - - - 0 - 1 - - - - - True - False - 0 - - - 1 - 2 - - - - - True - False - start - Currency Format - - - 0 - 2 - - - - - True - False - start - Encoding - - - 0 - 0 - - - - - True - False - 0 - - - 1 - 0 - - - - - True - False - start - Leading Lines to Skip - - - 0 - 4 - - - - - True - False - start - Trailing Lines to Skip - - - 0 - 5 - - - - - True - False - - - True - True - ● - False - False - start_row_adj - True - - - - False - False - 0 - - - - - 1 - 4 - - - - - True - False - - - True - True - ● - False - False - end_row_adj - True - - - - False - False - 0 - - - - - 1 - 5 - - - - - True - False - - - 0 - 3 - 2 - - + True + ● + False + False + start_row_adj + True + False - True + False 0 + + + 1 + 4 + + + + + True + False - - Skip alternate lines + True True - False - Starting from the first line that is actually imported every second line will be skipped. This option will take the leading lines to skip into account as well. -For example -* if "Leading Lines to Skip" is set to 3, the first line to import will be line 4. Lines 5, 7, 9,... will be skipped. -* if "Leading Lines to Skip" is set to 4, the first line to import will be line 5. Lines 6, 8, 10,... will be skipped. - start - True - + ● + False + False + end_row_adj + True + False - True - 1 + False + 0 + + 1 + 5 + + + + + True + False + 3 + 3 + + + 0 + 3 + 2 + + + + + True + False + end + Skip alternate lines + + + 0 + 6 + + + + + True + True + False + Starting from the first line that is actually imported every second line will be skipped. This option will take the leading lines to skip into account as well. +For example +* if "Leading Lines to Skip" is set to 3, the first line to import will be line 4. Lines 5, 7, 9,... will be skipped. +* if "Leading Lines to Skip" is set to 4, the first line to import will be line 5. Lines 6, 8, 10,... will be skipped. + start + True + + + + 1 + 6 + + + + + True + False + True + + + + + + 1 + 1 + + + + + True + False + True + + + + + + 1 + 2 + + + + + True + False + True + + + + + + 1 + 0 + @@ -807,6 +801,8 @@ For example True False + start + 6 True @@ -814,35 +810,26 @@ For example 0 none - + True False - 5 - 5 - 5 - + True False + liststore1 - - True - False - liststore1 - - - - 0 - - - - - False - False - 0 - + + + 0 + + + False + False + 0 + @@ -868,35 +855,26 @@ For example 0 none - + True False - 5 - 5 - 5 - + True False + liststore1 - - True - False - liststore1 - - - - 0 - - - - - False - False - 0 - + + + 0 + + + False + False + 0 + @@ -1023,27 +1001,22 @@ For example True False + center 12 vertical - + True False - - - True - False - <b>Press Apply to add the Prices. + <b>Press Apply to add the Prices. Cancel to abort.</b> - True - center - True - - + True + center + True - True - False + False + True 0 @@ -1058,6 +1031,7 @@ Cancel to abort.</b> True False + center 12 vertical @@ -1085,8 +1059,5 @@ Cancel to abort.</b> - - - diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade index b2ff9ced4c..a15ec0308e 100644 --- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade @@ -42,6 +42,8 @@ False start start + 12 + 12 This assistant will help you import a delimited file containing a list of transactions. It supports both token separated files (such as comma separated or semi-colon separated) and fixed width data. For a successful import three columns have to be available in the import data: @@ -104,6 +106,8 @@ Select location and file name for the Import, then click 'OK'... True False + start + 6 5 5 @@ -113,61 +117,53 @@ Select location and file name for the Import, then click 'OK'... 0 in - + True False - 5 - 5 - 5 + 3 - + True - False + True + True + Delete Settings + - + True - True - True - Delete Settings - - - - True - False - edit-delete - - + False + edit-delete - - False - False - end - 0 - - - - - True - True - True - Save Settings - - - - True - False - document-save - - - - - False - False - end - 2 - + + False + False + end + 0 + + + + + True + True + True + Save Settings + + + + True + False + document-save + + + + + False + False + end + 2 + @@ -175,7 +171,7 @@ Select location and file name for the Import, then click 'OK'... True False - <b>Load and Save Settings</b> + <b>Load and Save Settings</b> True False @@ -192,94 +188,249 @@ Select location and file name for the Import, then click 'OK'... False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - none - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 5 + 6 + 6 + vertical - + True False - vertical - + + Separators + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + True + + + + 0 + 0 + + + + + Fixed-Width + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + csv_button + + + 1 + 0 + + + + True False - - - Separators - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - True - - - - 0 - 0 - - - - - Fixed-Width - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - csv_button - - - 1 - 0 - - - - - True - False - True - - - 0 - 1 - 3 - - - - - + True + + + 0 + 1 + 3 + + + + + + + + False + False + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + + + Space + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 0 + 0 + + + + + Tab + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 1 + 0 + + + + + Comma (,) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + True + + + + 2 + 0 + + + + + Colon (:) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 0 + 1 + + + + + Semicolon (;) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 1 + 1 + + + + + Hyphen (-) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 2 + 1 + + + + + Custom + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + + 0 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + False + False + + + + 1 + 2 + + + + + + + + False + False + 1 + + + + + False + True + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + start + dialog-information + 3 False - False + True + 2 0 - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + 5 - - Space + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - + False + • + True + True 0 @@ -287,15 +438,14 @@ Select location and file name for the Import, then click 'OK'... - - Tab + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False start - True - + Double-click anywhere on the table below to insert a column break + True + True + 0 1 @@ -303,32 +453,12 @@ Select location and file name for the Import, then click 'OK'... - - Comma (,) + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - True - - - - 2 - 0 - - - - - Colon (:) - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - + False + • + True + True 0 @@ -336,220 +466,80 @@ Select location and file name for the Import, then click 'OK'... - - Semicolon (;) + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False start - True - + Right-click anywhere in a column to modify it (widen, narrow, merge) + True + True + 0 1 1 - - - Hyphen (-) - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - - 2 - 1 - - - - - Custom - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - - 0 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - False - False - - - - 1 - 2 - - - - - - False - False + True + True 1 + + + False + False + 2 + + + + + True + False - + + True False - True - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - start - dialog-information - 3 - - - False - True - 2 - 0 - - - - - True - False - 5 - - - True - False - • - True - True - - - 0 - 0 - - - - - True - False - start - Double-click anywhere on the table below to insert a column break - True - True - 0 - - - 1 - 0 - - - - - True - False - • - True - True - - - 0 - 1 - - - - - True - False - start - Right-click anywhere in a column to modify it (widen, narrow, merge) - True - True - 0 - - - 1 - 1 - - - - - True - True - 1 - - + 3 + 3 + True - False - False - 2 + 0 + 0 + 2 - + + Multi-split True - False - - - True - False - True - - - 0 - 0 - 2 - - - - - Multi-split - True - True - False - Normally the importer will assume each line in the input file will correspond to one transaction. Each line can have information for one transaction and one or two splits. + True + False + Normally the importer will assume each line in the input file will correspond to one transaction. Each line can have information for one transaction and one or two splits. When Multi-split is enabled the importer will assume multiple consecutive lines together hold the information for one transaction. Each line provides information for exactly one split. The first line should also provide the information for the transaction. To know which lines belong to the same transaction, the importer will compare the provided transaction information in each line. If that information is empty or the same as the first transaction line the importer will consider this line part of the same transaction. - start - True - - - - 0 - 1 - - - - - + start + True + - False - False - 3 + 0 + 1 + + + + + False + False + 3 + @@ -573,194 +563,191 @@ To know which lines belong to the same transaction, the importer will compare th True False 0 - none - + True False - 5 - 5 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical - + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical + 6 + 6 + 3 + 6 + 6 - + + True + False + end + Date Format + + + 0 + 1 + + + + + True + False + end + Currency Format + + + 0 + 2 + + + + + True + False + end + Encoding + + + 0 + 0 + + + + + True + False + end + Leading Lines to Skip + + + 0 + 4 + + + + + True + False + end + Trailing Lines to Skip + + + 0 + 5 + + + + True False - 5 - 5 - + True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - 1 - 1 - - - - - True - False + True start - Date Format + ● + False + False + start_row_adj + True + - 0 - 1 - - - - - True - False - 0 - - - 1 - 2 - - - - - True - False - start - Currency Format - - - 0 - 2 - - - - - True - False - start - Encoding - - - 0 - 0 - - - - - True - False - 0 - - - 1 - 0 - - - - - True - False - start - Leading Lines to Skip - - - 0 - 4 - - - - - True - False - start - Trailing Lines to Skip - - - 0 - 5 - - - - - True - False - - - True - True - ● - False - False - start_row_adj - True - - - - False - False - 0 - - - - - 1 - 4 - - - - - True - False - - - True - True - ● - False - False - end_row_adj - True - - - - False - False - 0 - - - - - 1 - 5 - - - - - True - False - - - 0 - 3 - 2 + False + False + 0 - False - True - 0 + 1 + 4 + + + + + True + False + + + True + True + start + ● + False + False + end_row_adj + True + + + + False + False + 0 + + + + + 1 + 5 + + + + + True + False + 3 + 3 + + + 0 + 3 + 2 + + + + + True + False + + + + + + 1 + 1 + + + + + True + False + + + + + + 1 + 0 + + + + + True + False + + + + + + 1 + 2 - Skip alternate lines True True False @@ -773,12 +760,28 @@ For example - False - True - 1 + 1 + 6 + + + + + True + False + end + Skip alternate lines + + + 0 + 6 + + False + True + 0 + @@ -803,18 +806,11 @@ For example 0 none - + True False - 5 - 5 - 5 - - - True - False - - + 3 + True @@ -948,7 +944,7 @@ For example True False - Select a row to change the mappings: + Select a row to change the mappings False @@ -1057,11 +1053,14 @@ For example True False + start vertical True False + 12 + 12 If you click "Next" Gnucash will perform a number of checks. If one of those <i>checks fails</i> you'll be automatically redirected to the preview page to try and correct. diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade index 91b71ee94b..73d4b4e26f 100644 --- a/gnucash/gtkbuilder/assistant-hierarchy.glade +++ b/gnucash/gtkbuilder/assistant-hierarchy.glade @@ -18,8 +18,9 @@ True False - 5 - 5 + start + 12 + 12 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. @@ -370,8 +371,8 @@ Select categories that correspond to the ways that you foresee you will use GnuC True False - 5 - 5 + 12 + 12 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. diff --git a/gnucash/gtkbuilder/assistant-loan.glade b/gnucash/gtkbuilder/assistant-loan.glade index c6ab8bc974..e041bf34df 100644 --- a/gnucash/gtkbuilder/assistant-loan.glade +++ b/gnucash/gtkbuilder/assistant-loan.glade @@ -101,10 +101,12 @@ True False + start + 12 + 12 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. - center True @@ -140,9 +142,10 @@ If you make a mistake or want to make changes later, you can edit the created Sc True False + center 5 - 5 - 5 + 6 + 6 True @@ -266,86 +269,6 @@ If you make a mistake or want to make changes later, you can edit the created Sc 5 - - - True - False - 0 - 0.25 - - - 1 - 4 - - - - - True - False - 0 - 0.5 - - - True - False - - - True - False - rate_liststore - - - - 0 - - - - - True - True - 0 - - - - - True - True - Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans. - ● - False - False - 1 - 3 - True - True - - - True - True - 1 - - - - - True - False - % - center - - - False - False - 2 - - - - - - - 1 - 2 - - True @@ -373,40 +296,6 @@ If you make a mistake or want to make changes later, you can edit the created Sc 5 - - - True - False - 0.5 - 0.75 - - - True - False - 0.5 - - - True - False - 10 - - - - - True - False - Interest Rate Change Frequency - - - - - - - 0 - 3 - 4 - - True @@ -424,6 +313,95 @@ If you make a mistake or want to make changes later, you can edit the created Sc 2 + + + True + False + + + True + False + rate_liststore + + + + 0 + + + + + True + True + 0 + + + + + True + True + Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans. + ● + False + False + 1 + 3 + True + True + + + True + True + 1 + + + + + True + False + % + center + + + False + False + 2 + + + + + 1 + 2 + + + + + True + False + 0.5 + + + True + False + 10 + + + + + True + False + Interest Rate Change Frequency + + + + + 0 + 3 + 4 + + + + + @@ -507,33 +485,29 @@ Do you utilise an escrow account, if so an account must be specified... - + True False - 0.75 + start + 12 + 6 - + True False - - - True - False - Escrow Account - center - - - False - False - 0 - - + Escrow Account + center + + False + False + 0 + False - False + True 1 @@ -586,9 +560,10 @@ All accounts must have valid entries to continue. True False + center 5 - 5 - 5 + 6 + 6 True @@ -655,19 +630,12 @@ All accounts must have valid entries to continue. - + True - False - 0 - - - True - True - ● - False - False - - + True + ● + False + False 1 @@ -676,20 +644,13 @@ All accounts must have valid entries to continue. - + True - False - 0 - - - True - True - False - ● - False - False - - + True + False + ● + False + False 1 @@ -698,30 +659,22 @@ All accounts must have valid entries to continue. - + True False - 0.5 - 0.89999997615814209 + 0.5 - + True False - 0.5 - - - True - False - 10 - - - - - True - False - Repayment Frequency - - + 10 + + + + + True + False + Repayment Frequency @@ -784,6 +737,7 @@ All enabled option pages must contain valid entries to continue. True False + center True @@ -794,8 +748,8 @@ All enabled option pages must contain valid entries to continue. True False 5 - 5 - 5 + 6 + 6 True @@ -848,48 +802,6 @@ All enabled option pages must contain valid entries to continue. 4 - - - True - False - 0 - - - True - True - ● - False - False - - - - - 1 - 0 - 3 - - - - - True - False - 0 - - - True - True - ● - False - False - - - - - 1 - 1 - 3 - - True @@ -946,6 +858,34 @@ All enabled option pages must contain valid entries to continue. 2 + + + True + True + ● + False + False + + + 1 + 0 + 3 + + + + + True + True + ● + False + False + + + 1 + 1 + 3 + + @@ -984,32 +924,50 @@ All enabled option pages must contain valid entries to continue. - + True False - 0.5 - 0.75 + center + 0.5 - + True False - start - 0.5 + vertical - + + Part of Payment Transaction + True + True + False + start + True + True + True + + + False + False + 0 + + + + True False + True + 10 vertical - - Part of Payment Transaction + + Other True True False start True - True True + pay_txn_part_rb False @@ -1018,62 +976,36 @@ All enabled option pages must contain valid entries to continue. - + True False - True - 10 - vertical - - - Other - True - True - False - start - True - True - pay_txn_part_rb - - - False - False - 0 - - - - - True - False - - - False - True - 1 - - False - False + True 1 + + False + False + 1 + - - - True - False - Payment Frequency - - + + + + + True + False + Payment Frequency - True - False + False + True 1 @@ -1229,6 +1161,7 @@ Review the details below and if correct press Apply to create the schedule.True False 10 + 6 True diff --git a/gnucash/gtkbuilder/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade index e82f37379a..9aa07784db 100644 --- a/gnucash/gtkbuilder/assistant-qif-import.glade +++ b/gnucash/gtkbuilder/assistant-qif-import.glade @@ -39,6 +39,9 @@ True False + start + 12 + 12 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. diff --git a/gnucash/gtkbuilder/assistant-stock-split.glade b/gnucash/gtkbuilder/assistant-stock-split.glade index 876c0f6de1..0f36bdd4c7 100644 --- a/gnucash/gtkbuilder/assistant-stock-split.glade +++ b/gnucash/gtkbuilder/assistant-stock-split.glade @@ -19,6 +19,9 @@ True False + start + 12 + 12 This assistant will help you record a stock split or stock merger. True @@ -34,11 +37,13 @@ True False 12 + 6 vertical True False + 6 Select the account for which you want to record a stock split or merger. center @@ -80,11 +85,13 @@ True False + 6 vertical True False + 6 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. center True @@ -100,13 +107,13 @@ True False 6 - 12 + 3 6 True False - start + end _Date True center @@ -120,7 +127,7 @@ True False - start + end _Shares True center @@ -134,7 +141,7 @@ True False - start + end Desc_ription True center @@ -172,6 +179,7 @@ True False + 6 If you want to record a stock price for the split, enter it below. You may safely leave it blank. True center @@ -187,7 +195,7 @@ True False - start + end New _Price True center @@ -201,7 +209,7 @@ True False - start + end Currenc_y True center @@ -247,6 +255,7 @@ True False + 6 If you received a cash disbursement as a result of the stock split, enter the details of that payment here. Otherwise, just click "Next". center True @@ -261,12 +270,13 @@ True False - 6 - 12 + 3 + 6 True False + end _Amount True center @@ -280,6 +290,7 @@ True False + end _Memo True center @@ -325,7 +336,8 @@ True False - 12 + 3 + 6 True @@ -354,20 +366,12 @@ - + True False + True True - 12 - - - True - False - True - True - 3 - - + 3 1 @@ -375,19 +379,12 @@ - + True False + True True - - - True - False - True - True - 3 - - + 3 0 @@ -411,6 +408,8 @@ True False + 12 + 12 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. True diff --git a/gnucash/gtkbuilder/assistant-xml-encoding.glade b/gnucash/gtkbuilder/assistant-xml-encoding.glade index bcfbb35ef4..14d784af5a 100644 --- a/gnucash/gtkbuilder/assistant-xml-encoding.glade +++ b/gnucash/gtkbuilder/assistant-xml-encoding.glade @@ -5,6 +5,7 @@ False 12 + 500 @@ -42,6 +43,7 @@ True False + 6 _Edit list of encodings @@ -102,25 +104,20 @@ - + True - False - 0.75 + True - + True - True + False - + True False + vertical - - True - False - 6 - 12 - + @@ -128,7 +125,7 @@ - True + False True 2 @@ -245,6 +242,7 @@ True False + start <b>S_ystem input encodings</b> True True @@ -257,70 +255,58 @@ - + True False - 12 + True + 6 - + True - False - 6 + True + never + in - + True True - never - in - - - True - True - False - - - - + False + + - - True - True - 0 - - - - - True - False - 0 - - - True - True - True - - - - True - False - go-next - - - - - - - False - False - 1 - + + True + True + 0 + + + + + True + True + True + center + + + + True + False + go-next + + + + + False + True + 1 + - True + False True 1 @@ -342,6 +328,7 @@ True False + start <b>_Custom encoding</b> True True @@ -354,54 +341,47 @@ - + True False - 12 + 6 - + True - False - 6 + True + ● + False + False + + + True + True + 0 + + + + + True + True + True + - + True - True - ● - False - False + False + go-next - - True - True - 0 - - - - - True - True - True - - - - True - False - go-next - - - - - False - False - 1 - + + False + False + 1 + - True + False True 1 @@ -424,12 +404,14 @@ True False + True vertical 6 True False + start <b>_Selected encodings</b> True True @@ -442,70 +424,59 @@ - + True False - 12 + True + 6 - + True - False - 6 + True + True + center + - + True False - 0 - - - True - True - True - - - - True - False - go-previous - - - - + center + go-previous - - False - True - 0 - - - - - True - True - never - in - - - True - True - False - - - - - - - - False - True - 1 - + + False + True + 0 + + + + + True + True + never + in + + + True + True + False + + + + + + + + False + True + 1 + - True + False True 1 diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp index ed33382c58..bdc28efa77 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp +++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp @@ -624,6 +624,7 @@ CsvImpPriceAssist::CsvImpPriceAssist () auto encoding_container = GTK_CONTAINER(gtk_builder_get_object (builder, "encoding_container")); gtk_container_add (encoding_container, GTK_WIDGET(encselector)); + gtk_widget_set_hexpand (GTK_WIDGET(encselector), true); gtk_widget_show_all (GTK_WIDGET(encoding_container)); /* Add commodity selection widget */ @@ -655,6 +656,7 @@ CsvImpPriceAssist::CsvImpPriceAssist () /* Add it to the assistant. */ 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_widget_set_hexpand (GTK_WIDGET(date_format_combo), true); gtk_widget_show_all (GTK_WIDGET(date_format_container)); /* 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. */ 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_widget_set_hexpand (GTK_WIDGET(currency_format_combo), true); gtk_widget_show_all (GTK_WIDGET(currency_format_container)); /* Connect the CSV/Fixed-Width radio button event handler. */ diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp index abdc54b94c..8e9546ce1d 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp +++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp @@ -563,6 +563,7 @@ CsvImpTransAssist::CsvImpTransAssist () acct_selector = gnc_account_sel_new(); 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_widget_set_hexpand (GTK_WIDGET(acct_selector), true); gtk_widget_show (acct_selector); 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")); gtk_container_add (encoding_container, GTK_WIDGET(encselector)); + gtk_widget_set_hexpand (GTK_WIDGET(encselector), true); gtk_widget_show_all (GTK_WIDGET(encoding_container)); /* The instructions label and image */ @@ -594,6 +596,7 @@ CsvImpTransAssist::CsvImpTransAssist () /* Add it to the assistant. */ 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_widget_set_hexpand (GTK_WIDGET(date_format_combo), true); gtk_widget_show_all (GTK_WIDGET(date_format_container)); /* 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. */ 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_widget_set_hexpand (GTK_WIDGET(currency_format_combo), true); gtk_widget_show_all (GTK_WIDGET(currency_format_container)); /* Connect the CSV/Fixed-Width radio button event handler. */