From 2e311da1cc0ce837ec8211c7475d06405d4bddd6 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 29 Nov 2019 16:30:58 +0000 Subject: [PATCH] Remove GtkAlignment and use GtkGrids in glade files - Part3 --- gnucash/gnome/dialog-invoice.c | 4 + gnucash/gtkbuilder/business-prefs.glade | 3 +- .../gtkbuilder/dialog-account-picker.glade | 4 +- gnucash/gtkbuilder/dialog-account.glade | 290 ++-- gnucash/gtkbuilder/dialog-bi-import-gui.glade | 477 +++--- gnucash/gtkbuilder/dialog-billterms.glade | 555 +++---- gnucash/gtkbuilder/dialog-book-close.glade | 1 + gnucash/gtkbuilder/dialog-choose-owner.glade | 98 +- gnucash/gtkbuilder/dialog-commodity.glade | 536 +++---- .../dialog-customer-import-gui.glade | 344 ++--- gnucash/gtkbuilder/dialog-customer.glade | 1366 +++++++---------- gnucash/gtkbuilder/dialog-date-close.glade | 303 ++-- gnucash/gtkbuilder/dialog-employee.glade | 872 +++++------ gnucash/gtkbuilder/dialog-file-access.glade | 227 ++- gnucash/gtkbuilder/dialog-fincalc.glade | 1250 +++++++-------- gnucash/gtkbuilder/dialog-import.glade | 8 +- gnucash/gtkbuilder/dialog-invoice.glade | 76 +- 17 files changed, 2870 insertions(+), 3544 deletions(-) diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c index 3476053845..44832df638 100644 --- a/gnucash/gnome/dialog-invoice.c +++ b/gnucash/gnome/dialog-invoice.c @@ -153,6 +153,7 @@ struct _invoice_window GtkWidget * info_label; /*Default in glade is "Invoice Information"*/ GtkWidget * id_label; /* Default in glade is Invoice ID */ GtkWidget * type_label; + GtkWidget * type_label_hbox; GtkWidget * type_hbox; GtkWidget * type_choice; GtkWidget * id_entry; @@ -2584,6 +2585,7 @@ gnc_invoice_window_new_invoice (GtkWindow *parent, InvoiceDialogType dialog_type /* Grab the widgets */ iw->type_label = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_type_label")); + iw->type_label_hbox = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_type_label_hbox")); iw->id_label = GTK_WIDGET (gtk_builder_get_object (builder, "label14")); iw->info_label = GTK_WIDGET (gtk_builder_get_object (builder, "label1")); invoice_radio = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_invoice_type")); @@ -2617,10 +2619,12 @@ gnc_invoice_window_new_invoice (GtkWindow *parent, InvoiceDialogType dialog_type case NEW_INVOICE: case DUP_INVOICE: gtk_widget_show_all (iw->type_hbox); + gtk_widget_hide (iw->type_label_hbox); gtk_widget_hide (iw->type_label); break; case MOD_INVOICE: gtk_widget_hide (iw->type_hbox); + gtk_widget_show (iw->type_label_hbox); gtk_widget_show (iw->type_label); break; default: diff --git a/gnucash/gtkbuilder/business-prefs.glade b/gnucash/gtkbuilder/business-prefs.glade index b0ed07cf06..65030bfd54 100644 --- a/gnucash/gtkbuilder/business-prefs.glade +++ b/gnucash/gtkbuilder/business-prefs.glade @@ -48,7 +48,8 @@ True False 6 - 12 + 3 + 6 True diff --git a/gnucash/gtkbuilder/dialog-account-picker.glade b/gnucash/gtkbuilder/dialog-account-picker.glade index ab9165bbc2..ad8d8f35fc 100644 --- a/gnucash/gtkbuilder/dialog-account-picker.glade +++ b/gnucash/gtkbuilder/dialog-account-picker.glade @@ -13,6 +13,8 @@ True False + 3 + 6 True @@ -265,7 +267,7 @@ False start - gtk-dialog-warning + dialog-warning False diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade index d2b600d7d8..946cac1ccf 100644 --- a/gnucash/gtkbuilder/dialog-account.glade +++ b/gnucash/gtkbuilder/dialog-account.glade @@ -256,13 +256,13 @@ True False True - 12 + 3 + 6 True False start - 15 This account contains sub-accounts. What would you like to do with these sub-accounts? True @@ -279,7 +279,6 @@ True False start - 15 True True True @@ -298,7 +297,6 @@ True False start - 15 True True sa_mrb @@ -363,7 +361,8 @@ True False True - 12 + 3 + 6 M_ove to @@ -371,7 +370,6 @@ True False start - 15 True True True @@ -388,7 +386,6 @@ True False start - 15 True True trans_mrb @@ -405,7 +402,6 @@ True False start - 15 This account contains transactions. What would you like to do with these transactions? True @@ -420,7 +416,6 @@ True False start - 15 This account contains read-only transactions which may not be deleted. True @@ -484,7 +479,8 @@ True False True - 12 + 3 + 6 M_ove to @@ -492,7 +488,6 @@ True False start - 15 True True True @@ -509,7 +504,6 @@ True False start - 15 True True sa_trans_mrb @@ -526,7 +520,6 @@ True False start - 15 One or more sub-accounts contain transactions. What would you like to do with these transactions? True @@ -541,7 +534,6 @@ True False start - 15 One or more sub-accounts contain read-only transactions which may not be deleted. True @@ -661,7 +653,7 @@ True False 6 - 6 + 3 6 @@ -762,6 +754,7 @@ True False + 6 vertical @@ -771,7 +764,6 @@ False Show accounts which have the option "Hidden" checked. start - 12 True True @@ -783,17 +775,16 @@ - - Show _unused accounts + + Show _zero total accounts True True False - Show accounts which do not have any transactions. + Show accounts which have a zero total value. start - 12 True True - + False @@ -802,17 +793,16 @@ - - Show _zero total accounts + + Show _unused accounts True True False - Show accounts which have a zero total value. + Show accounts which do not have any transactions. start - 12 True True - + False @@ -986,7 +976,6 @@ True False True - 6 True @@ -1005,14 +994,13 @@ True False True - 6 - 12 + 3 + 6 True False start - 12 Account _name True name_entry @@ -1028,7 +1016,6 @@ True False start - 12 _Account code True code_entry @@ -1043,7 +1030,6 @@ True False start - 12 _Description True description_entry @@ -1058,7 +1044,6 @@ True False start - 12 _Security/currency True @@ -1085,7 +1070,6 @@ True False start - 12 Smallest _fraction True account_scu @@ -1100,9 +1084,9 @@ True False start - 12 Account _Color True + color_entry_button 0 @@ -1153,7 +1137,6 @@ False start start - 12 No_tes True notes_text @@ -1163,57 +1146,6 @@ 6 - - - Ta_x related - True - False - True - False - Use Edit->Tax Report Options to set the tax-related flag and assign a tax code to this account. - start - 12 - True - True - - - 0 - 7 - - - - - Placeholde_r - True - True - False - This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account. - start - 12 - True - True - - - 0 - 8 - - - - - H_idden - True - True - False - This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register. To reset this option, you will first need to open the "Filter By..." dialog for the account tree and check the "show hidden accounts" option. Doing so will allow you to select the account and reopen this dialog. - start - True - True - - - 1 - 7 - - True @@ -1296,7 +1228,90 @@ - + + True + True + False + This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account. + start + True + + + 1 + 9 + + + + + True + True + False + This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register. To reset this option, you will first need to open the "Filter By..." dialog for the account tree and check the "show hidden accounts" option. Doing so will allow you to select the account and reopen this dialog. + start + True + + + 1 + 8 + + + + + True + False + True + False + Use Edit->Tax Report Options to set the tax-related flag and assign a tax code to this account. + start + True + + + 1 + 7 + + + + + True + False + start + H_idden + True + hidden_button + + + 0 + 8 + + + + + True + False + start + Placeholde_r + True + placeholder_button + + + 0 + 9 + + + + + True + False + False + start + Ta_x related + True + tax_related_button + + + 0 + 7 + @@ -1315,7 +1330,8 @@ True False - 6 + 3 + 12 True @@ -1360,7 +1376,6 @@ True False - 12 True True in @@ -1382,7 +1397,6 @@ True True - 12 never in @@ -1443,8 +1457,8 @@ True False - 6 - 12 + 3 + 6 True @@ -1470,7 +1484,7 @@ 0 - 3 + 4 2 @@ -1507,7 +1521,6 @@ True False start - 12 _Balance True right @@ -1522,7 +1535,6 @@ True False start - 12 _Date True right @@ -1539,14 +1551,13 @@ True False start - 12 True True 0 - 4 + 5 2 @@ -1557,14 +1568,13 @@ True False start - 12 True True opening_equity_radio 0 - 5 + 6 2 @@ -1573,20 +1583,33 @@ True False False - 12 True True 3 + etched-in 0 - 6 + 7 2 + + + True + False + + + 0 + 3 + + + + + False @@ -1638,6 +1661,7 @@ 6 Renumber sub-accounts True + 400 dialog @@ -1696,8 +1720,8 @@ True False - 6 - 12 + 3 + 6 True @@ -1739,6 +1763,8 @@ True False start + start + 6 Examples @@ -1746,17 +1772,6 @@ 3 - - - True - False - start - - - 1 - 3 - - True @@ -1784,19 +1799,52 @@ - + True False - start + 6 + vertical + + + True + False + start + 3 + 3 + 3 + 3 + + + False + True + 0 + + + + + True + False + start + 3 + 3 + 3 + 3 + + + False + True + 1 + + + 1 - 4 + 3 - - - False diff --git a/gnucash/gtkbuilder/dialog-bi-import-gui.glade b/gnucash/gtkbuilder/dialog-bi-import-gui.glade index ec413145bd..88d0e267f0 100644 --- a/gnucash/gtkbuilder/dialog-bi-import-gui.glade +++ b/gnucash/gtkbuilder/dialog-bi-import-gui.glade @@ -82,49 +82,40 @@ 3 0 - + True False - 10 - 5 - 5 - 12 + 3 - + True - False - - - True - True - ● - False - False - - - - True - True - 0 - - - - - _Open - True - True - False - True - - - - False - False - end - 1 - - + True + ● + False + False + + + True + True + 0 + + + + + _Open + True + True + False + True + + + + False + False + end + 1 + @@ -149,62 +140,50 @@ False 0 - + True False - 12 + 3 + vertical - + + Bill True - False - - - True - False - vertical - - - Bill - True - True - False - True - Import bill CSV data - Import bill CSV data - start - True - True - - - - True - True - 0 - - - - - Invoice - True - True - False - True - Import invoice CSV data - Import invoice CSV data - start - True - radiobuttonBill - - - - True - True - 1 - - - - + True + False + True + Import bill CSV data + Import bill CSV data + start + True + True + + + True + True + 0 + + + + + Invoice + True + True + False + True + Import invoice CSV data + Import invoice CSV data + start + True + radiobuttonBill + + + + True + True + 1 + @@ -230,106 +209,100 @@ 3 0 - + True False - 12 + 3 + vertical - + + Semicolon separated True - False - vertical - - - Semicolon separated - True - True - False - start - True - True - True - - - - False - False - 0 - - - - - Comma separated - True - True - False - start - True - True - radiobutton1 - - - - False - False - 1 - - - - - Semicolon separated with quotes - True - True - False - start - True - True - radiobutton1 - - - - False - False - 2 - - - - - Comma separated with quotes - True - True - False - start - True - True - radiobutton1 - - - - False - False - 3 - - - - - Custom regular expression - True - True - False - start - True - True - radiobutton1 - - - - False - False - 4 - - + True + False + start + True + True + True + + + False + False + 0 + + + + + Comma separated + True + True + False + start + True + True + radiobutton1 + + + + False + False + 1 + + + + + Semicolon separated with quotes + True + True + False + start + True + True + radiobutton1 + + + + False + False + 2 + + + + + Comma separated with quotes + True + True + False + start + True + True + radiobutton1 + + + + False + False + 3 + + + + + Custom regular expression + True + True + False + start + True + True + radiobutton1 + + + + False + False + 4 + @@ -355,26 +328,18 @@ 3 0 - + True - False - 10 - 5 - 5 - 12 + True + True + 3 + in - + True True - in - - - True - True - - - - + + @@ -402,70 +367,64 @@ 3 0 - + True False - 12 + 3 + vertical - + + Open imported documents in tabs True - False - vertical - - - Open imported documents in tabs - True - True - False - start - True - True - True - - - - False - False - 0 - - - - - Open not yet posted documents in tabs - True - True - False - start - True - True - radiobuttonOpenAll - - - - False - False - 1 - - - - - Don't open imported documents in tabs - True - True - False - start - True - True - radiobuttonOpenAll - - - - False - False - 2 - - + True + False + start + True + True + True + + + False + False + 0 + + + + + Open not yet posted documents in tabs + True + True + False + start + True + True + radiobuttonOpenAll + + + + False + False + 1 + + + + + Don't open imported documents in tabs + True + True + False + start + True + True + radiobuttonOpenAll + + + + False + False + 2 + diff --git a/gnucash/gtkbuilder/dialog-billterms.glade b/gnucash/gtkbuilder/dialog-billterms.glade index b91bf17c25..42645d0451 100644 --- a/gnucash/gtkbuilder/dialog-billterms.glade +++ b/gnucash/gtkbuilder/dialog-billterms.glade @@ -61,139 +61,108 @@ False vertical - + True False - 6 + 3 + 5 - + True False - vertical - True - - - True - False - end - Due Days - right - - - False - False - 0 - - - - - True - False - end - Discount Days - right - - - False - False - 1 - - - - - True - False - end - Discount % - right - - - False - False - 2 - - + end + Due Days + right - False - True - 0 + 0 + 0 - + True False - vertical - True - - - True - True - True - The number of days to pay the bill after the post date. - The number of days to pay the bill after the post date. - ● - False - False - due_days_adj - 1 - True - True - - - False - False - 0 - - - - - True - True - True - The number of days after the post date during which a discount will be applied for early payment. - The number of days after the post date during which a discount will be applied for early payment. - ● - False - False - discount_days_adj - 1 - True - True - - - False - False - 1 - - - - - True - True - True - The percentage discount applied for early payment. - The percentage discount applied for early payment. - ● - False - False - discount_adj - 1 - 2 - True - - - False - False - 2 - - + end + Discount Days + right - True - True - 1 + 0 + 1 + + + + + True + False + end + Discount % + right + + + 0 + 2 + + + + + True + True + True + The percentage discount applied for early payment. + The percentage discount applied for early payment. + ● + False + False + discount_adj + 1 + 2 + True + + + 1 + 2 + + + + + True + True + True + The number of days after the post date during which a discount will be applied for early payment. + The number of days after the post date during which a discount will be applied for early payment. + ● + False + False + discount_days_adj + 1 + True + True + + + 1 + 1 + + + + + True + True + True + The number of days to pay the bill after the post date. + The number of days to pay the bill after the post date. + ● + False + False + due_days_adj + 1 + True + True + + + 1 + 0 @@ -504,6 +473,7 @@ True False + start <b>Terms</b> True @@ -514,83 +484,70 @@ - + True - False - 12 + True + True + in - + True True - in - - - True - True - False - True - - - - + False + True + + - True + False True 1 - + True False - 12 + 6 + spread - + + _Delete True - False - 6 - spread - - - _Delete - True - True - True - True - Delete the current Billing Term - Delete the current Billing Term - True - - - - False - False - 0 - - - - - _New - True - True - True - True - Create a new Billing Term - Create a new Billing Term - True - - - - False - False - 1 - - + True + True + True + Delete the current Billing Term + Delete the current Billing Term + True + + + False + False + 0 + + + + + _New + True + True + True + True + Create a new Billing Term + Create a new Billing Term + True + + + + False + False + 1 + @@ -627,6 +584,7 @@ True False + start <b>Term Definition</b> True @@ -647,11 +605,13 @@ True False - 12 + 3 + 6 True False + start De_scription True right @@ -666,6 +626,7 @@ True False + start _Type True right @@ -694,19 +655,6 @@ 0 - - - True - False - start - (type) - center - - - 1 - 1 - - True @@ -721,6 +669,37 @@ 2 + + + True + False + + + True + False + start + 3 + 3 + 3 + 3 + (type) + center + + + False + True + 0 + + + + + + 1 + 1 + + @@ -869,6 +848,8 @@ True False + 3 + 6 True @@ -883,29 +864,6 @@ 2 - - - True - False - start - 12 - - - True - False - start - De_scription - True - right - entry_desc - - - - - 0 - 1 - - True @@ -924,29 +882,6 @@ 1 - - - True - False - start - 12 - - - True - False - start - _Type - True - right - type_combo - - - - - 0 - 2 - - True @@ -980,6 +915,36 @@ 3 + + + True + False + start + De_scription + True + right + entry_desc + + + 0 + 1 + + + + + True + False + start + _Type + True + right + type_combo + + + 0 + 2 + + @@ -1063,6 +1028,8 @@ True False + 3 + 6 True @@ -1151,75 +1118,6 @@ 2 - - - True - False - start - 12 - - - True - False - start - _Name - True - right - name_entry - - - - - 0 - 1 - - - - - True - False - start - 12 - - - True - False - start - De_scription - True - right - description_entry - - - - - 0 - 4 - - - - - True - False - start - 12 - - - True - False - start - _Type - True - right - type_combobox - - - - - 0 - 5 - - True @@ -1239,6 +1137,51 @@ 5 + + + True + False + start + _Name + True + right + name_entry + + + 0 + 1 + + + + + True + False + start + De_scription + True + right + description_entry + + + 0 + 4 + + + + + True + False + start + _Type + True + right + type_combobox + + + 0 + 5 + + diff --git a/gnucash/gtkbuilder/dialog-book-close.glade b/gnucash/gtkbuilder/dialog-book-close.glade index 20e5f8c635..a4d5c18ad1 100644 --- a/gnucash/gtkbuilder/dialog-book-close.glade +++ b/gnucash/gtkbuilder/dialog-book-close.glade @@ -78,6 +78,7 @@ True False + 3 6 diff --git a/gnucash/gtkbuilder/dialog-choose-owner.glade b/gnucash/gtkbuilder/dialog-choose-owner.glade index a101c9960b..ed1ac228d8 100644 --- a/gnucash/gtkbuilder/dialog-choose-owner.glade +++ b/gnucash/gtkbuilder/dialog-choose-owner.glade @@ -87,88 +87,62 @@ - + True False + 3 + 6 - + True False - vertical - True - - - True - False - Description - - - False - False - 0 - - - - - True - False - (owner) - - - False - False - 1 - - + start + Description - True - True - 0 + 0 + 0 - + + True + False + (desc) + + + 1 + 0 + + + + + True + False + start + (owner) + + + 0 + 1 + + + + True False - vertical - True - - True - False - (desc) - - - False - False - 0 - - - - - True - False - - - - - - True - True - 1 - + - True - True - 1 + 1 + 1 - True + False True 2 diff --git a/gnucash/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade index 80f6d18f19..4676402b4e 100644 --- a/gnucash/gtkbuilder/dialog-commodity.glade +++ b/gnucash/gtkbuilder/dialog-commodity.glade @@ -111,8 +111,8 @@ True False - 6 - 12 + 3 + 6 True @@ -298,127 +298,171 @@ - + True False - 12 - - + liststore2 + True + 0 + + + True - False - start - Type of quote source - right + True + + 1 + 4 + + + + + True + True + True + Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used. + Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used. + ● + False + False + + + 1 + 3 + + + + + True + False + start + 6 + Type of quote source + right + 0 11 - + True False - 12 - - - True - False - start - _Full name - True - center - fullname_entry - - + start + _Display symbol + True + center + user_symbol_entry 0 - 1 + 3 - + True False - 12 - - - True - False - start - _Symbol/abbreviation - True - center - mnemonic_entry - - + start + Time_zone + True + right 0 - 2 + 15 - + + _Unknown True - False - 12 - - - True - False - start - _Type - True - center - - + True + False + True + These are quote sources that were recently added to F::Q. GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet. + These are quote sources that were recently added to F::Q. GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet. + start + 12 + True + True + single_source_button + 0 - 4 + 14 - + + _Multiple True - False - 12 - - - True - False - start - ISIN, CUSI_P or other code - True - center - code_entry - - + True + False + True + These are F::Q quote sources that retrieve information from multiple sites on the internet. If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site. + These are F::Q quote sources that retrieve information from multiple sites on the internet. If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site. + start + 12 + True + True + single_source_button + 0 - 5 + 13 - + + Si_ngle + True + True + False + True + These are F::Q quote sources that retrieve information from a single site on the internet. If that site is unavailable, you will not be able to retrieve quotes. + These are F::Q quote sources that retrieve information from a single site on the internet. If that site is unavailable, you will not be able to retrieve quotes. + start + 12 + True + True + True + + + + 0 + 12 + + + + + _Get Online Quotes + True + True + False + start + True + True + + + + 0 + 10 + + + + True False - 12 - - - True - False - start - F_raction traded - True - center - - + start + F_raction traded + True + center 0 @@ -426,10 +470,70 @@ - + True False - 12 + start + ISIN, CUSI_P or other code + True + center + code_entry + + + 0 + 5 + + + + + True + False + start + _Type + True + center + namespace_cbwe + + + 0 + 4 + + + + + True + False + start + _Symbol/abbreviation + True + center + mnemonic_entry + + + 0 + 2 + + + + + True + False + start + _Full name + True + center + fullname_entry + + + 0 + 1 + + + + + True + False + center True @@ -472,6 +576,11 @@ + + False + True + 0 + @@ -481,191 +590,10 @@ - - True - False - 12 - - - _Get Online Quotes - True - True - False - start - True - True - - - - - - 0 - 10 - - - - - True - False - 24 - - - Si_ngle - True - True - False - True - These are F::Q quote sources that retrieve information from a single site on the internet. If that site is unavailable, you will not be able to retrieve quotes. - These are F::Q quote sources that retrieve information from a single site on the internet. If that site is unavailable, you will not be able to retrieve quotes. - start - True - True - True - - - - - - 0 - 12 - - - - - True - False - 24 - - - _Multiple - True - True - False - True - These are F::Q quote sources that retrieve information from multiple sites on the internet. If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site. - These are F::Q quote sources that retrieve information from multiple sites on the internet. If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site. - start - True - True - single_source_button - - - - - - 0 - 13 - - - - - True - False - 24 - - - _Unknown - True - True - False - True - These are quote sources that were recently added to F::Q. GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet. - These are quote sources that were recently added to F::Q. GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet. - start - True - True - single_source_button - - - - - - 0 - 14 - - - - - True - False - 12 - - - True - False - start - Time_zone - True - right - - - - - 0 - 15 - - - - - True - False - liststore2 - True - 0 - - - - True - True - - - - - 1 - 4 - - - - - True - True - True - Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used. - Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used. - ● - False - False - - - 1 - 3 - - - - - True - False - 12 - - - True - False - start - _Display symbol - True - center - - - - - 0 - 3 - - - - + True False + center @@ -673,6 +601,7 @@ 0 16 + 2 @@ -690,9 +619,6 @@ - - - True @@ -786,8 +712,8 @@ True False - 6 - 12 + 3 + 6 True @@ -801,48 +727,6 @@ 2 - - - True - False - 12 - - - True - False - start - _Type - True - center - - - - - 0 - 1 - - - - - True - False - 12 - - - True - False - start - _Security/currency - True - center - - - - - 0 - 2 - - True @@ -883,6 +767,36 @@ 2 + + + True + False + start + _Type + True + center + ss_namespace_cbwe + + + 0 + 1 + + + + + True + False + start + _Security/currency + True + center + ss_commodity_cbwe + + + 0 + 2 + + True diff --git a/gnucash/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade index 0a986bd005..405380e51c 100644 --- a/gnucash/gtkbuilder/dialog-customer-import-gui.glade +++ b/gnucash/gtkbuilder/dialog-customer-import-gui.glade @@ -88,46 +88,37 @@ 3 0 - + True False - 10 - 5 - 5 - 12 + 3 - + True - False - - - True - True - - - - True - True - 0 - - - - - _Open - True - True - False - True - - - - False - False - end - 1 - - + True + + + True + True + 0 + + + + + _Open + True + True + False + True + + + + False + False + end + 1 + @@ -153,51 +144,45 @@ 0 none - + True False - 12 + start + 3 - + + Customer True - False + True + False + For importing customer lists. start - - - Customer - True - True - False - For importing customer lists. - start - True - - - - False - True - 0 - - - - - Vendor - True - True - False - For importing vendor lists. - start - True - radiobutton_customer - - - - False - True - 1 - - + True + + + False + True + 0 + + + + + Vendor + True + True + False + For importing vendor lists. + start + True + radiobutton_customer + + + + False + True + 1 + @@ -223,105 +208,99 @@ 3 0 - + True False - 12 + 3 + vertical - + + Semicolon separated True - False - vertical - - - Semicolon separated - True - True - False - start - True - True - - - - False - False - 0 - - - - - Comma separated - True - True - False - start - True - True - radiobutton1 - - - - False - False - 1 - - - - - Semicolon separated with quotes - True - True - False - start - True - True - radiobutton1 - - - - False - False - 2 - - - - - Comma separated with quotes - True - True - False - start - True - True - radiobutton1 - - - - False - False - 3 - - - - - Custom regular expression - True - True - False - start - True - True - radiobutton1 - - - - False - False - 4 - - + True + False + start + True + True + + + False + False + 0 + + + + + Comma separated + True + True + False + start + True + True + radiobutton1 + + + + False + False + 1 + + + + + Semicolon separated with quotes + True + True + False + start + True + True + radiobutton1 + + + + False + False + 2 + + + + + Comma separated with quotes + True + True + False + start + True + True + radiobutton1 + + + + False + False + 3 + + + + + Custom regular expression + True + True + False + start + True + True + radiobutton1 + + + + False + False + 4 + @@ -347,29 +326,20 @@ 3 0 - + True - False - 10 - 5 - 5 - 12 + True + True + True + 3 + in - + + 120 True True - True - True - in - - - 120 - True - True - - - - + + diff --git a/gnucash/gtkbuilder/dialog-customer.glade b/gnucash/gtkbuilder/dialog-customer.glade index f138cf7092..e36292ce6f 100644 --- a/gnucash/gtkbuilder/dialog-customer.glade +++ b/gnucash/gtkbuilder/dialog-customer.glade @@ -119,124 +119,92 @@ 3 0 - + True False - 5 - 5 - 5 - 5 - 2 - 6 + 6 + 6 + 3 + 3 + 6 - + True False - vertical - True - - - True - False - end - Customer Number - right - - - False - False - 0 - - - - - True - False - end - Company Name - right - - - False - False - 1 - - - - - Active - True - True - False - start - True - True - True - - - False - False - 2 - - + end + Customer Number + right - False - False - 0 + 0 + 0 - + True False - vertical - True - - - True - True - The customer ID number. If left blank a reasonable number will be chosen for you - True - - - - False - False - 0 - - - - - True - True - True - True - - - - True - False - 1 - - - - - True - False - center - - - False - False - 2 - - + end + Company Name + right - True - True - 1 + 0 + 1 + + + + + True + True + False + start + True + True + + + 1 + 2 + + + + + True + True + True + True + True + + + + 1 + 1 + + + + + True + True + The customer ID number. If left blank a reasonable number will be chosen for you + True + True + + + + 1 + 0 + + + + + True + False + end + Active + + + 0 + 2 @@ -262,250 +230,190 @@ 3 0 - + True False - 5 - 5 - 5 - 5 + 6 + 6 + 3 + 3 + 6 - + True False - 3 - vertical - True - - - True - False - end - Name - right - - - False - False - 0 - - - - - True - False - end - Address - right - - - False - False - 1 - - - - - True - False - center - - - False - False - 2 - - - - - True - False - center - - - False - False - 3 - - - - - True - False - center - - - False - False - 4 - - - - - True - False - end - Phone - right - - - False - False - 5 - - - - - True - False - end - Fax - right - - - False - False - 6 - - - - - True - False - end - Email - right - - - False - False - 7 - - + end + Name + right - False - True - 3 - 0 + 0 + 0 - + True False - 3 - vertical - True - - - True - True - True - - - False - False - 0 - - - - - True - True - True - - - False - False - 1 - - - - - True - True - True - - - - - False - False - 2 - - - - - True - True - True - - - - - False - False - 3 - - - - - True - True - True - - - - - False - False - 4 - - - - - True - True - True - - - False - False - 5 - - - - - True - True - True - - - False - False - 6 - - - - - True - True - True - - - False - False - 7 - - + end + Address + right - True - True - 1 + 0 + 1 + + + True + False + end + Phone + right + + + 0 + 5 + + + + + True + False + end + Fax + right + + + 0 + 6 + + + + + True + False + end + Email + right + + + 0 + 7 + + + + + True + True + True + True + + + 1 + 7 + + + + + True + True + True + True + + + 1 + 6 + + + + + True + True + True + True + + + 1 + 5 + + + + + True + True + True + True + + + + + 1 + 4 + + + + + True + True + True + True + + + + + 1 + 3 + + + + + True + True + True + True + + + + + 1 + 2 + + + + + True + True + True + True + + + 1 + 1 + + + + + True + True + True + True + + + 1 + 0 + + + + + + + + + + + @@ -526,19 +434,17 @@ True False - 3 0 True False - 5 - 5 - 5 - 5 + 6 + 6 + 3 + 3 True True - 3 never in @@ -590,140 +496,123 @@ 3 0 - + True False - 5 - 5 - 5 - 5 - 6 + 6 + 6 + 3 + 3 + 6 - + True False - vertical - True - - - True - False - end - Currency - right - - - False - False - 0 - - - - - True - False - end - Terms - right - - - False - False - 1 - - - - - True - False - end - Discount - right - - - False - False - 2 - - - - - True - False - end - Credit Limit - right - - - False - False - 3 - - - - - True - False - end - Tax Included - right - - - False - False - 4 - - - - - True - False - end - Tax Table - right - - - False - False - 5 - - + end + Currency + right - False - False - 0 + 0 + 0 - + True False - 3 - vertical - True + end + Terms + right + + + 0 + 1 + + + + + True + False + end + Discount + right + + + 0 + 2 + + + + + True + False + end + Credit Limit + right + + + 0 + 3 + + + + + True + False + end + Tax Included + right + + + 0 + 4 + + + + + True + False + end + Tax Table + right + + + 0 + 5 + + + + + True + False + True - + True - False - - - + True + False + Override the global Tax Table? + start + 5 + True + True + - True - True + False + False 0 - + True False - terms_store - + taxtable_store + - + 0 @@ -735,106 +624,90 @@ 1 + + + 1 + 5 + + + + + True + False + True + tax_included_store + - - True - False - - - - - - False - False - 2 - - - - - True - False - - - - - - True - True - 3 - - - - - True - False - tax_included_store - - - - - 0 - - - - - True - True - 4 - - - - - True - False - - - True - True - False - Override the global Tax Table? - start - 5 - True - True - - - - False - False - 0 - - - - - True - False - taxtable_store - - - - - 0 - - - - - True - True - 1 - - - - - True - True - 5 - + + + 0 + - True - True - 1 + 1 + 4 + + + + + True + False + True + + + + + + 1 + 3 + + + + + True + False + True + + + + + + 1 + 0 + + + + + True + False + True + terms_store + + + + + 0 + + + + + 1 + 1 + + + + + True + False + True + + + + + + 1 + 2 @@ -885,251 +758,190 @@ 3 0 - + True False - 5 - 5 - 5 - 5 + 6 + 6 + 3 + 3 + 6 - + True False - 4 - vertical - True - - - True - False - end - Name - right - - - False - False - 0 - - - - - True - False - end - Address - right - - - False - False - 1 - - - - - True - False - center - - - False - False - 2 - - - - - True - False - center - - - False - False - 3 - - - - - True - False - center - - - False - False - 4 - - - - - True - False - end - Phone - right - - - False - False - 5 - - - - - True - False - end - Fax - right - - - False - False - 6 - - - - - True - False - end - Email - right - - - False - False - 7 - - + end + Name + right - False - True - 3 - 0 + 0 + 0 - + True False - 3 - vertical - True - - - True - True - True - - - False - False - 0 - - - - - True - True - True - - - False - False - 1 - - - - - True - True - True - - - - - False - False - 2 - - - - - True - True - True - - - - - False - False - 3 - - - - - True - True - True - - - - - False - False - 4 - - - - - True - True - True - - - False - False - 5 - - - - - True - True - True - - - False - False - 6 - - - - - True - True - True - - - False - False - 7 - - + end + Address + right - True - True - 3 - 1 + 0 + 1 + + + True + False + end + Phone + right + + + 0 + 5 + + + + + True + False + end + Fax + right + + + 0 + 6 + + + + + True + False + end + Email + right + + + 0 + 7 + + + + + True + True + True + True + + + 1 + 7 + + + + + True + True + True + True + + + 1 + 6 + + + + + True + True + True + True + + + 1 + 5 + + + + + True + True + True + True + + + + + 1 + 4 + + + + + True + True + True + True + + + + + 1 + 3 + + + + + True + True + True + True + + + + + 1 + 2 + + + + + True + True + True + True + + + 1 + 1 + + + + + True + True + True + True + + + 1 + 0 + + + + + + + + + + + @@ -1146,12 +958,6 @@ 0 - - - - - - 2 diff --git a/gnucash/gtkbuilder/dialog-date-close.glade b/gnucash/gtkbuilder/dialog-date-close.glade index 7e4c41d43e..d2155297ed 100644 --- a/gnucash/gtkbuilder/dialog-date-close.glade +++ b/gnucash/gtkbuilder/dialog-date-close.glade @@ -76,6 +76,7 @@ True False dialog-question + 3 False @@ -103,204 +104,144 @@ - + True False - 3 + 3 + 6 - + True False - center + end + postd + right - False - False - 0 + 0 + 0 - + True False - vertical - True - - - True - False - end - postd - right - - - False - False - 0 - - - - - True - False - end - duedate - right - - - False - False - 1 - - - - - True - False - end - Description - right - - - False - False - 2 - - - - - True - False - end - acct - right - - - False - False - 3 - - - - - True - False - - - False - False - 4 - - + end + duedate + right - False - False - 3 - 1 + 0 + 1 - + True False - vertical - True - - - True - False - - - - - - False - False - 0 - - - - - True - False - - - - - - False - False - 1 - - - - - True - True - ● - False - False - - - False - False - 2 - - - - - True - False - - - - - - False - False - 3 - - - - - question - True - True - False - start - True - True - - - False - False - 4 - - + end + Description + right - True - True - 3 - 2 + 0 + 2 - + True False - center + end + acct + right - False - False - 3 + 0 + 3 + + + True + True + True + ● + False + False + + + 1 + 2 + + + + + question + True + True + False + start + True + True + True + + + 1 + 4 + + + + + True + False + start + True + + + + + + 1 + 0 + + + + + True + False + start + True + + + + + + 1 + 1 + + + + + True + False + start + True + + + + + + 1 + 3 + + + + + - True + False True 1 @@ -394,6 +335,7 @@ True False dialog-question + 3 False @@ -424,20 +366,9 @@ True False + center start 3 - - - True - False - center - - - True - True - 0 - - True @@ -448,7 +379,7 @@ False True 3 - 1 + 0 @@ -463,19 +394,7 @@ False True 3 - 2 - - - - - True - False - center - - - True - True - 3 + 1 diff --git a/gnucash/gtkbuilder/dialog-employee.glade b/gnucash/gtkbuilder/dialog-employee.glade index 03f75b8404..58c59d19bc 100644 --- a/gnucash/gtkbuilder/dialog-employee.glade +++ b/gnucash/gtkbuilder/dialog-employee.glade @@ -95,131 +95,100 @@ 3 0 - + True False - 5 - 5 - 5 - 5 - 2 - 6 + 6 + 6 + 3 + 3 + 6 - + True False - vertical - True - - - True - False - end - Employee Number - right - - - False - False - 0 - - - - - True - False - end - Username - right - - - False - False - 1 - - - - - Active - True - True - False - start - True - True - True - - - False - False - 2 - - + end + Employee Number + right - False - False - 0 + 0 + 0 - + True False - vertical - True - - - True - True - True - The employee ID number. If left blank a reasonable number will be chosen for you - The employee ID number. If left blank a reasonable number will be chosen for you - ● - True - False - False - - - - False - False - 0 - - - - - True - True - ● - True - False - False - - - - True - False - 1 - - - - - True - False - center - - - False - False - 2 - - + end + Username + right - True - True - 1 + 0 + 1 + + + + + True + True + False + start + True + True + True + + + 1 + 2 + + + + + True + True + True + ● + True + False + False + + + + 1 + 1 + + + + + True + True + True + The employee ID number. If left blank a reasonable number will be chosen for you + The employee ID number. If left blank a reasonable number will be chosen for you + True + ● + True + False + False + + + + 1 + 0 + + + + + True + False + end + Active + + + 0 + 2 @@ -245,268 +214,208 @@ 3 0 - + True False - 5 - 5 - 5 - 5 + 6 + 6 + 3 + 3 + 6 - + True False - 3 - vertical - True - - - True - False - end - Name - right - - - False - False - 0 - - - - - True - False - end - Address - right - - - False - False - 1 - - - - - True - False - center - - - False - False - 2 - - - - - True - False - center - - - False - False - 3 - - - - - True - False - center - - - False - False - 4 - - - - - True - False - end - Phone - right - - - False - False - 5 - - - - - True - False - end - Fax - right - - - False - False - 6 - - - - - True - False - end - Email - right - - - False - False - 7 - - + end + Name + right - False - True - 3 - 0 + 0 + 0 - + True False - 3 - vertical - True - - - True - True - ● - True - False - False - - - False - False - 0 - - - - - True - True - ● - True - False - False - - - False - False - 1 - - - - - True - True - ● - True - False - False - - - False - False - 2 - - - - - True - True - ● - True - False - False - - - False - False - 3 - - - - - True - True - ● - True - False - False - - - False - False - 4 - - - - - True - True - ● - True - False - False - - - False - False - 5 - - - - - True - True - ● - True - False - False - - - False - False - 6 - - - - - True - True - ● - True - False - False - - - False - False - 7 - - + end + Address + right - True - True - 1 + 0 + 1 + + + True + False + end + Phone + right + + + 0 + 5 + + + + + True + False + end + Fax + right + + + 0 + 6 + + + + + True + False + end + Email + right + + + 0 + 7 + + + + + True + True + True + ● + True + False + False + + + 1 + 7 + + + + + True + True + True + ● + True + False + False + + + 1 + 6 + + + + + True + True + True + ● + True + False + False + + + 1 + 5 + + + + + True + True + True + ● + True + False + False + + + 1 + 4 + + + + + True + True + True + ● + True + False + False + + + 1 + 3 + + + + + True + True + True + ● + True + False + False + + + 1 + 2 + + + + + True + True + True + ● + True + False + False + + + 1 + 1 + + + + + True + True + True + ● + True + False + False + + + 1 + 0 + + + + + + + + + + + @@ -527,7 +436,6 @@ True False - 3 0 @@ -538,11 +446,10 @@ True False - 5 - 5 - 5 - 5 - 2 + 6 + 6 + 3 + 3 6 @@ -622,191 +529,150 @@ 3 0 - + True False - 5 - 5 - 5 - 5 - 2 - vertical - 2 - True + 6 + 6 + 3 + 3 + 6 - + True False - 6 + True - - True - False - Default Hours per Day - center - - - False - False - 0 - - - - - True - False - True - - - - - - False - True - 1 - + - True - True - 0 + 1 + 2 - + True False - 6 + True - - True - False - Default Rate - center - - - False - False - 0 - - - - - True - False - True - - - - - - False - True - 1 - + - True - True - 1 + 1 + 1 - + True False - 6 + True - - True - False - Currency - right - - - False - False - 0 - - - - - True - False - - - - - - True - True - 1 - + - True - True - 2 + 1 + 0 - + True False - 6 - - - True - False - Credit Account - right - - - False - False - 0 - - - - - True - True - False - start - 5 - True - True - - - - False - False - 2 - 1 - - + end + Default Hours per Day + center + + + 0 + 0 + + + + + True + False + end + Default Rate + center + + + 0 + 1 + + + + + True + False + end + Currency + right + + + 0 + 2 + + + + + True + False + end + Credit Account + right + + + 0 + 3 + + + + + True + False + True + 5 True False + True - + + True + True + False + start + True + True + + + + False + False + 2 + 0 + - True + False True - 2 + 0 + + + - True - True - 3 + 1 + 3 diff --git a/gnucash/gtkbuilder/dialog-file-access.glade b/gnucash/gtkbuilder/dialog-file-access.glade index 91b773d750..de0a045bd3 100644 --- a/gnucash/gtkbuilder/dialog-file-access.glade +++ b/gnucash/gtkbuilder/dialog-file-access.glade @@ -66,7 +66,8 @@ True False - 3 + center + 6 True @@ -154,149 +155,123 @@ True False + center 0 in - + True False 6 - 3 + 3 + 6 - + True False - vertical - - - True - False - Host - right - - - True - True - 0 - - - - - True - False - Database - right - - - True - True - 1 - - - - - True - False - Username - right - - - True - True - 2 - - - - - True - False - Password - right - - - True - True - 3 - - + end + Host + right - False - True - 0 + 0 + 0 - + True False - vertical - - - True - True - ● - True - False - False - - - True - True - 0 - - - - - True - True - ● - True - False - False - - - True - True - 1 - - - - - True - True - ● - True - False - False - - - True - True - 2 - - - - - True - True - False - ● - True - False - False - - - True - True - 3 - - + end + Database + right - True - True - 1 + 0 + 1 + + + + + True + False + end + Username + right + + + 0 + 2 + + + + + True + False + end + Password + right + + + 0 + 3 + + + + + True + True + False + ● + True + False + False + + + 1 + 3 + + + + + True + True + ● + True + False + False + + + 1 + 2 + + + + + True + True + ● + True + False + False + + + 1 + 1 + + + + + True + True + ● + True + False + False + + + 1 + 0 diff --git a/gnucash/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade index 4bb2cb6833..a3dfddbc38 100644 --- a/gnucash/gtkbuilder/dialog-fincalc.glade +++ b/gnucash/gtkbuilder/dialog-fincalc.glade @@ -181,363 +181,289 @@ - + True False - 12 + 3 + 6 - + + True + False + start + Payment periods + True + + + 0 + 0 + 2 + + + + + True + False + start + Interest rate + + + 0 + 2 + 2 + + + + + True + False + start + Present value + + + 0 + 4 + 2 + + + + + True + False + start + Periodic payment + + + 0 + 6 + 2 + + + + + True + False + start + Future value + + + 0 + 8 + 2 + + + + + Clear + True + True + False + Clear the entry. + True + + + + 1 + 1 + + + + + Clear + True + True + False + Clear the entry. + True + + + + 1 + 3 + + + + + Clear + True + True + False + Clear the entry. + True + + + + 1 + 5 + + + + + Clear + True + True + False + Clear the entry. + True + + + + 1 + 7 + + + + + Clear + True + True + False + Clear the entry. + True + + + + 1 + 9 + + + + + True + False + Precision + + + 0 + 11 + 2 + + + + + True + True + number + 1 + True + 1 + + + + 0 + 12 + 2 + + + + True False - vertical - 6 - + + Calculate True - False - vertical - - - True - False - start - Payment periods - True - - - False - False - 0 - - - - - True - False - 6 - - - Clear - True - True - False - Clear the entry. - True - - - - False - False - end - 1 - - - - - False - True - 1 - - + False + True + True + False + Recalculate the (single) blank entry in the above fields. + False - True + False 0 + + + 0 + 14 + 2 + + + + + True + False + 6 - - True - False - vertical - - - True - False - start - Interest rate - - - False - False - 0 - - - - - True - False - 6 - - - Clear - True - True - False - Clear the entry. - True - - - - False - False - end - 1 - - - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - vertical - - - True - False - start - Present value - - - False - False - 0 - - - - - True - False - 6 - - - Clear - True - True - False - Clear the entry. - True - - - - False - False - end - 1 - - - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - vertical - - - True - False - start - Periodic payment - - - False - False - 0 - - - - - True - False - 6 - - - Clear - True - True - False - Clear the entry. - True - - - - False - False - end - 1 - - - - - False - True - 1 - - - - - False - True - 3 - - - - - True - False - vertical - - - True - False - start - Future value - - - False - False - 0 - - - - - True - False - 6 - - - Clear - True - True - False - Clear the entry. - True - - - - False - False - end - 1 - - - - - False - True - 1 - - - - - False - True - 4 - - - - - True - False - vertical - - - True - False - Precision - - - False - True - 0 - - - - - True - True - number - 1 - True - 1 - - - - False - True - 1 - - - - - False - True - 5 - - - - - True - False - 6 - - - True - False - - - Calculate - True - False - True - True - False - Recalculate the (single) blank entry in the above fields. - - - - False - False - 0 - - - - - - - False - True - 6 - + + + 0 + 1 + + + + + True + False + 6 + + + + + + 0 + 3 + + + + + True + False + 6 + + + + + + 0 + 5 + + + + + True + False + 6 + + + + + + 0 + 7 + + + + + True + False + 6 + + + + + + 0 + 9 + + + + + + + + + + + + + @@ -587,357 +513,333 @@ - + True False - 12 + 3 + 6 - + True False - 12 + start + Payment Total + center + + + 0 + 12 + + + + + True + False + + + 0 + 3 + + + + + True + False + + + 0 + 7 + + + + + Discrete + True + True + False + start + True + True + True + + + + 1 + 1 + + + + + Continuous + True + True + False + start + True + True + discrete_compounding_radio + + + 2 + 1 + + + + + Beginning + True + True + False + start + True + True + + + 1 + 5 + + + + + End + True + True + False + start + True + True + True + radiobutton4 + + + + 2 + 5 + + + + + True + False + start + <b>Compounding</b> + True + right + + + 0 + 0 + 3 + + + + + True + False + start + <b>Period</b> + True + + + 0 + 4 + 3 + + + + + True + False + liststore2 - - True - False - start - Payment Total - center - - - 0 - 12 - + + + 0 + + + + 1 + 6 + 2 + + + + + True + False + liststore1 + + + + 0 + + + + + 1 + 2 + 2 + + + + + True + False + + + 0 + 8 + + + + + True + False + + + 0 + 9 + + + + + True + False + + + 0 + 10 + + + + + True + False + + + 0 + 11 + + + + + True + False + start + Type + + + 0 + 1 + + + + + True + False + start + Frequency + True + + + 0 + 2 + + + + + True + False + start + Frequency + True + + + 0 + 6 + + + + + True + False + start + When paid + + + 0 + 5 + + + + + True + False True False + center + 3 + 3 + 3 + 3 + True total center - 1 - 12 - 2 + False + True + 0 - - - True - False - - - 0 - 3 - - - - - True - False - - - 0 - 7 - - - - - Discrete - True - True - False - start - True - True - True - - - - 1 - 1 - - - - - Continuous - True - True - False - start - True - True - discrete_compounding_radio - - - 2 - 1 - - - - - True - False - 12 - - - True - False - start - Type - - - - - 0 - 1 - - - - - True - False - 12 - - - True - False - start - Frequency - True - - - - - 0 - 2 - - - - - True - False - 12 - - - True - False - start - Frequency - True - - - - - 0 - 6 - - - - - True - False - 12 - - - True - False - start - When paid - - - - - 0 - 5 - - - - - Beginning - True - True - False - start - True - True - - - 1 - 5 - - - - - End - True - True - False - start - True - True - True - radiobutton4 - - - - 2 - 5 - - - - - True - False - start - <b>Compounding:</b> - True - right - - - 0 - 0 - - - - - True - False - start - <b>Period:</b> - True - - - 0 - 4 - - - - - True - False - liststore2 - - - - 0 - - - - - 1 - 6 - 2 - - - - - True - False - liststore1 - - - - 0 - - - - - 1 - 2 - 2 - - - - - True - False - - - 0 - 8 - - - - - True - False - - - 0 - 9 - - - - - True - False - - - 0 - 10 - - - - - True - False - - - 0 - 11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 1 + 12 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade index 9099cefbb9..458a316de1 100644 --- a/gnucash/gtkbuilder/dialog-import.glade +++ b/gnucash/gtkbuilder/dialog-import.glade @@ -334,6 +334,8 @@ True False + 3 + 6 Enable skip transaction action @@ -802,8 +804,8 @@ True False - 6 - 12 + 3 + 6 True @@ -1315,9 +1317,9 @@ + matcher__help matcher_cancel matcher_ok - matcher__help diff --git a/gnucash/gtkbuilder/dialog-invoice.glade b/gnucash/gtkbuilder/dialog-invoice.glade index 4dd330b1f9..05c1609c06 100644 --- a/gnucash/gtkbuilder/dialog-invoice.glade +++ b/gnucash/gtkbuilder/dialog-invoice.glade @@ -13,6 +13,8 @@ True False + 3 + 3 True vertical @@ -21,6 +23,7 @@ False start False + 3 True @@ -31,7 +34,7 @@ True False 6 - 6 + 3 6 @@ -137,18 +140,6 @@ 4 - - - True - False - start - Invoice - - - 1 - 0 - - True @@ -201,6 +192,36 @@ 5 + + + True + False + + + True + False + start + 3 + 3 + 3 + 3 + Invoice + + + False + True + 0 + + + + + + 1 + 0 + + @@ -230,7 +251,7 @@ True False 6 - 6 + 3 6 @@ -743,9 +764,28 @@ True False - + + True False - Invoice + + + False + start + 3 + 3 + 3 + 3 + Invoice + + + False + True + 0 + + + True @@ -830,7 +870,7 @@ True False 6 - 6 + 3 6 @@ -968,7 +1008,7 @@ True False 6 - 6 + 3 6