diff --git a/src/app-utils/gnc-accounting-period.c b/src/app-utils/gnc-accounting-period.c index 5f5474c146..1b72fd22f2 100644 --- a/src/app-utils/gnc-accounting-period.c +++ b/src/app-utils/gnc-accounting-period.c @@ -50,17 +50,6 @@ #include "qof.h" #include "gnc-ui-util.h" -/* TODO: This should probably be changed eventually. */ -#define GNC_PREFS_GROUP "window.pages.account_tree.summary" -#define GNC_PREF_START_CHOICE_ABS "start_choice-absolute" -#define GNC_PREF_START_CHOICE_REL "start_choice-relative" -#define GNC_PREF_START_DATE "start_date" -#define GNC_PREF_START_PERIOD "start_period" -#define GNC_PREF_END_CHOICE_ABS "end_choice-absolute" -#define GNC_PREF_END_CHOICE_REL "end_choice-relative" -#define GNC_PREF_END_DATE "end_date" -#define GNC_PREF_END_PERIOD "end_period" - static time64 gnc_accounting_period_start_time64 (GncAccountingPeriod which, const GDate *fy_end, const GDate *contains); @@ -76,15 +65,15 @@ lookup_start_date_option(GDate *fy_end) int which; - if (gnc_prefs_get_bool (GNC_PREFS_GROUP, GNC_PREF_START_CHOICE_ABS)) + if (gnc_prefs_get_bool (GNC_PREFS_GROUP_ACCT_SUMMARY, GNC_PREF_START_CHOICE_ABS)) { - GVariant *var = gnc_prefs_get_value(GNC_PREFS_GROUP, GNC_PREF_START_DATE); + GVariant *var = gnc_prefs_get_value(GNC_PREFS_GROUP_ACCT_SUMMARY, GNC_PREF_START_DATE); time = g_variant_get_int64 (var); g_variant_unref (var); } else { - which = gnc_prefs_get_int(GNC_PREFS_GROUP, GNC_PREF_START_PERIOD); + which = gnc_prefs_get_int(GNC_PREFS_GROUP_ACCT_SUMMARY, GNC_PREF_START_PERIOD); time = gnc_accounting_period_start_time64(which, fy_end, NULL); } /* we will need the balance of the last transaction before the start @@ -100,16 +89,16 @@ lookup_end_date_option(GDate *fy_end) time64 time; int which; - if (gnc_prefs_get_bool (GNC_PREFS_GROUP, GNC_PREF_END_CHOICE_ABS)) + if (gnc_prefs_get_bool (GNC_PREFS_GROUP_ACCT_SUMMARY, GNC_PREF_END_CHOICE_ABS)) { - GVariant *var = gnc_prefs_get_value(GNC_PREFS_GROUP, GNC_PREF_END_DATE); + GVariant *var = gnc_prefs_get_value(GNC_PREFS_GROUP_ACCT_SUMMARY, GNC_PREF_END_DATE); time = g_variant_get_int64 (var); time = gnc_time64_get_day_end(time); g_variant_unref (var); } else { - which = gnc_prefs_get_int(GNC_PREFS_GROUP, GNC_PREF_END_PERIOD); + which = gnc_prefs_get_int(GNC_PREFS_GROUP_ACCT_SUMMARY, GNC_PREF_END_PERIOD); time = gnc_accounting_period_end_time64(which, fy_end, NULL); } if (time == 0) diff --git a/src/app-utils/gnc-prefs-utils.c b/src/app-utils/gnc-prefs-utils.c index ee6ae2c930..1f5466eafa 100644 --- a/src/app-utils/gnc-prefs-utils.c +++ b/src/app-utils/gnc-prefs-utils.c @@ -31,11 +31,11 @@ static QofLogModule log_module = G_LOG_DOMAIN; /* Keys used for core preferences */ -#define GNC_PREF_FILE_COMPRESSION "file_compression" -#define GNC_PREF_RETAIN_TYPE_NEVER "retain_type-never" -#define GNC_PREF_RETAIN_TYPE_DAYS "retain_type-days" -#define GNC_PREF_RETAIN_TYPE_FOREVER "retain_type-forever" -#define GNC_PREF_RETAIN_DAYS "retain_days" +#define GNC_PREF_FILE_COMPRESSION "file-compression" +#define GNC_PREF_RETAIN_TYPE_NEVER "retain-type-never" +#define GNC_PREF_RETAIN_TYPE_DAYS "retain-type-days" +#define GNC_PREF_RETAIN_TYPE_FOREVER "retain-type-forever" +#define GNC_PREF_RETAIN_DAYS "retain-days" /*************************************************************** * Initialization * diff --git a/src/app-utils/gnc-ui-util.c b/src/app-utils/gnc-ui-util.c index 8a6a357372..667532bdfc 100644 --- a/src/app-utils/gnc-ui-util.c +++ b/src/app-utils/gnc-ui-util.c @@ -58,12 +58,12 @@ #include "gnc-features.h" #include "gnc-guile-utils.h" -#define GNC_PREF_CURRENCY_CHOICE_LOCALE "currency_choice-locale" -#define GNC_PREF_CURRENCY_CHOICE_OTHER "currency_choice-other" -#define GNC_PREF_CURRENCY_OTHER "currency_other" -#define GNC_PREF_REVERSED_ACCTS_NONE "reversed_accounts-none" -#define GNC_PREF_REVERSED_ACCTS_CREDIT "reversed_accounts-credit" -#define GNC_PREF_REVERSED_ACCTS_INC_EXP "reversed_accounts-incomeexpense" +#define GNC_PREF_CURRENCY_CHOICE_LOCALE "currency-choice-locale" +#define GNC_PREF_CURRENCY_CHOICE_OTHER "currency-choice-other" +#define GNC_PREF_CURRENCY_OTHER "currency-other" +#define GNC_PREF_REVERSED_ACCTS_NONE "reversed-accounts-none" +#define GNC_PREF_REVERSED_ACCTS_CREDIT "reversed-accounts-credit" +#define GNC_PREF_REVERSED_ACCTS_INC_EXP "reversed-accounts-incomeexpense" static QofLogModule log_module = GNC_MOD_GUI; diff --git a/src/app-utils/gnc-ui-util.h b/src/app-utils/gnc-ui-util.h index e404dea88a..281ffc69e5 100644 --- a/src/app-utils/gnc-ui-util.h +++ b/src/app-utils/gnc-ui-util.h @@ -47,11 +47,11 @@ gchar *gnc_normalize_account_separator (const gchar* separator); gboolean gnc_reverse_balance(const Account *account); /* Default directory sections ***************************************/ -#define GNC_PREFS_GROUP_OPEN_SAVE "dialogs.open_save" -#define GNC_PREFS_GROUP_EXPORT "dialogs.export_accounts" +#define GNC_PREFS_GROUP_OPEN_SAVE "dialogs.open-save" +#define GNC_PREFS_GROUP_EXPORT "dialogs.export-accounts" #define GNC_PREFS_GROUP_REPORT "dialogs.report" -#define GNC_PREF_AUTO_DECIMAL_POINT "auto_decimal_point" -#define GNC_PREF_AUTO_DECIMAL_PLACES "auto_decimal_places" +#define GNC_PREF_AUTO_DECIMAL_POINT "auto-decimal-point" +#define GNC_PREF_AUTO_DECIMAL_PLACES "auto-decimal-places" /* Default directories **********************************************/ diff --git a/src/business/business-gnome/dialog-customer.c b/src/business/business-gnome/dialog-customer.c index 2d0387c227..33960c446e 100644 --- a/src/business/business-gnome/dialog-customer.c +++ b/src/business/business-gnome/dialog-customer.c @@ -55,7 +55,7 @@ #define DIALOG_NEW_CUSTOMER_CM_CLASS "dialog-new-customer" #define DIALOG_EDIT_CUSTOMER_CM_CLASS "dialog-edit-customer" -#define GNC_PREFS_GROUP_SEARCH "dialogs.business.customer_search" +#define GNC_PREFS_GROUP_SEARCH "dialogs.business.customer-search" void gnc_customer_taxtable_check_cb (GtkToggleButton *togglebutton, gpointer user_data); diff --git a/src/business/business-gnome/dialog-employee.c b/src/business/business-gnome/dialog-employee.c index 28d2fa1d72..3d4ec7f1a6 100644 --- a/src/business/business-gnome/dialog-employee.c +++ b/src/business/business-gnome/dialog-employee.c @@ -50,7 +50,7 @@ #define DIALOG_NEW_EMPLOYEE_CM_CLASS "dialog-new-employee" #define DIALOG_EDIT_EMPLOYEE_CM_CLASS "dialog-edit-employee" -#define GNC_PREFS_GROUP_SEARCH "dialogs.business.employee_search" +#define GNC_PREFS_GROUP_SEARCH "dialogs.business.employee-search" void gnc_employee_window_ok_cb (GtkWidget *widget, gpointer data); void gnc_employee_window_cancel_cb (GtkWidget *widget, gpointer data); diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c index 7c4acb95a1..e4fa13a86d 100644 --- a/src/business/business-gnome/dialog-invoice.c +++ b/src/business/business-gnome/dialog-invoice.c @@ -85,10 +85,10 @@ #define DIALOG_NEW_INVOICE_CM_CLASS "dialog-new-invoice" #define DIALOG_VIEW_INVOICE_CM_CLASS "dialog-view-invoice" -#define GNC_PREFS_GROUP_SEARCH "dialogs.business.invoice_search" -#define GNC_PREF_NOTIFY_WHEN_DUE "notify_when_due" -#define GNC_PREF_ACCUM_SPLITS "accumulate_splits" -#define GNC_PREF_DAYS_IN_ADVANCE "days_in_advance" +#define GNC_PREFS_GROUP_SEARCH "dialogs.business.invoice-search" +#define GNC_PREF_NOTIFY_WHEN_DUE "notify-when-due" +#define GNC_PREF_ACCUM_SPLITS "accumulate-splits" +#define GNC_PREF_DAYS_IN_ADVANCE "days-in-advance" #define LAST_POSTED_TO_ACCT "last-posted-to-acct" diff --git a/src/business/business-gnome/dialog-job.c b/src/business/business-gnome/dialog-job.c index 9fd5f1447a..ccbd0f8493 100644 --- a/src/business/business-gnome/dialog-job.c +++ b/src/business/business-gnome/dialog-job.c @@ -46,7 +46,7 @@ #define DIALOG_NEW_JOB_CM_CLASS "dialog-new-job" #define DIALOG_EDIT_JOB_CM_CLASS "dialog-edit-job" -#define GNC_PREFS_GROUP_SEARCH "dialogs.business.job_search" +#define GNC_PREFS_GROUP_SEARCH "dialogs.business.job-search" void gnc_job_window_ok_cb (GtkWidget *widget, gpointer data); void gnc_job_window_cancel_cb (GtkWidget *widget, gpointer data); diff --git a/src/business/business-gnome/dialog-order.c b/src/business/business-gnome/dialog-order.c index 4a0848cddc..6dd1e84f17 100644 --- a/src/business/business-gnome/dialog-order.c +++ b/src/business/business-gnome/dialog-order.c @@ -52,7 +52,7 @@ #define DIALOG_EDIT_ORDER_CM_CLASS "dialog-edit-order" #define DIALOG_VIEW_ORDER_CM_CLASS "dialog-view-order" -#define GNC_PREFS_GROUP_SEARCH "dialogs.business.order_search" +#define GNC_PREFS_GROUP_SEARCH "dialogs.business.order-search" void gnc_order_window_ok_cb (GtkWidget *widget, gpointer data); void gnc_order_window_cancel_cb (GtkWidget *widget, gpointer data); diff --git a/src/business/business-gnome/dialog-vendor.c b/src/business/business-gnome/dialog-vendor.c index 537c593ff6..503085ef49 100644 --- a/src/business/business-gnome/dialog-vendor.c +++ b/src/business/business-gnome/dialog-vendor.c @@ -50,7 +50,7 @@ #define DIALOG_NEW_VENDOR_CM_CLASS "dialog-new-vendor" #define DIALOG_EDIT_VENDOR_CM_CLASS "dialog-edit-vendor" -#define GNC_PREFS_GROUP_SEARCH "dialogs.business.vendor_search" +#define GNC_PREFS_GROUP_SEARCH "dialogs.business.vendor-search" void gnc_vendor_taxtable_check_cb (GtkToggleButton *togglebutton, gpointer user_data); void gnc_vendor_window_ok_cb (GtkWidget *widget, gpointer data); diff --git a/src/business/business-gnome/gnc-plugin-business.c b/src/business/business-gnome/gnc-plugin-business.c index 0bed8b3acc..4531c94db5 100644 --- a/src/business/business-gnome/gnc-plugin-business.c +++ b/src/business/business-gnome/gnc-plugin-business.c @@ -132,8 +132,8 @@ static void update_inactive_actions(GncPluginPage *page); #define PLUGIN_ACTIONS_NAME "gnc-plugin-business-actions" #define PLUGIN_UI_FILENAME "gnc-plugin-business-ui.xml" -#define GNC_PREF_EXTRA_TOOLBUTTONS "enable_toolbuttons" -#define GNC_PREF_INV_PRINT_RPT "invoice_printreport" +#define GNC_PREF_EXTRA_TOOLBUTTONS "enable-toolbuttons" +#define GNC_PREF_INV_PRINT_RPT "invoice-printreport" /** This variable maintains a pointer to the last window where a * Business command was executed. It is used to determine where new diff --git a/src/business/business-gnome/gschemas/Makefile.am b/src/business/business-gnome/gschemas/Makefile.am index c61d53d8b8..4ea9b46c88 100644 --- a/src/business/business-gnome/gschemas/Makefile.am +++ b/src/business/business-gnome/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in b/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in index a12077fab1..1b271ab595 100644 --- a/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in +++ b/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in @@ -1,17 +1,17 @@ - - - - - - - + + + + + + + - + - + (-1,-1,-1,-1) Last window position and size @@ -19,14 +19,14 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched. - + (-1,-1,-1,-1) Last window position and size @@ -34,14 +34,14 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched. - + (-1,-1,-1,-1) Last window position and size @@ -49,14 +49,14 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched. - + (-1,-1,-1,-1) Last window position and size @@ -64,14 +64,14 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched. - + (-1,-1,-1,-1) Last window position and size @@ -79,14 +79,14 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched. - + (-1,-1,-1,-1) Last window position and size @@ -94,59 +94,59 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched. - - + + true Is tax included in this type of business entry? If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors. - + false Enable extra toolbar buttons for business If active, extra toolbar buttons for common business functions are shown as well. Otherwise they are not shown. - + 0 The invoice report to be used for printing The name of the report to be used for invoice printing. - + false Open new invoice in new window If active, each new invoice will be opened in a new window. Otherwise a new invoice will be opened as a tab in the main window. - + true Accumulate multiple splits into one If this field is active then multiple entries in an invoice that transfer to the same account will be accumulated into a single split. This field can be overridden per invoice in the Posting dialog. - - + + true Is tax included in this type of business entry? If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors. - + true Show bills due reminder at startup If active, at startup GnuCash will check to see whether any bills will become due soon. If so, it will present the user with a reminder dialog. The definition of "soon" is controlled by the "Days in Advance" setting. Otherwise GnuCash does not check for due bills. - + 7.0 Show bills due within this many days This field defines the number of days in advance that GnuCash will check for due bills. Its value is only used if the "Notify when due" setting is active. - + (-1,-1,-1,-1) Last window position and size diff --git a/src/business/business-gnome/gtkbuilder/business-prefs.glade b/src/business/business-gnome/gtkbuilder/business-prefs.glade index ece87c66ae..c997254e90 100644 --- a/src/business/business-gnome/gtkbuilder/business-prefs.glade +++ b/src/business/business-gnome/gtkbuilder/business-prefs.glade @@ -44,7 +44,7 @@ - + Ta_x included True True @@ -65,7 +65,7 @@ - + True True True @@ -97,7 +97,7 @@ 0 _Days in advance: True - pref/dialogs.business.bill/days_in_advance + pref/dialogs.business.bill/days-in-advance 2 @@ -109,7 +109,7 @@ - + _Notify when due True True @@ -160,7 +160,7 @@ - + _Tax included True True @@ -182,7 +182,7 @@ - + _Accumulate splits on post True True @@ -204,7 +204,7 @@ - + _Open in new window True True @@ -240,7 +240,7 @@ - + Enable extra _buttons True True @@ -262,7 +262,7 @@ - + True False True diff --git a/src/business/business-ledger/gncEntryLedgerLoad.c b/src/business/business-ledger/gncEntryLedgerLoad.c index f7a424d470..14e1785947 100644 --- a/src/business/business-ledger/gncEntryLedgerLoad.c +++ b/src/business/business-ledger/gncEntryLedgerLoad.c @@ -42,7 +42,7 @@ #include "quickfillcell.h" #include "app-utils/gnc-entry-quickfill.h" -#define GNC_PREF_TAX_INCL "tax_included" +#define GNC_PREF_TAX_INCL "tax-included" /* XXX: This should go elsewhere */ const char * gnc_entry_ledger_type_string_getter (char flag) diff --git a/src/core-utils/gnc-prefs.h b/src/core-utils/gnc-prefs.h index eb916a98ef..dd925501e9 100644 --- a/src/core-utils/gnc-prefs.h +++ b/src/core-utils/gnc-prefs.h @@ -54,27 +54,41 @@ #define GNC_PREFS_GROUP_WARNINGS "general.warnings" #define GNC_PREFS_GROUP_WARNINGS_TEMP "warnings.temporary" #define GNC_PREFS_GROUP_WARNINGS_PERM "warnings.permanent" +#define GNC_PREFS_GROUP_ACCT_SUMMARY "window.pages.account-tree.summary" /* Preference names used across multiple modules */ -#define GNC_PREF_SAVE_GEOMETRY "save_window_geometry" -#define GNC_PREF_LAST_PATH "last_path" -#define GNC_PREF_USE_NEW "use_new_window" -#define GNC_PREF_ACCOUNTING_LABELS "use_accounting_labels" -#define GNC_PREF_ACCOUNT_SEPARATOR "account_separator" -#define GNC_PREF_NEGATIVE_IN_RED "negative_in_red" -#define GNC_PREF_NUM_SOURCE "num_source" -#define GNC_PREF_DATE_FORMAT "date_format" -#define GNC_PREF_DATE_COMPL_THISYEAR "date_completion-thisyear" -#define GNC_PREF_DATE_COMPL_SLIDING "date_completion-sliding" -#define GNC_PREF_DATE_BACKMONTHS "date_backmonths" -#define GNC_PREF_SHOW_LEAF_ACCT_NAMES "show_leaf_account_names" -#define GNC_PREF_ENTER_MOVES_TO_END "enter_moves_to_end" +#define GNC_PREF_SAVE_GEOMETRY "save-window-geometry" +#define GNC_PREF_LAST_PATH "last-path" +#define GNC_PREF_USE_NEW "use-new-window" +#define GNC_PREF_ACCOUNTING_LABELS "use-accounting-labels" +#define GNC_PREF_ACCOUNT_SEPARATOR "account-separator" +#define GNC_PREF_NEGATIVE_IN_RED "negative-in-red" +#define GNC_PREF_NUM_SOURCE "num-source" +#define GNC_PREF_DATE_FORMAT "date-format" +#define GNC_PREF_DATE_COMPL_THISYEAR "date-completion-thisyear" +#define GNC_PREF_DATE_COMPL_SLIDING "date-completion-sliding" +#define GNC_PREF_DATE_BACKMONTHS "date-backmonths" +#define GNC_PREF_SHOW_LEAF_ACCT_NAMES "show-leaf-account-names" +#define GNC_PREF_ENTER_MOVES_TO_END "enter-moves-to-end" /* Register preferences */ -#define GNC_PREF_DRAW_HOR_LINES "draw_horizontal_lines" -#define GNC_PREF_DRAW_VERT_LINES "draw_vertical_lines" -#define GNC_PREF_ALT_COLOR_BY_TRANS "alternate_color_by_transaction" -#define GNC_PREF_USE_THEME_COLORS "use_theme_colors" -#define GNC_PREF_TAB_TRANS_MEMORISED "tab_includes_transfer_on_memorised" +#define GNC_PREF_DRAW_HOR_LINES "draw-horizontal-lines" +#define GNC_PREF_DRAW_VERT_LINES "draw-vertical-lines" +#define GNC_PREF_ALT_COLOR_BY_TRANS "alternate-color-by-transaction" +#define GNC_PREF_USE_THEME_COLORS "use-theme-colors" +#define GNC_PREF_TAB_TRANS_MEMORISED "tab-includes-transfer-on-memorised" +/* Date preferences */ +#define GNC_PREF_START_CHOICE_ABS "start-choice-absolute" +#define GNC_PREF_START_CHOICE_REL "start-choice-relative" +#define GNC_PREF_START_DATE "start-date" +#define GNC_PREF_START_PERIOD "start-period" +#define GNC_PREF_END_CHOICE_ABS "end-choice-absolute" +#define GNC_PREF_END_CHOICE_REL "end-choice-relative" +#define GNC_PREF_END_DATE "end-date" +#define GNC_PREF_END_PERIOD "end-period" +/* Currency preferences */ +#define GNC_PREF_CURRENCY_OTHER "currency-other" +#define GNC_PREF_CURRENCY_CHOICE_LOCALE "currency-choice-locale" +#define GNC_PREF_CURRENCY_CHOICE_OTHER "currency-choice-other" /** @name Early bird functions, needed before any backend has been set up @{ diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index e3bb4d5f01..0255a36d5f 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -51,8 +51,8 @@ static QofLogModule log_module = G_LOG_DOMAIN; #define DIALOG_SEARCH_CM_CLASS "dialog-search" #define GNC_PREFS_GROUP_SEARCH_GENERAL "dialogs.search" -#define GNC_PREF_NEW_SEARCH_LIMIT "new_search_limit" -#define GNC_PREF_ACTIVE_ONLY "search_for_active_only" +#define GNC_PREF_NEW_SEARCH_LIMIT "new-search-limit" +#define GNC_PREF_ACTIVE_ONLY "search-for-active-only" typedef enum { diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c index 39055f30bb..a94327726b 100644 --- a/src/gnome-utils/dialog-preferences.c +++ b/src/gnome-utils/dialog-preferences.c @@ -1112,37 +1112,43 @@ gnc_preferences_dialog_create(void) g_date_set_dmy(&fy_end, day, month, G_DATE_BAD_YEAR); } - box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/window.pages.account_tree.summary/start_period")); + box = GTK_WIDGET(gtk_builder_get_object (builder, + "pref/" GNC_PREFS_GROUP_ACCT_SUMMARY "/" GNC_PREF_START_PERIOD)); period = gnc_period_select_new(TRUE); gtk_widget_show (period); gtk_box_pack_start (GTK_BOX (box), period, TRUE, TRUE, 0); if (date_is_valid) gnc_period_select_set_fy_end(GNC_PERIOD_SELECT (period), &fy_end); - box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/window.pages.account_tree.summary/end_period")); + box = GTK_WIDGET(gtk_builder_get_object (builder, + "pref/" GNC_PREFS_GROUP_ACCT_SUMMARY "/" GNC_PREF_END_PERIOD)); period = gnc_period_select_new(FALSE); gtk_widget_show (period); gtk_box_pack_start (GTK_BOX (box), period, TRUE, TRUE, 0); if (date_is_valid) gnc_period_select_set_fy_end(GNC_PERIOD_SELECT (period), &fy_end); - box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/window.pages.account_tree.summary/start_date")); + box = GTK_WIDGET(gtk_builder_get_object (builder, + "pref/" GNC_PREFS_GROUP_ACCT_SUMMARY "/" GNC_PREF_START_DATE)); date = gnc_date_edit_new(gnc_time (NULL), FALSE, FALSE); gtk_widget_show (date); gtk_box_pack_start (GTK_BOX (box), date, TRUE, TRUE, 0); - box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/window.pages.account_tree.summary/end_date")); + box = GTK_WIDGET(gtk_builder_get_object (builder, + "pref/" GNC_PREFS_GROUP_ACCT_SUMMARY "/" GNC_PREF_END_DATE)); date = gnc_date_edit_new(gnc_time (NULL), FALSE, FALSE); gtk_widget_show (date); gtk_box_pack_start (GTK_BOX (box), date, TRUE, TRUE, 0); - box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general/currency_other")); + box = GTK_WIDGET(gtk_builder_get_object (builder, + "pref/" GNC_PREFS_GROUP_GENERAL "/" GNC_PREF_CURRENCY_OTHER)); currency = gnc_currency_edit_new(); gnc_currency_edit_set_currency (GNC_CURRENCY_EDIT(currency), gnc_default_currency()); gtk_widget_show (currency); gtk_box_pack_start(GTK_BOX (box), currency, TRUE, TRUE, 0); - box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general.report/currency_other")); + box = GTK_WIDGET(gtk_builder_get_object (builder, + "pref/" GNC_PREFS_GROUP_GENERAL_REPORT "/" GNC_PREF_CURRENCY_OTHER)); currency = gnc_currency_edit_new(); gnc_currency_edit_set_currency (GNC_CURRENCY_EDIT(currency), gnc_default_currency()); gtk_widget_show (currency); diff --git a/src/gnome-utils/dialog-reset-warnings.c b/src/gnome-utils/dialog-reset-warnings.c index 8547ef636d..ded61739e9 100644 --- a/src/gnome-utils/dialog-reset-warnings.c +++ b/src/gnome-utils/dialog-reset-warnings.c @@ -37,7 +37,7 @@ /* This static indicates the debugging module that this .o belongs to. */ static QofLogModule log_module = GNC_MOD_PREFS; -#define GNC_PREFS_GROUP "dialogs.reset_warnings" +#define GNC_PREFS_GROUP "dialogs.reset-warnings" #define DIALOG_RESET_WARNINGS_CM_CLASS "reset-warnings" #define TIPS_STRING "tips" diff --git a/src/gnome-utils/dialog-tax-table.c b/src/gnome-utils/dialog-tax-table.c index 5f49ef1846..eac19e7078 100644 --- a/src/gnome-utils/dialog-tax-table.c +++ b/src/gnome-utils/dialog-tax-table.c @@ -42,7 +42,7 @@ #include "dialog-tax-table.h" #define DIALOG_TAX_TABLE_CM_CLASS "tax-table-dialog" -#define GNC_PREFS_GROUP "dialogs.business.tax_tables" +#define GNC_PREFS_GROUP "dialogs.business.tax-tables" enum tax_table_cols { diff --git a/src/gnome-utils/dialog-totd.c b/src/gnome-utils/dialog-totd.c index c7e8a32bbb..2b65ea1aa8 100644 --- a/src/gnome-utils/dialog-totd.c +++ b/src/gnome-utils/dialog-totd.c @@ -36,8 +36,8 @@ #include "gnc-engine.h" #define GNC_PREFS_GROUP "dialogs.totd" -#define GNC_PREF_CURRENT_TIP "current_tip" -#define GNC_PREF_SHOW_TIPS "show_at_startup" +#define GNC_PREF_CURRENT_TIP "current-tip" +#define GNC_PREF_SHOW_TIPS "show-at-startup" #define DIALOG_TOTD_CM_CLASS "dialog-totd" #define GNC_RESPONSE_FORWARD 1 diff --git a/src/gnome-utils/gnc-autosave.c b/src/gnome-utils/gnc-autosave.c index 68fffeee39..552c876be1 100644 --- a/src/gnome-utils/gnc-autosave.c +++ b/src/gnome-utils/gnc-autosave.c @@ -35,8 +35,8 @@ #include "gnc-main-window.h" #include "gnc-gui-query.h" -#define GNC_PREF_AUTOSAVE_SHOW_EXPLANATION "autosave_show_explanation" -#define GNC_PREF_AUTOSAVE_INTERVAL "autosave_interval_minutes" +#define GNC_PREF_AUTOSAVE_SHOW_EXPLANATION "autosave-show-explanation" +#define GNC_PREF_AUTOSAVE_INTERVAL "autosave-interval-minutes" #define AUTOSAVE_SOURCE_ID "autosave_source_id" #ifdef G_LOG_DOMAIN diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index cc05a03edc..4b370078cb 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -92,14 +92,14 @@ enum #define PLUGIN_PAGE_CLOSE_BUTTON "close-button" #define PLUGIN_PAGE_TAB_LABEL "label" -#define GNC_PREF_SHOW_CLOSE_BUTTON "tab_close_buttons" -#define GNC_PREF_TAB_NEXT_RECENT "tab_next_recent" -#define GNC_PREF_TAB_POSITION_TOP "tab_position-top" -#define GNC_PREF_TAB_POSITION_BOTTOM "tab_position-bottom" -#define GNC_PREF_TAB_POSITION_LEFT "tab_position-left" -#define GNC_PREF_TAB_POSITION_RIGHT "tab_position-right" -#define GNC_PREF_TAB_WIDTH "tab_width" -#define GNC_PREF_TAB_COLOR "show_account_color_tabs" +#define GNC_PREF_SHOW_CLOSE_BUTTON "tab-close-buttons" +#define GNC_PREF_TAB_NEXT_RECENT "tab-next-recent" +#define GNC_PREF_TAB_POSITION_TOP "tab-position-top" +#define GNC_PREF_TAB_POSITION_BOTTOM "tab-position-bottom" +#define GNC_PREF_TAB_POSITION_LEFT "tab-position-left" +#define GNC_PREF_TAB_POSITION_RIGHT "tab-position-right" +#define GNC_PREF_TAB_WIDTH "tab-width" +#define GNC_PREF_TAB_COLOR "show-account-color-tabs" #define GNC_MAIN_WINDOW_NAME "GncMainWindow" diff --git a/src/gnome-utils/gnc-plugin-page.h b/src/gnome-utils/gnc-plugin-page.h index 9c90ad74e5..fa09f9b240 100644 --- a/src/gnome-utils/gnc-plugin-page.h +++ b/src/gnome-utils/gnc-plugin-page.h @@ -41,8 +41,8 @@ G_BEGIN_DECLS -#define GNC_PREF_SUMMARYBAR_POSITION_TOP "summarybar_position-top" -#define GNC_PREF_SUMMARYBAR_POSITION_BOTTOM "summarybar_position-bottom" +#define GNC_PREF_SUMMARYBAR_POSITION_TOP "summarybar-position-top" +#define GNC_PREF_SUMMARYBAR_POSITION_BOTTOM "summarybar-position-bottom" /* type macros */ #define GNC_TYPE_PLUGIN_PAGE (gnc_plugin_page_get_type ()) diff --git a/src/gnome-utils/gnc-splash.c b/src/gnome-utils/gnc-splash.c index 11c1d4e601..f3bc4aa35c 100644 --- a/src/gnome-utils/gnc-splash.c +++ b/src/gnome-utils/gnc-splash.c @@ -31,7 +31,7 @@ #include "gnc-prefs.h" #define MARKUP_STRING "%s" -#define GNC_PREF_SHOW_SPLASH "show_splash_screen" +#define GNC_PREF_SHOW_SPLASH "show-splash-screen" static GtkWidget * splash = NULL; static GtkWidget * progress = NULL; diff --git a/src/gnome-utils/gnc-tree-view-account.c b/src/gnome-utils/gnc-tree-view-account.c index 94c07a8483..01ec8581e4 100644 --- a/src/gnome-utils/gnc-tree-view-account.c +++ b/src/gnome-utils/gnc-tree-view-account.c @@ -49,7 +49,7 @@ #include "window-main-summarybar.h" #define SAMPLE_ACCOUNT_VALUE "$1,000,000.00" -#define GNC_PREF_ACCOUNT_COLOR "show_account_color" +#define GNC_PREF_ACCOUNT_COLOR "show-account-color" /** Static Globals *******************************************************/ diff --git a/src/gnome-utils/gnc-tree-view-split-reg.c b/src/gnome-utils/gnc-tree-view-split-reg.c index 409ecf22cf..22a20af326 100644 --- a/src/gnome-utils/gnc-tree-view-split-reg.c +++ b/src/gnome-utils/gnc-tree-view-split-reg.c @@ -291,11 +291,11 @@ struct GncTreeViewSplitRegPrivate #define ORANGECELL "#F39536" -#define GNC_PREF_SHOW_EXTRA_DATES "show_extra_dates" -#define GNC_PREF_SHOW_EXTRA_DATES_ON_SEL "show_extra_dates_on_selection" -#define GNC_PREF_SHOW_CAL_BUTTONS "show_calendar_buttons" -#define GNC_PREF_SEL_TO_BLANK_ON_EXPAND "selection_to_blank_on_expand" -#define GNC_PREF_KEY_LENGTH "key_length" +#define GNC_PREF_SHOW_EXTRA_DATES "show-extra-dates" +#define GNC_PREF_SHOW_EXTRA_DATES_ON_SEL "show-extra-dates-on-selection" +#define GNC_PREF_SHOW_CAL_BUTTONS "show-calendar-buttons" +#define GNC_PREF_SEL_TO_BLANK_ON_EXPAND "selection-to-blank-on-expand" +#define GNC_PREF_KEY_LENGTH "key-length" /* This could be a preference setting, show currency / commodity symbols */ #define SHOW_SYMBOL FALSE diff --git a/src/gnome-utils/gschemas/Makefile.am b/src/gnome-utils/gschemas/Makefile.am index baa08e14bc..4d38a7531b 100644 --- a/src/gnome-utils/gschemas/Makefile.am +++ b/src/gnome-utils/gschemas/Makefile.am @@ -6,12 +6,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in b/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in index 52bb56a5bd..eaded938c9 100644 --- a/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in +++ b/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in @@ -1,5 +1,5 @@ - + 4 Number of files in history diff --git a/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in b/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in index 58ffb5b3a7..47aed561ec 100644 --- a/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in +++ b/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in @@ -1,188 +1,188 @@ - + - - + + 0 Print checks from multiple accounts This dialog is presented if you try to print checks from multiple accounts at the same time. - + 0 - Commit changes to a invoice_entry + Commit changes to a invoice entry This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded. - + 0 - Duplicating a changed invoice_entry + Duplicating a changed invoice entry This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled. - + 0 Delete a commodity This dialog is presented before allowing you to delete a commodity. - + 0 Delete a commodity with price quotes This dialog is presented before allowing you to delete a commodity that has price quotes attached. Deleting the commodity will delete the quotes as well. - + 0 Delete multiple price quotes This dialog is presented before allowing you to delete multiple price quotes at one time. - + 0 Edit account payable/accounts receivable register This dialog is presented before allowing you to edit an accounts payable/accounts receivable account. These account types are reserved for the business features and should rarely be manipulated manually. - + 0 Read only register This dialog is presented when a read-only register is opened. - + 0 Change contents of reconciled split This dialog is presented before allowing you to change the contents of a reconciled split. Allowing these changes can make it hard to perform future reconciliations. - + 0 Mark transaction split as unreconciled This dialog is presented before allowing you to mark a transaction split as unreconciled. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Remove a split from a transaction This dialog is presented before allowing you to remove a split from a transaction. - + 0 Remove a reconciled split from a transaction This dialog is presented before allowing you to remove a reconciled split from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Remove all the splits from a transaction This dialog is presented before allowing you to remove all splits from a transaction. - + 0 Remove all the splits from a transaction This dialog is presented before allowing you to remove all splits (including some reconciled splits) from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Delete a transaction This dialog is presented before allowing you to delete a transaction. - + 0 Delete a transaction with reconciled splits This dialog is presented before allowing you to delete a transaction that contains reconciled splits. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Duplicating a changed transaction This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled. - + 0 Commit changes to a transaction This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded. - - + + 0 Print checks from multiple accounts This dialog is presented if you try to print checks from multiple accounts at the same time. - + 0 - Commit changes to a invoice_entry + Commit changes to a invoice entry This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded. - + 0 - Duplicating a changed invoice_entry + Duplicating a changed invoice entry This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled. - + 0 Delete a commodity This dialog is presented before allowing you to delete a commodity. - + 0 Delete a commodity with price quotes This dialog is presented before allowing you to delete a commodity that has price quotes attached. Deleting the commodity will delete the quotes as well. - + 0 Delete multiple price quotes This dialog is presented before allowing you to delete multiple price quotes at one time. - + 0 Edit account payable/accounts receivable register This dialog is presented before allowing you to edit an accounts payable/accounts receivable account. These account types are reserved for the business features and should rarely be manipulated manually. - + 0 Read only register This dialog is presented when a read-only register is opened. - + 0 Change contents of reconciled split This dialog is presented before allowing you to change the contents of a reconciled split. Allowing these changes can make it hard to perform future reconciliations. - + 0 Mark transaction split as unreconciled This dialog is presented before allowing you to mark a transaction split as unreconciled. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Remove a split from a transaction This dialog is presented before allowing you to remove a split from a transaction. - + 0 Remove a reconciled split from a transaction This dialog is presented before allowing you to remove a reconciled split from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Remove all the splits from a transaction This dialog is presented before allowing you to remove all splits from a transaction. - + 0 Remove all the splits from a transaction This dialog is presented before allowing you to remove all splits (including some reconciled splits) from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Delete a transaction This dialog is presented before allowing you to delete a transaction. - + 0 Delete a transaction with reconciled splits This dialog is presented before allowing you to delete a transaction that contains reconciled splits. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations. - + 0 Duplicating a changed transaction This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled. - + 0 Commit changes to a transaction This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded. diff --git a/src/gnome-utils/gtkbuilder/dialog-preferences.glade b/src/gnome-utils/gtkbuilder/dialog-preferences.glade index bde58feec3..f6dc5630ec 100644 --- a/src/gnome-utils/gtkbuilder/dialog-preferences.glade +++ b/src/gnome-utils/gtkbuilder/dialog-preferences.glade @@ -153,7 +153,7 @@ - + Include _grand total True True @@ -174,7 +174,7 @@ - + Include _non-currency totals True True @@ -225,7 +225,7 @@ - + _Relative: True True @@ -246,7 +246,7 @@ - + _Absolute: True True @@ -256,7 +256,7 @@ Use the specified absolute starting date for profit/loss calculations. True True - pref/window.pages.account_tree.summary/start_choice-relative + pref/window.pages.account-tree.summary/start-choice-relative 2 @@ -267,7 +267,7 @@ - + Re_lative: True True @@ -288,7 +288,7 @@ - + Ab_solute: True True @@ -298,7 +298,7 @@ Use the specified absolute ending date for profit/loss calculations. Also use this date for net assets calculations. True True - pref/window.pages.account_tree.summary/end_choice-relative + pref/window.pages.account-tree.summary/end-choice-relative 6 @@ -335,7 +335,7 @@ - + True False @@ -352,7 +352,7 @@ - + True False @@ -369,7 +369,7 @@ - + True False @@ -386,7 +386,7 @@ - + True False @@ -516,7 +516,7 @@ - + Use _formal accounting labels True True @@ -565,7 +565,7 @@ - + _None True True @@ -587,7 +587,7 @@ - + C_redit accounts True True @@ -597,7 +597,7 @@ Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income. True True - pref/general/reversed_accounts-none + pref/general/reversed-accounts-none 2 @@ -609,7 +609,7 @@ - + _Income & expense True True @@ -619,7 +619,7 @@ Sign reverse balances on income and expense accounts. True True - pref/general/reversed_accounts-none + pref/general/reversed-accounts-none 2 @@ -709,7 +709,7 @@ False 12 - + Loc_ale: True True @@ -736,7 +736,7 @@ False 12 - + Ch_oose: True True @@ -746,7 +746,7 @@ Use the specified currency for all newly created accounts. True True - pref/general/currency_choice-locale + pref/general/currency-choice-locale @@ -758,7 +758,7 @@ - + True True GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK @@ -828,7 +828,7 @@ - + True False @@ -892,7 +892,7 @@ - + Show the Account Color as background True True @@ -926,7 +926,7 @@ - + Show the Account Color on tabs True True @@ -1181,7 +1181,7 @@ - + In the current calendar year True True @@ -1203,7 +1203,7 @@ - + In a sliding 12-month window starting this many months before the current month: True @@ -1214,7 +1214,7 @@ many months before the current month: Dates will be completed so that they are close to the current date. Enter the maximum number of months to go backwards in time when completing dates. True True - pref/general/date_completion-thisyear + pref/general/date-completion-thisyear 2 @@ -1229,7 +1229,7 @@ many months before the current month: - + True True True @@ -1252,7 +1252,7 @@ many months before the current month: - + True False True @@ -1407,7 +1407,7 @@ many months before the current month: - + Perform account list _setup on new file True True @@ -1428,7 +1428,7 @@ many months before the current month: - + Set book option on new files to use split "action" field for "Num" field on registers/reports True True @@ -1449,7 +1449,7 @@ many months before the current month: - + Display "_tip of the day" dialog True True @@ -1475,7 +1475,7 @@ many months before the current month: False 6 - + True True True @@ -1526,7 +1526,7 @@ many months before the current month: 0 _Retain log files: True - pref/general/retain_days + pref/general/retain-days 4 @@ -1538,7 +1538,7 @@ many months before the current month: - + Com_press files True True @@ -1593,7 +1593,7 @@ many months before the current month: 0 _Decimal places: True - pref/general/auto_decimal_places + pref/general/auto-decimal-places 9 @@ -1604,7 +1604,7 @@ many months before the current month: - + True True True @@ -1629,7 +1629,7 @@ many months before the current month: - + _Automatic decimal point True True @@ -1650,7 +1650,7 @@ many months before the current month: - + Display ne_gative amounts in red True True @@ -1720,7 +1720,7 @@ many months before the current month: 0 New search _limit: True - pref/dialogs.search/new_search_limit + pref/dialogs.search/new-search-limit 21 @@ -1731,7 +1731,7 @@ many months before the current month: - + True True True @@ -1756,7 +1756,7 @@ many months before the current month: - + Show splash scree_n True True @@ -1783,7 +1783,7 @@ many months before the current month: 0 Auto-save time _interval: True - pref/general/autosave_interval_minutes + pref/general/autosave-interval-minutes 14 @@ -1799,7 +1799,7 @@ many months before the current month: False 6 - + True True True @@ -1844,7 +1844,7 @@ many months before the current month: - + Show auto-save confirmation _question True True @@ -1887,7 +1887,7 @@ many months before the current month: - + Never True True @@ -1896,7 +1896,7 @@ many months before the current month: Do not create log/backup files. Do not create log/backup files. True - pref/general/retain_type-days + pref/general/retain-type-days 16 @@ -1905,7 +1905,7 @@ many months before the current month: - + For: True True @@ -1923,7 +1923,7 @@ many months before the current month: - + Forever True True @@ -1932,7 +1932,7 @@ many months before the current month: Do not delete log/backup files. Do not delete log/backup files. True - pref/general/retain_type-days + pref/general/retain-type-days 18 @@ -1996,7 +1996,7 @@ many months before the current month: False 12 - + Print _date format True True @@ -2029,7 +2029,7 @@ many months before the current month: Default _font: True True - pref/dialogs.checkprinting/default_font + pref/dialogs.checkprinting/default-font @@ -2041,7 +2041,7 @@ many months before the current month: - + True True True @@ -2064,7 +2064,7 @@ many months before the current month: False 12 - + Print _blocking chars True True @@ -2188,7 +2188,7 @@ many months before the current month: - + '_Enter' moves to blank transaction True True @@ -2222,7 +2222,7 @@ many months before the current month: - + _Auto-raise lists True True @@ -2272,7 +2272,7 @@ many months before the current month: - + Check cleared _transactions True True @@ -2293,7 +2293,7 @@ many months before the current month: - + Automatic _interest transfer True True @@ -2314,7 +2314,7 @@ many months before the current month: - + Automatic credit card _payment True True @@ -2335,7 +2335,7 @@ many months before the current month: - + Always reconcile to t_oday True True @@ -2356,7 +2356,7 @@ many months before the current month: - + Draw _vertical lines between columns True True @@ -2377,7 +2377,7 @@ many months before the current month: - + Draw hori_zontal lines between rows True True @@ -2398,7 +2398,7 @@ many months before the current month: - + Double _mode colors alternate with transactions True True @@ -2419,7 +2419,7 @@ many months before the current month: - + _Use system theme colors True True @@ -2456,7 +2456,7 @@ many months before the current month: - + Tab order in_cludes Transfer on Memorised Transactions True True @@ -2592,7 +2592,7 @@ many months before the current month: - + _Basic ledger True True @@ -2614,7 +2614,7 @@ many months before the current month: - + _Auto-split ledger True True @@ -2624,7 +2624,7 @@ many months before the current month: Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.) True True - pref/general.register/default_style-ledger + pref/general.register/default-style-ledger 4 @@ -2636,7 +2636,7 @@ many months before the current month: - + Transaction _Journal True True @@ -2646,7 +2646,7 @@ many months before the current month: All transactions are expanded to show all splits. True True - pref/general.register/default_style-ledger + pref/general.register/default-style-ledger 4 @@ -2664,7 +2664,7 @@ many months before the current month: 0 Number of _transactions: True - pref/general.register/max_transactions + pref/general.register/max-transactions 9 @@ -2675,7 +2675,7 @@ many months before the current month: - + True True True @@ -2703,7 +2703,7 @@ many months before the current month: - + _Double line mode True True @@ -2724,7 +2724,7 @@ many months before the current month: - + Register opens in a new _window True True @@ -2745,7 +2745,7 @@ many months before the current month: - + _Only display leaf account names True True @@ -2772,7 +2772,7 @@ many months before the current month: 0 Number of _characters for auto complete: True - pref/general.register/key_length + pref/general.register/key-length 10 @@ -2783,7 +2783,7 @@ many months before the current month: - + True True True @@ -2811,7 +2811,7 @@ many months before the current month: - + Show the _entered and reconcile dates True True @@ -2831,7 +2831,7 @@ many months before the current month: - + Show the calendar b_uttons True True @@ -2851,7 +2851,7 @@ many months before the current month: - + _Move the selection to the blank split on expand True True @@ -2871,7 +2871,7 @@ many months before the current month: - + _Show entered and reconciled dates on selection True True @@ -2957,7 +2957,7 @@ many months before the current month: False 12 - + Ch_oose: True True @@ -2984,7 +2984,7 @@ many months before the current month: False 12 - + Loc_ale: True True @@ -2994,7 +2994,7 @@ many months before the current month: Use the system locale currency for all newly created reports. True True - pref/general.report/currency_choice-other + pref/general.report/currency-choice-other @@ -3049,7 +3049,7 @@ many months before the current month: - + Report opens in a new _window True True @@ -3070,7 +3070,7 @@ many months before the current month: - + True False @@ -3151,7 +3151,7 @@ many months before the current month: - + _Save window size and position True True @@ -3172,7 +3172,7 @@ many months before the current month: - + Bring the most _recent tab to the front True True @@ -3222,7 +3222,7 @@ many months before the current month: - + To_p True True @@ -3244,7 +3244,7 @@ many months before the current month: - + B_ottom True True @@ -3254,7 +3254,7 @@ many months before the current month: Display the notebook tabs at the bottom of the window. True True - pref/general/tab_position-top + pref/general/tab-position-top 2 @@ -3266,7 +3266,7 @@ many months before the current month: - + _Left True True @@ -3276,7 +3276,7 @@ many months before the current month: Display the notebook tabs at the left of the window. True True - pref/general/tab_position-top + pref/general/tab-position-top 2 @@ -3288,7 +3288,7 @@ many months before the current month: - + _Right True True @@ -3298,7 +3298,7 @@ many months before the current month: Display the notebook tabs at the right of the window. True True - pref/general/tab_position-top + pref/general/tab-position-top 2 @@ -3327,7 +3327,7 @@ many months before the current month: - + Top True True @@ -3350,7 +3350,7 @@ many months before the current month: - + Bottom True True @@ -3360,7 +3360,7 @@ many months before the current month: Display the summary bar at the bottom of the page. True True - pref/general/summarybar_position-top + pref/general/summarybar-position-top 2 @@ -3402,7 +3402,7 @@ many months before the current month: - + Show close button on _notebook tabs True True @@ -3448,7 +3448,7 @@ many months before the current month: True False - + True True True diff --git a/src/gnome-utils/window-main-summarybar.c b/src/gnome-utils/window-main-summarybar.c index c7fe675df5..0400ba49c9 100644 --- a/src/gnome-utils/window-main-summarybar.c +++ b/src/gnome-utils/window-main-summarybar.c @@ -49,9 +49,9 @@ typedef struct #define WINDOW_SUMMARYBAR_CM_CLASS "summary-bar" -#define GNC_PREFS_GROUP "window.pages.account_tree.summary" -#define GNC_PREF_GRAND_TOTAL "grand_total" -#define GNC_PREF_NON_CURRENCY "non_currency" +#define GNC_PREFS_GROUP "window.pages.account-tree.summary" +#define GNC_PREF_GRAND_TOTAL "grand-total" +#define GNC_PREF_NON_CURRENCY "non-currency" /** * An accumulator for a given currency. diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index f122423cde..48c68762e2 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -56,8 +56,8 @@ #include "gnc-engine.h" static QofLogModule log_module = GNC_MOD_IMPORT; -#define GNC_PREFS_GROUP "dialogs.new_hierarchy" -#define GNC_PREF_SHOW_ON_NEW_FILE "show_on_new_file" +#define GNC_PREFS_GROUP "dialogs.new-hierarchy" +#define GNC_PREF_SHOW_ON_NEW_FILE "show-on-new-file" typedef enum { diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c index 8c2364a7d6..cd12bd7b02 100644 --- a/src/gnome/dialog-commodities.c +++ b/src/gnome/dialog-commodities.c @@ -43,8 +43,8 @@ #define DIALOG_COMMODITIES_CM_CLASS "dialog-commodities" #define STATE_SECTION "dialogs/edit_commodities" -#define GNC_PREFS_GROUP "dialogs.edit_commodities" -#define GNC_PREF_INCL_ISO "include_iso" +#define GNC_PREFS_GROUP "dialogs.edit-commodities" +#define GNC_PREF_INCL_ISO "include-iso" /* This static indicates the debugging module that this .o belongs to. */ /* static short module = MOD_GUI; */ diff --git a/src/gnome/dialog-lot-viewer.c b/src/gnome/dialog-lot-viewer.c index d517a2a534..036bad815f 100644 --- a/src/gnome/dialog-lot-viewer.c +++ b/src/gnome/dialog-lot-viewer.c @@ -82,9 +82,9 @@ enum split_cols #define RESPONSE_SCRUB_ACCOUNT 4 #define RESPONSE_NEW_LOT 5 -#define GNC_PREFS_GROUP "dialogs.lot_viewer" -#define GNC_PREF_HPOS "hpane_position" -#define GNC_PREF_VPOS "vpane_position" +#define GNC_PREFS_GROUP "dialogs.lot-viewer" +#define GNC_PREF_HPOS "hpane-position" +#define GNC_PREF_VPOS "vpane-position" struct _GNCLotViewer { diff --git a/src/gnome/dialog-new-user.h b/src/gnome/dialog-new-user.h index 5f983b2b1b..1d419e32dc 100644 --- a/src/gnome/dialog-new-user.h +++ b/src/gnome/dialog-new-user.h @@ -23,8 +23,8 @@ #ifndef DIALOG_NEW_USER_H #define DIALOG_NEW_USER_H -#define GNC_PREFS_GROUP_NEW_USER "dialogs.new_user" -#define GNC_PREF_FIRST_STARTUP "first_startup" +#define GNC_PREFS_GROUP_NEW_USER "dialogs.new-user" +#define GNC_PREF_FIRST_STARTUP "first-startup" void gnc_ui_new_user_dialog (void); void gnc_set_first_startup (gboolean first_startup); diff --git a/src/gnome/dialog-price-edit-db.c b/src/gnome/dialog-price-edit-db.c index 60b1664789..3eb6a274d3 100644 --- a/src/gnome/dialog-price-edit-db.c +++ b/src/gnome/dialog-price-edit-db.c @@ -53,7 +53,7 @@ #define DIALOG_PRICE_DB_CM_CLASS "dialog-price-edit-db" #define STATE_SECTION "dialogs/edit_prices" -#define GNC_PREFS_GROUP "dialogs.edit_prices" +#define GNC_PREFS_GROUP "dialogs.edit-prices" /* This static indicates the debugging module that this .o belongs to. */ static QofLogModule log_module = GNC_MOD_GUI; diff --git a/src/gnome/dialog-price-editor.c b/src/gnome/dialog-price-editor.c index 95d951b8dc..282282e249 100644 --- a/src/gnome/dialog-price-editor.c +++ b/src/gnome/dialog-price-editor.c @@ -49,7 +49,7 @@ #define DIALOG_PRICE_EDIT_CM_CLASS "dialog-price-edit" -#define GNC_PREFS_GROUP "dialogs.price_editor" +#define GNC_PREFS_GROUP "dialogs.price-editor" #define DIALOG_PRICE_EDIT_SOURCE "user:price-editor" diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c index 89c4fafbaf..937130318f 100644 --- a/src/gnome/dialog-print-check.c +++ b/src/gnome/dialog-print-check.c @@ -65,26 +65,26 @@ G_GNUC_UNUSED static QofLogModule log_module = "gnc.printing.checks"; #define GNC_PREFS_GROUP "dialogs.checkprinting" -#define GNC_PREF_CHECK_FORMAT_GUID "check_format_guid" -#define GNC_PREF_CHECK_POSITION "check_position" -#define GNC_PREF_FIRST_PAGE_COUNT "first_page_count" -#define GNC_PREF_DATE_FORMAT_USER "date_format_custom" -#define GNC_PREF_CUSTOM_PAYEE "custom_payee" -#define GNC_PREF_CUSTOM_DATE "custom_date" -#define GNC_PREF_CUSTOM_WORDS "custom_amount_words" -#define GNC_PREF_CUSTOM_NUMBER "custom_amount_number" -#define GNC_PREF_CUSTOM_ADDRESS "custom_address" -#define GNC_PREF_CUSTOM_NOTES "custom_notes" -#define GNC_PREF_CUSTOM_MEMO "custom_memo" -#define GNC_PREF_CUSTOM_TRANSLATION "custom_translation" -#define GNC_PREF_CUSTOM_ROTATION "custom_rotation" -#define GNC_PREF_CUSTOM_UNITS "custom_units" -#define GNC_PREF_PRINT_DATE_FMT "print_date_format" -#define GNC_PREF_DEFAULT_FONT "default_font" -#define GNC_PREF_BLOCKING_CHARS "blocking_chars" -#define GNC_PREF_SPLITS_AMOUNT "splits_amount" -#define GNC_PREF_SPLITS_MEMO "splits_memo" -#define GNC_PREF_SPLITS_ACCOUNT "splits_account" +#define GNC_PREF_CHECK_FORMAT_GUID "check-format-guid" +#define GNC_PREF_CHECK_POSITION "check-position" +#define GNC_PREF_FIRST_PAGE_COUNT "first-page-count" +#define GNC_PREF_DATE_FORMAT_USER "date-format-custom" +#define GNC_PREF_CUSTOM_PAYEE "custom-payee" +#define GNC_PREF_CUSTOM_DATE "custom-date" +#define GNC_PREF_CUSTOM_WORDS "custom-amount-words" +#define GNC_PREF_CUSTOM_NUMBER "custom-amount-number" +#define GNC_PREF_CUSTOM_ADDRESS "custom-address" +#define GNC_PREF_CUSTOM_NOTES "custom-notes" +#define GNC_PREF_CUSTOM_MEMO "custom-memo" +#define GNC_PREF_CUSTOM_TRANSLATION "custom-translation" +#define GNC_PREF_CUSTOM_ROTATION "custom-rotation" +#define GNC_PREF_CUSTOM_UNITS "custom-units" +#define GNC_PREF_PRINT_DATE_FMT "print-date-format" +#define GNC_PREF_DEFAULT_FONT "default-font" +#define GNC_PREF_BLOCKING_CHARS "blocking-chars" +#define GNC_PREF_SPLITS_AMOUNT "splits-amount" +#define GNC_PREF_SPLITS_MEMO "splits-memo" +#define GNC_PREF_SPLITS_ACCOUNT "splits-account" #define DEFAULT_FONT "sans 12" diff --git a/src/gnome/dialog-print-check2.c b/src/gnome/dialog-print-check2.c index 1e84de9c6d..614f0cc114 100644 --- a/src/gnome/dialog-print-check2.c +++ b/src/gnome/dialog-print-check2.c @@ -65,26 +65,26 @@ G_GNUC_UNUSED static QofLogModule log_module = "gnc.printing.checks"; #define GNC_PREFS_GROUP "dialogs.checkprinting" -#define GNC_PREF_CHECK_FORMAT_GUID "check_format_guid" -#define GNC_PREF_CHECK_POSITION "check_position" -#define GNC_PREF_FIRST_PAGE_COUNT "first_page_count" -#define GNC_PREF_DATE_FORMAT_USER "date_format_custom" -#define GNC_PREF_CUSTOM_PAYEE "custom_payee" -#define GNC_PREF_CUSTOM_DATE "custom_date" -#define GNC_PREF_CUSTOM_WORDS "custom_amount_words" -#define GNC_PREF_CUSTOM_NUMBER "custom_amount_number" -#define GNC_PREF_CUSTOM_ADDRESS "custom_address" -#define GNC_PREF_CUSTOM_NOTES "custom_notes" -#define GNC_PREF_CUSTOM_MEMO "custom_memo" -#define GNC_PREF_CUSTOM_TRANSLATION "custom_translation" -#define GNC_PREF_CUSTOM_ROTATION "custom_rotation" -#define GNC_PREF_CUSTOM_UNITS "custom_units" -#define GNC_PREF_PRINT_DATE_FMT "print_date_format" -#define GNC_PREF_DEFAULT_FONT "default_font" -#define GNC_PREF_BLOCKING_CHARS "blocking_chars" -#define GNC_PREF_SPLITS_AMOUNT "splits_amount" -#define GNC_PREF_SPLITS_MEMO "splits_memo" -#define GNC_PREF_SPLITS_ACCOUNT "splits_account" +#define GNC_PREF_CHECK_FORMAT_GUID "check-format-guid" +#define GNC_PREF_CHECK_POSITION "check-position" +#define GNC_PREF_FIRST_PAGE_COUNT "first-page-count" +#define GNC_PREF_DATE_FORMAT_USER "date-format-custom" +#define GNC_PREF_CUSTOM_PAYEE "custom-payee" +#define GNC_PREF_CUSTOM_DATE "custom-date" +#define GNC_PREF_CUSTOM_WORDS "custom-amount-words" +#define GNC_PREF_CUSTOM_NUMBER "custom-amount-number" +#define GNC_PREF_CUSTOM_ADDRESS "custom-address" +#define GNC_PREF_CUSTOM_NOTES "custom-notes" +#define GNC_PREF_CUSTOM_MEMO "custom-memo" +#define GNC_PREF_CUSTOM_TRANSLATION "custom-translation" +#define GNC_PREF_CUSTOM_ROTATION "custom-rotation" +#define GNC_PREF_CUSTOM_UNITS "custom-units" +#define GNC_PREF_PRINT_DATE_FMT "print-date-format" +#define GNC_PREF_DEFAULT_FONT "default-font" +#define GNC_PREF_BLOCKING_CHARS "blocking-chars" +#define GNC_PREF_SPLITS_AMOUNT "splits-amount" +#define GNC_PREF_SPLITS_MEMO "splits-memo" +#define GNC_PREF_SPLITS_ACCOUNT "splits-account" #define DEFAULT_FONT "sans 12" diff --git a/src/gnome/dialog-sx-editor.h b/src/gnome/dialog-sx-editor.h index 149ae53b30..7e6d203e60 100644 --- a/src/gnome/dialog-sx-editor.h +++ b/src/gnome/dialog-sx-editor.h @@ -28,10 +28,10 @@ #define DIALOG_SCHEDXACTION_CM_CLASS "dialog-scheduledtransactions" #define DIALOG_SCHEDXACTION_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor" -#define GNC_PREF_CREATE_DAYS "create_days" -#define GNC_PREF_REMIND_DAYS "remind_days" -#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction_editor" -#define GNC_PREF_CREATE_AUTO "create_auto" +#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction-editor" +#define GNC_PREF_CREATE_DAYS "create-days" +#define GNC_PREF_REMIND_DAYS "remind-days" +#define GNC_PREF_CREATE_AUTO "create-auto" #define GNC_PREF_NOTIFY "notify" typedef struct _GncSxEditorDialog GncSxEditorDialog; diff --git a/src/gnome/dialog-sx-editor2.h b/src/gnome/dialog-sx-editor2.h index 58d52f50ea..b8c7cdf0ef 100644 --- a/src/gnome/dialog-sx-editor2.h +++ b/src/gnome/dialog-sx-editor2.h @@ -28,10 +28,10 @@ #define DIALOG_SCHEDXACTION2_CM_CLASS "dialog-scheduledtransactions" #define DIALOG_SCHEDXACTION2_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor" -#define GNC_PREF_CREATE_DAYS "create_days" -#define GNC_PREF_REMIND_DAYS "remind_days" -#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction_editor" -#define GNC_PREF_CREATE_AUTO "create_auto" +#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction-editor" +#define GNC_PREF_CREATE_DAYS "create-days" +#define GNC_PREF_REMIND_DAYS "remind-days" +#define GNC_PREF_CREATE_AUTO "create-auto" #define GNC_PREF_NOTIFY "notify" typedef struct _GncSxEditorDialog2 GncSxEditorDialog2; diff --git a/src/gnome/dialog-sx-since-last-run.c b/src/gnome/dialog-sx-since-last-run.c index 2b48e507db..6c14dcca76 100644 --- a/src/gnome/dialog-sx-since-last-run.c +++ b/src/gnome/dialog-sx-since-last-run.c @@ -61,8 +61,8 @@ G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_GUI_SX; #define DIALOG_SX_SINCE_LAST_RUN_CM_CLASS "dialog-sx-since-last-run" -#define GNC_PREFS_GROUP "dialogs.sxs.since_last_run" -#define GNC_PREF_SHOW_AT_FOPEN "show_at_file_open" +#define GNC_PREFS_GROUP "dialogs.sxs.since-last-run" +#define GNC_PREF_SHOW_AT_FOPEN "show-at-file-open" struct _GncSxSinceLastRunDialog { diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c index 68c220d2f3..036dcf02e0 100644 --- a/src/gnome/dialog-tax-info.c +++ b/src/gnome/dialog-tax-info.c @@ -44,8 +44,8 @@ #include "gnc-ui.h" #define DIALOG_TAX_INFO_CM_CLASS "dialog-tax-info" -#define GNC_PREFS_GROUP "dialogs.tax_info" -#define GNC_PREF_PANED_POS "paned_position" +#define GNC_PREFS_GROUP "dialogs.tax-info" +#define GNC_PREF_PANED_POS "paned-position" enum { diff --git a/src/gnome/gschemas/Makefile.am b/src/gnome/gschemas/Makefile.am index 522a58fc9e..904d42ba5e 100644 --- a/src/gnome/gschemas/Makefile.am +++ b/src/gnome/gschemas/Makefile.am @@ -15,12 +15,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in index 2bcbe336eb..062a96e128 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in @@ -1,106 +1,106 @@ - - + + '' GUID of predefined check format to use This value specifies the predefined check format to use. The number is the guid of a known check format. - + 0 Which check position to print On preprinted checks containing multiple checks per page, this setting specifies which check position to print. The possible values are 0, 1 and 2, corresponding to the top, middle and bottom checks on the page. - + 0 Number of checks to print on the first page. Number of checks to print on the first page. - + 0 Date format to use This is the numerical identifier of the predefined date format to use. - + '0' Custom date format - If the 'date_format' is set to indicate a custom date format, this value is used as an argument to strftime to produce the date to be printed. It may be any valid strftime string; for more information about this format, read the manual page of strftime by "man 3 strftime". + If the date format is set to indicate a custom date format, this value is used as an argument to strftime to produce the date to be printed. It may be any valid strftime string; for more information about this format, read the manual page of strftime by "man 3 strftime". - + 0 Units in which the custom coordinates are expressed Units in which the custom coordinates are expressed (inches, mm, ...). - + (0,0) Position of payee name This value contains the X,Y coordinates for the start of the payee line on the check. - + (0,0) Position of date line This value contains the X,Y coordinates for the start of the date line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of check amount in words This value contains the X,Y coordinates for the start of the written amount line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of check amount in numbers This value contains the X,Y coordinates for the start of the numerical amount line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of payee address This value contains the X,Y coordinates for the start of the payee address line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of notes line This value contains the X,Y coordinates for the start of the notes line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of memo line This value contains the X,Y coordinates for the start of the memo line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Offset for complete check This value contains the X,Y offset for the complete check. Coordinates are from the lower left corner of the specified check position. - + 0.0 Rotation angle Number of degrees to rotate the check. - + (0,0) Position of split's amount in numbers This value contains the X,Y coordinates for the start of the split's amount line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of split's memo line This value contains the X,Y coordinates for the start of the split's memo line on the check. Coordinates are from the lower left corner of the specified check position. - + (0,0) Position of split's account line This value contains the X,Y coordinates for the start of the split's account line on the check. Coordinates are from the lower left corner of the specified check position. - + false Print the date format below the date. Each time the date is printed, print the date format immediately below in 8 point type using the characters Y, M, and D. - + 'sans 10' The default check printing font The default font to use when printing checks. This value will be overridden by any font specified in a check description file. - + false Print '***' before and after text. Print '***' before and after text. diff --git a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in index 7e6cef6e73..4e932383bd 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in @@ -1,71 +1,71 @@ - - + + [ 'namespace', 'symbol', 'name', 'printname', 'uniquename', 'cusip_code', 'fraction', 'quote_flag', 'quote_source', 'quote_timezone' ] Order of columns in the dialog This setting contains a list of names which controls the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order. - + true Show the Namespace column Show the Namespace column - + true Show the symbol column Show the symbol column - + true Show the name column Show the name column - + false Show the Full Name column Show the Full Name column - + false Show the Print Name column Show the Print Name column - + false Show the Unique Name column Show the Unique Name column - + true Show the ISIN/CUSIP Code (Exchange Specific Data) column Show the ISIN/CUSIP Code (Exchange Specific Data) column - + true Show the fraction column Show the fraction column - + false Show the Quote Flag column Show the Quote Flag column - + false Show the Quote Source column Show the Quote Source column - + false Show the Quote Timezone column Show the Quote Timezone column - + 0 Width of this column This setting stores the width of the given column in pixels. - + false Show currencies in this dialog Show currencies in this dialog diff --git a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in index e321f695f6..0dad24ac55 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in @@ -1,27 +1,27 @@ - + - - + + - - - - + + + + - - - + + + - - - + + + - + (-1,-1,-1,-1) Last window position and size @@ -31,7 +31,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -41,7 +41,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -51,7 +51,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -61,7 +61,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -71,8 +71,8 @@ - - + + 0 Position of the horizontal pane divider. Position of the horizontal pane divider. @@ -86,7 +86,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -96,7 +96,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -106,7 +106,7 @@ - + (-1,-1,-1,-1) Last window position and size @@ -114,46 +114,46 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + false Search only in active items This setting indicates whether to search in all items in the current class, or only in 'active' items in the current class. - - + + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - - + + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - - + + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - - + + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - + (-1,-1,-1,-1) Last window position and size @@ -161,25 +161,25 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + [] Columns used for sorting - This setting indicates which column in the tree is used for sorting. Possible values for this setting are the name of any column in this window (see the column_order key) or the keyword 'none'. + This setting indicates which column in the tree is used for sorting. Possible values for this setting are the name of any column in this window (see the column-order key) or the keyword 'none'. - + [] Sort column ascending or descending This setting indicates how the key column is sorted. Possible values for this setting are 'ascending' and 'descending'. - - + + 200 Position of the horizontal pane divider. Position of the horizontal pane divider. - + 200 Position of the vertical pane divider. Position of the vertical pane divider. @@ -193,15 +193,15 @@ - - + + true Show the new user window If active, the new user window will be shown. Otherwise it will not be shown. - + (-1,-1,-1,-1) Last window position and size @@ -209,22 +209,22 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + true New hierarchy window on "New File" If active, the "New Hierarchy" window will be shown whenever the "New File" menu item is chosen. Otherwise it will not be shown. - - + + 1.0 Default to 'new search' if fewer than this number of items is returned Default to 'new search' if fewer than this number of items is returned - + (-1,-1,-1,-1) Last window position and size diff --git a/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in index 0ca0c1bbb0..ca4e52b357 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in @@ -1,16 +1,16 @@ - - + + [ 'commodity', 'currency', 'date', 'source', 'type', 'price' ] Order of columns in the dialog This setting contains a list of names which controls the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order. - + true Display this column This setting controls wether the given column will be visible in the view. TRUE means visible, FALSE means hidden. - + 0 Width of this column This setting stores the width of the given column in pixels. diff --git a/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in index 2de1a30b7b..82f2267dd8 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in @@ -1,21 +1,21 @@ - - + + true Pre-select cleared transactions If active, all transactions marked as cleared in the register will appear already selected in the reconcile dialog. Otherwise no transactions will be initially selected. - + false Prompt for interest charges Prior to reconciling an account which charges or pays interest, prompt the user to enter a transaction for the interest charge or payment. Currently only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts. - + true Prompt for credit card payment If active, after reconciling a credit card account, prompt the user to enter a credit card payment. Otherwise do not prompt the user for this. - + false Always reconcile to today If active, always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations. diff --git a/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in index 8ed6477273..47bac2ff21 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in @@ -1,10 +1,10 @@ - - - + + + - + (-1,-1,-1,-1) Last window position and size @@ -12,20 +12,20 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + true Show "since last run" dialog when a file is opened. This setting controls whether the scheduled transactions "since last run" dialog is shown automatically when a data file is opened. This includes the initial opening of the data file when GnuCash starts. If this setting is active, show the dialog, otherwise it is not shown. - - + + false Set the "auto create" flag by default If active, any newly created scheduled transaction will have its 'auto create' flag set active by default. The user can change this flag during transaction creation, or at any later time by editing the scheduled transaction. - + 0 How many days in advance to notify the user. How many days in advance to notify the user. @@ -40,9 +40,9 @@ true Set the "notify" flag by default - If active, any newly created scheduled transaction will have its 'notify' flag set by default. The user can change this flag during transaction creation, or at any later time by editing the scheduled transaction. This setting only has meaning if the create_auto setting is active. + If active, any newly created scheduled transaction will have its 'notify' flag set by default. The user can change this flag during transaction creation, or at any later time by editing the scheduled transaction. This setting only has meaning if the create-auto setting is active. - + 0 How many days in advance to remind the user. How many days in advance to remind the user. diff --git a/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in index 0a9fd3d5d3..e175969cd3 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in @@ -1,6 +1,6 @@ - - + + 0 The next tip to show. The next tip to show. @@ -12,7 +12,7 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + true Show "Tip Of The Day" at GnuCash start Enables the "Tip Of The Day" when GnuCash starts up. If active, the dialog will be shown. Otherwise it will not be shown. diff --git a/src/gnome/gschemas/org.gnucash.gschema.xml.in b/src/gnome/gschemas/org.gnucash.gschema.xml.in index 22529c2e45..f1a4d62972 100644 --- a/src/gnome/gschemas/org.gnucash.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.gschema.xml.in @@ -1,190 +1,190 @@ - + - - + + true Save window sizes and locations If active, the size and location of each dialog window will be saved when it is closed. The sizes and locations of content windows will be remembered when you quit GnuCash. Otherwise the sizes will not be saved. - + 'colon' Character to use as separator between account names This setting determines the character that will be used between components of an account name. Possible values are any single non-alphanumeric unicode character, or any of the following strings: "colon" "slash", "backslash", "dash" and "period". - + true Compress the data file Enables file compression when writing the data file. - + true Show auto-save explanation If active, GnuCash shows an explanation of the auto-save feature the first time that feature is started. Otherwise no extra explanation is shown. - + 5 Auto-save time interval The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically. - + true Display negative amounts in red Display negative amounts in red - + false Automatically insert a decimal point If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers. - + 2.0 Number of automatic decimal places This field specifies the number of automatic decimal places that will be filled in. - + false Do not create log/backup files. - This setting specifies what to do with old log/backups files. "forever" means keep all old files. "never" means no old log/backup files are kept. Each time you save, older versions of the file are removed. "days" means keep old files for a number of days. How many days is defined in key 'retain_days' + This setting specifies what to do with old log/backups files. "forever" means keep all old files. "never" means no old log/backup files are kept. Each time you save, older versions of the file are removed. "days" means keep old files for a number of days. How many days is defined in key 'retain-days' - + true Delete old log/backup files after this many days (0 = never). - This setting specifies what to do with old log/backups files. "forever" means keep all old files. "never" means no old log/backup files are kept. Each time you save, older versions of the file are removed. "days" means keep old files for a number of days. How many days is defined in key 'retain_days' + This setting specifies what to do with old log/backups files. "forever" means keep all old files. "never" means no old log/backup files are kept. Each time you save, older versions of the file are removed. "days" means keep old files for a number of days. How many days is defined in key 'retain-days' - + false Do not delete log/backup files. - This setting specifies what to do with old log/backups files. "forever" means keep all old files. "never" means no old log/backup files are kept. Each time you save, older versions of the file are removed. "days" means keep old files for a number of days. How many days is defined in key 'retain_days' + This setting specifies what to do with old log/backups files. "forever" means keep all old files. "never" means no old log/backup files are kept. Each time you save, older versions of the file are removed. "days" means keep old files for a number of days. How many days is defined in key 'retain-days' - + 30.0 Delete old log/backup files after this many days (0 = never) This setting specifies the number of days after which old log/backup files will be deleted (0 = never). - + false Don't sign reverse any accounts. - This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting "income_expense" is for users who like to see negative expenses and positive income. The setting of "credit" is for users who want to see balances reflect the debit/credit status of the account. The setting "none" doesn't reverse the sign on any balances. + This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting "income-expense" is for users who like to see negative expenses and positive income. The setting of "credit" is for users who want to see balances reflect the debit/credit status of the account. The setting "none" doesn't reverse the sign on any balances. - + true Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income. - This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting "income_expense" is for users who like to see negative expenses and positive income. The setting of "credit" is for users who want to see balances reflect the debit/credit status of the account. The setting "none" doesn't reverse the sign on any balances. + This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting "income-expense" is for users who like to see negative expenses and positive income. The setting of "credit" is for users who want to see balances reflect the debit/credit status of the account. The setting "none" doesn't reverse the sign on any balances. - + false Sign reverse balances on income and expense accounts. - This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting "income_expense" is for users who like to see negative expenses and positive income. The setting of "credit" is for users who want to see balances reflect the debit/credit status of the account. The setting "none" doesn't reverse the sign on any balances. + This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting "income-expense" is for users who like to see negative expenses and positive income. The setting of "credit" is for users who want to see balances reflect the debit/credit status of the account. The setting "none" doesn't reverse the sign on any balances. - + false Use account colors in the account hierarchy If active the account hierarchy will colorize the account using the account's custom color if set. This can serve as a visual aid to quickly identify accounts. - + false Use account colors in the tabs of open account registers If active the account register tabs will be colored using the account's custom color if set. This can serve as a visual aid to quickly identify accounts. - + false Use formal account labels If active, formal accounting labels "Credit" and "Debit" will be used when designating fields on screen. Otherwise, informal labels such as Increase/Decrease, "Funds In"/"Funds Out", etc. will be used. - - false + + true Show close buttons on notebook tabs If active, a "close" button will be displayed on any notebook tab that may be closed. Otherwise, no such button will be shown on the tab. Regardless of this setting, pages can always be closed via the "close" menu item or the "close" button on toolbar. - + 30.0 Width of notebook tabs This key specifies the maximum width of notebook tabs. If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis. - + true Use the system locale currency for all newly created accounts. - This setting controls the source of the default currency for new accounts. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency_other key. + This setting controls the source of the default currency for new accounts. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - + false Use the specified currency for all newly created accounts. - This setting controls the source of the default currency for new accounts. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency_other key. + This setting controls the source of the default currency for new accounts. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - + 'USD' Default currency for new accounts - This setting specifies the default currency used for new accounts if the currency_choice setting is set to "other". This field must contain the three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB). + This setting specifies the default currency used for new accounts if the currency-choice setting is set to "other". This field must contain the three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB). false Use 24 hour time format If active, use a 24 hour time format. Otherwise use a 12 hour time format. - + 4 Date format choice This setting chooses the way dates are displayed in GnuCash. Possible values for this setting are "locale" to use the system locale setting, "ce" for Continental Europe style dates, "iso" for ISO 8601 standard dates , "uk" for United Kingdom style dates, and "us" for United States style dates. - + true In the current calendar year When a date is entered without year it can be completed so that it will be within the current calendar year or close to the current date based on a sliding window starting a set number of months backwards in time. - + false In a sliding 12-month window starting a configurable number of months before the current month When a date is entered without year it can be completed so that it will be within the current calendar year or close to the current date based on a sliding window starting a set number of months backwards in time. - + 6.0 Maximum number of months to go back. Dates will be completed so that they are close to the current date. Enter the maximum number of months to go backwards in time when completing dates. - + true Show splash screen If active, a splash screen will be shown at startup. Otherwise no splash screen will be shown. - + true Display the notebook tabs at the top of the window. This setting determines the edge at which the tabs for switching pages in notebooks are drawn. Possible values are "top", "left", "bottom" and "right". It defaults to "top". - + false Display the notebook tabs at the bottom of the window. This setting determines the edge at which the tabs for switching pages in notebooks are drawn. Possible values are "top", "left", "bottom" and "right". It defaults to "top". - + false Display the notebook tabs at the left of the window. This setting determines the edge at which the tabs for switching pages in notebooks are drawn. Possible values are "top", "left", "bottom" and "right". It defaults to "top". - + false Display the notebook tabs at the right of the window. This setting determines the edge at which the tabs for switching pages in notebooks are drawn. Possible values are "top", "left", "bottom" and "right". It defaults to "top". - + false Display the summary bar at the top of the page. This setting determines the edge at which the summary bar for various pages is drawn. Possible values are "top" and "bottom". It defaults to "bottom". - + true Display the summary bar at the bottom of the page. This setting determines the edge at which the summary bar for various pages is drawn. Possible values are "top" and "bottom". It defaults to "bottom". - + false Closing a tab moves to the most recently visited tab. If active, closing a tab moves to the most recently visited tab. Otherwise closing a tab moves one tab to the left. - + false Set book option on new files to use split "action" field for "Num" field on registers/reports If selected, the default book option for new files is set so that the 'Num' cell on registers shows/updates the split 'action' field and the transaction 'num' field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the 'Num' cell on registers shows/updates the transaction 'num' field. @@ -193,146 +193,146 @@ - - + + false Color the register as specified by the system theme If active, the register will be colored as specified by the system theme. This can be overridden to provide custom colors by editing the gtkrc file in the users home directory. Otherwise the standard register colors will be used that GnuCash has always used. - + false "Enter" key moves to bottom of register If active, pressing the enter key will move to the bottom of the register. Otherwise pressing the enter key will move to the next transaction line. - + true Automatically raise the list of accounts or actions during input Automatically raise the list of accounts or actions during input - + false Move to Transfer field when memorised transaction auto filled If active then after a memorised transaction is automatically filled in the cursor will move to the Transfer field. If not active then it skips to the value field. - + false Create a new window for each new register If active, each new register will be opened in a new window. Otherwise each new register will be opened as a tab in the main window. - + false Color all lines of a transaction the same If active all lines that make up a single transaction will use the same color for their background. Otherwise the background colors are alternated on each line. - + true Show horizontal borders in a register Show horizontal borders between rows in a register. If active the border between cells will be indicated with a heavy line. Otherwise the border between cells will not be marked. - + true Show vertical borders in a register Show vertical borders between columns in a register. If active the border between cells will be indicated with a heavy line. Otherwise the border between cells will not be marked. - + true Show all transactions on one line. (Two in double line mode.) This field specifies the default view style when opening a new register window. Possible values are "ledger", "auto-ledger" and "journal". The "ledger" setting says to show each transaction on one or two lines. The "auto-ledger" setting does the same, but also expands only the current transaction to show all splits. The "journal" setting shows all transactions in expanded form. - + false Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.) This field specifies the default view style when opening a new register window. Possible values are "ledger", "auto-ledger" and "journal". The "ledger" setting says to show each transaction on one or two lines. The "auto-ledger" setting does the same, but also expands only the current transaction to show all splits. The "journal" setting shows all transactions in expanded form. - + false All transactions are expanded to show all splits. This field specifies the default view style when opening a new register window. Possible values are "ledger", "auto-ledger" and "journal". The "ledger" setting says to show each transaction on one or two lines. The "auto-ledger" setting does the same, but also expands only the current transaction to show all splits. The "journal" setting shows all transactions in expanded form. - + false Show two lines of information for each transaction Show two lines of information for each transaction in a register. This is the default setting for when a register is first opened. The setting can be changed at any time via the "View->Double Line" menu item. - + false Only display leaf account names. Show only the names of the leaf accounts in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Activating this option implies that you use unique leaf names. - + false Show the entered and reconcile dates Show the date when the transaction was entered below the posted date and reconciled date on split row. - + false Show entered and reconciled dates on selection Show the entered date and reconciled date on transaction selection. - + false Show the calendar buttons Show the calendar buttons Cancel, Today and Select. - + false Move the selection to the blank split on expand This will move the selection to the blank split when the transaction is expanded. - + 0.0 Number of transactions to show in a register. Show this many transactions in a register. A value of zero means show all transactions. - + 2.0 Number of characters for auto complete. This sets the number of characters before auto complete starts for description, notes and memo fields. - - + + false Create a new window for each new report If active, each new report will be opened in its own window. Otherwise new reports will be opened as tabs in the main window. - + 'locale' Source of default report currency - This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency_other key. + This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - + true Use the system locale currency for all newly created reports. - This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency_other key. + This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - + false Use the specified currency for all newly created reports. - This setting controls the source of the default currency for new accounts. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency_other key. + This setting controls the source of the default currency for new accounts. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - + 'USD' Default currency for new reports - This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency_other key. + This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - + - - - '%1$s_%2$s_%3$s' + + + '%1$s-%2$s-%3$s' PDF export file name format - This setting chooses the file name for PDF export. This is a sprintf(3) string with three arguments: "%1$s" is the report name such as "Invoice". "%2$s" is the number of the report, which for an invoice report is the invoice number. "%3$s" is the date of the report, formatted according to the filename_date_format setting. (Note: Any characters that are not allowed in filenames, such as '/', will be replaced with underscores '_' in the resulting file name.) + This setting chooses the file name for PDF export. This is a sprintf(3) string with three arguments: "%1$s" is the report name such as "Invoice". "%2$s" is the number of the report, which for an invoice report is the invoice number. "%3$s" is the date of the report, formatted according to the filename-date-format setting. (Note: Any characters that are not allowed in filenames, such as '/', will be replaced with underscores '-' in the resulting file name.) - + 'locale' PDF export file name date format choice This setting chooses the way dates are used in the filename of PDF export. Possible values for this setting are "locale" to use the system locale setting, "ce" for Continental Europe style dates, "iso" for ISO 8601 standard dates , "uk" for United Kingdom style dates, and "us" for United States style dates. - - + + false Allow file incompatibility with older versions. If active, gnucash will be allowed to intentionally break file compatibility with older versions, so that a data file saved in this version cannot be read by an older version again. Otherwise gnucash will write data files only in formats that can be read by older versions as well. diff --git a/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in b/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in index f3406a43b3..d7747780c9 100644 --- a/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in @@ -1,54 +1,54 @@ - - + + true Show a grand total of all accounts converted to the default report currency Show a grand total of all accounts converted to the default report currency - + true Show non currency commodities If active, non currency commodities (stocks) will be shown. Otherwise they will be hidden. - + true Use relative profit/loss starting date - This setting controls the type of starting date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the starting date specified by the start_date key. If set to anything else, GnuCash will retrieve the starting date specified by the start_period key. + This setting controls the type of starting date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the starting date specified by the start-date key. If set to anything else, GnuCash will retrieve the starting date specified by the start-period key. - + false Use absolute profit/loss starting date - This setting controls the type of starting date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the starting date specified by the start_date key. If set to anything else, GnuCash will retrieve the starting date specified by the start_period key. + This setting controls the type of starting date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the starting date specified by the start-date key. If set to anything else, GnuCash will retrieve the starting date specified by the start-period key. - + 0 Starting date (in seconds from Jan 1, 1970) - This setting controls the starting date set in profit/loss calculations if the start_choice setting is set to "absolute". This field should contain a date as represented in seconds from January 1st, 1970. + This setting controls the starting date set in profit/loss calculations if the start-choice setting is set to "absolute". This field should contain a date as represented in seconds from January 1st, 1970. - + 5 Starting time period identifier - This setting controls the starting date set in profit/loss calculations if the start_choice setting is set to anything other than "absolute". This field should contain a value between 0 and 8. + This setting controls the starting date set in profit/loss calculations if the start-choice setting is set to anything other than "absolute". This field should contain a value between 0 and 8. - + true Use relative profit/loss ending date - This setting controls the type of ending date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the ending date specified by the end_date key. If set to anything else, GnuCash will retrieve the ending date specified by the end_period key. + This setting controls the type of ending date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the ending date specified by the end-date key. If set to anything else, GnuCash will retrieve the ending date specified by the end-period key. - + false Use absolute profit/loss ending date - This setting controls the type of ending date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the ending date specified by the end_date key. If set to anything else, GnuCash will retrieve the ending date specified by the end_period key. + This setting controls the type of ending date used in profit/loss calculations. If set to "absolute" then GnuCash will retrieve the ending date specified by the end-date key. If set to anything else, GnuCash will retrieve the ending date specified by the end-period key. - + 0 Ending date (in seconds from Jan 1, 1970) - This setting controls the ending date set in profit/loss calculations if the end_choice setting is set to "absolute". This field should contain a date as represented in seconds from January 1st, 1970. + This setting controls the ending date set in profit/loss calculations if the end-choice setting is set to "absolute". This field should contain a date as represented in seconds from January 1st, 1970. - + 5 Ending time period identifier - This setting controls the ending date set in profit/loss calculations if the end_choice setting is set to anything other than "absolute". This field should contain a value between 0 and 8. + This setting controls the ending date set in profit/loss calculations if the end-choice setting is set to anything other than "absolute". This field should contain a value between 0 and 8. diff --git a/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in b/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in index 816586a469..be76b6a86d 100644 --- a/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in @@ -1,11 +1,11 @@ - - + + false Display this column This setting controls wether the given column will be visible in the view. TRUE means visible, FALSE means hidden. - + 0 Width of this column This setting stores the width of the given column in pixels. diff --git a/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in b/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in index 231809d6f2..de950c110b 100644 --- a/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in @@ -1,6 +1,6 @@ - - + + 0 Width of a column in the dialog This setting contains the width of the named column in the most recently closed register window. Changing these values will change the sizes of the columns in the next opened register diff --git a/src/gnome/gtkbuilder/dialog-sx.glade b/src/gnome/gtkbuilder/dialog-sx.glade index c79607fdb3..ebac3f463e 100644 --- a/src/gnome/gtkbuilder/dialog-sx.glade +++ b/src/gnome/gtkbuilder/dialog-sx.glade @@ -150,7 +150,7 @@ - + _Run when data file opened True True @@ -170,7 +170,7 @@ - + _Auto-create new transactions True True @@ -202,7 +202,7 @@ 0 Crea_te in advance: True - pref/dialogs.sxs.transaction_editor/create_days + pref/dialogs.sxs.transaction-editor/create-days @@ -225,7 +225,7 @@ 0 R_emind in advance: True - pref/dialogs.sxs.transaction_editor/remind_days + pref/dialogs.sxs.transaction-editor/remind-days @@ -242,7 +242,7 @@ False 6 - + True True Begin notifications this many days before the transaction is created. @@ -288,7 +288,7 @@ False 6 - + True True Create the transaction this many days before its effective date. @@ -329,7 +329,7 @@ - + _Notify before transactions are created True False diff --git a/src/gnome/reconcile-view.c b/src/gnome/reconcile-view.c index f5255fd378..57fd18adf3 100644 --- a/src/gnome/reconcile-view.c +++ b/src/gnome/reconcile-view.c @@ -38,7 +38,7 @@ #include "search-param.h" #include "gnc-component-manager.h" -#define GNC_PREF_CHECK_CLEARED "check_cleared" +#define GNC_PREF_CHECK_CLEARED "check-cleared" /* Signal codes */ enum diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 115d3caff0..cf0f0b8c99 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -59,9 +59,9 @@ #include "window-reconcile.h" #define WINDOW_RECONCILE_CM_CLASS "window-reconcile" -#define GNC_PREF_AUTO_INTEREST_TRANSFER "auto_interest_transfer" -#define GNC_PREF_AUTO_CC_PAYMENT "auto_cc_payment" -#define GNC_PREF_ALWAYS_REC_TO_TODAY "always_reconcile_to_today" +#define GNC_PREF_AUTO_INTEREST_TRANSFER "auto-interest-transfer" +#define GNC_PREF_AUTO_CC_PAYMENT "auto-cc-payment" +#define GNC_PREF_ALWAYS_REC_TO_TODAY "always-reconcile-to-today" /** STRUCTS *********************************************************/ diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c index fd49ba7a0f..8cc42a43d1 100644 --- a/src/gnome/window-reconcile2.c +++ b/src/gnome/window-reconcile2.c @@ -59,9 +59,9 @@ #include "window-reconcile2.h" #define WINDOW_RECONCILE_CM_CLASS "window-reconcile" -#define GNC_PREF_AUTO_INTEREST_TRANSFER "auto_interest_transfer" -#define GNC_PREF_AUTO_CC_PAYMENT "auto_cc_payment" -#define GNC_PREF_ALWAYS_REC_TO_TODAY "always_reconcile_to_today" +#define GNC_PREF_AUTO_INTEREST_TRANSFER "auto-interest-transfer" +#define GNC_PREF_AUTO_CC_PAYMENT "auto-cc-payment" +#define GNC_PREF_ALWAYS_REC_TO_TODAY "always-reconcile-to-today" /** STRUCTS *********************************************************/ diff --git a/src/import-export/aqbanking/assistant-ab-initial.c b/src/import-export/aqbanking/assistant-ab-initial.c index f9849fa628..d0def64511 100644 --- a/src/import-export/aqbanking/assistant-ab-initial.c +++ b/src/import-export/aqbanking/assistant-ab-initial.c @@ -62,7 +62,7 @@ /* This static indicates the debugging module that this .o belongs to. */ static QofLogModule log_module = GNC_MOD_ASSISTANT; -#define GNC_PREFS_GROUP "dialogs.ab_initial" +#define GNC_PREFS_GROUP "dialogs.ab-initial" #define ASSISTANT_AB_INITIAL_CM_CLASS "assistant-ab-initial" typedef struct _ABInitialInfo ABInitialInfo; diff --git a/src/import-export/aqbanking/dialog-ab.glade b/src/import-export/aqbanking/dialog-ab.glade index b30938e0f6..ee7342d82c 100644 --- a/src/import-export/aqbanking/dialog-ab.glade +++ b/src/import-export/aqbanking/dialog-ab.glade @@ -815,7 +815,7 @@ - + _Close log window when finished True True @@ -834,7 +834,7 @@ - + Remember _PIN True True diff --git a/src/import-export/aqbanking/gnc-ab-utils.h b/src/import-export/aqbanking/gnc-ab-utils.h index 1362016e1b..12d112ad3f 100644 --- a/src/import-export/aqbanking/gnc-ab-utils.h +++ b/src/import-export/aqbanking/gnc-ab-utils.h @@ -71,10 +71,10 @@ G_BEGIN_DECLS #endif #define GNC_PREFS_GROUP_AQBANKING "dialogs.import.hbci" -#define GNC_PREF_FORMAT_SWIFT940 "format_swift_mt940" -#define GNC_PREF_FORMAT_SWIFT942 "format_swift_mt942" -#define GNC_PREF_FORMAT_DTAUS "format_dtaus" -#define GNC_PREF_VERBOSE_DEBUG "verbose_debug" +#define GNC_PREF_FORMAT_SWIFT940 "format-swift-mt940" +#define GNC_PREF_FORMAT_SWIFT942 "format-swift-mt942" +#define GNC_PREF_FORMAT_DTAUS "format-dtaus" +#define GNC_PREF_VERBOSE_DEBUG "verbose-debug" typedef struct _GncABImExContextImport GncABImExContextImport; diff --git a/src/import-export/aqbanking/gnc-gwen-gui.c b/src/import-export/aqbanking/gnc-gwen-gui.c index 3137f987aa..03a685fc31 100644 --- a/src/import-export/aqbanking/gnc-gwen-gui.c +++ b/src/import-export/aqbanking/gnc-gwen-gui.c @@ -56,9 +56,9 @@ #endif #define GWEN_GUI_CM_CLASS "dialog-hbcilog" -#define GNC_PREFS_GROUP_CONNECTION GNC_PREFS_GROUP_AQBANKING ".connection_dialog" -#define GNC_PREF_CLOSE_ON_FINISH "close_on_finish" -#define GNC_PREF_REMEMBER_PIN "remember_pin" +#define GNC_PREFS_GROUP_CONNECTION GNC_PREFS_GROUP_AQBANKING ".connection-dialog" +#define GNC_PREF_CLOSE_ON_FINISH "close-on-finish" +#define GNC_PREF_REMEMBER_PIN "remember-pin" #ifdef USING_GWENHYWFAR_GTK2_GUI # include diff --git a/src/import-export/aqbanking/gschemas/Makefile.am b/src/import-export/aqbanking/gschemas/Makefile.am index 4fbebfa0ff..bd7cc061c5 100644 --- a/src/import-export/aqbanking/gschemas/Makefile.am +++ b/src/import-export/aqbanking/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in b/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in index 6fa8765465..de7ca527ca 100644 --- a/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in +++ b/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in @@ -1,5 +1,5 @@ - + (-1,-1,-1,-1) Last window position and size @@ -9,51 +9,51 @@ - - + + true Close window when finished If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open. - + false Remember the PIN in memory If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed. - + false Verbose HBCI debug messages Enables verbose debug messages for HBCI/AqBanking Online Banking. - + 'default' DTAUS import data format This setting specifies the data format when importing DTAUS files. The AqBanking library offers various import formats (called "profiles") of which you can choose one here. - + 'default' CSV import data format This setting specifies the data format when importing CSV files. The AqBanking library offers various import formats (called "profiles") of which you can choose one here. - + 'swift-mt940' SWIFT MT940 import data format This setting specifies the data format when importing SWIFT MT940 files. The AqBanking library offers various import formats (called "profiles") of which you can choose one here. - + 'swift-mt942' SWIFT MT942 import data format This setting specifies the data format when importing SWIFT MT942 files. The AqBanking library offers various import formats (called "profiles") of which you can choose one here. - + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - + - + (-1,-1,-1,-1) Last window position and size diff --git a/src/import-export/csv-export/assistant-csv-export.c b/src/import-export/csv-export/assistant-csv-export.c index ff160e7547..692035cb69 100644 --- a/src/import-export/csv-export/assistant-csv-export.c +++ b/src/import-export/csv-export/assistant-csv-export.c @@ -46,7 +46,7 @@ #include "csv-transactions-export.h" #define GNC_PREFS_GROUP "dialogs.export.csv" -#define GNC_PREF_PANED_POS "paned_position" +#define GNC_PREF_PANED_POS "paned-position" #define ASSISTANT_CSV_EXPORT_CM_CLASS "assistant-csv-export" /* This static indicates the debugging module that this .o belongs to. */ diff --git a/src/import-export/csv-export/gschemas/Makefile.am b/src/import-export/csv-export/gschemas/Makefile.am index 9f60ea9253..d9cdc32ab1 100644 --- a/src/import-export/csv-export/gschemas/Makefile.am +++ b/src/import-export/csv-export/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in b/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in index 7671f44a04..541e33b4cf 100644 --- a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in +++ b/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in @@ -7,12 +7,12 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - + 0 Window geometry The position of paned window when it was last closed. diff --git a/src/import-export/csv-import/gschemas/Makefile.am b/src/import-export/csv-import/gschemas/Makefile.am index f98d1e907a..3dbbb41b50 100644 --- a/src/import-export/csv-import/gschemas/Makefile.am +++ b/src/import-export/csv-import/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in b/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in index aca0e3b8e1..a7375fd73b 100644 --- a/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in +++ b/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in @@ -1,5 +1,5 @@ - + (-1,-1,-1,-1) Last window position and size @@ -7,7 +7,7 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. diff --git a/src/import-export/dialog-import.glade b/src/import-export/dialog-import.glade index cbdc33e279..d6f1136395 100644 --- a/src/import-export/dialog-import.glade +++ b/src/import-export/dialog-import.glade @@ -13,7 +13,7 @@ 10 4 - + Enable skip transaction action True True @@ -35,7 +35,7 @@ - + Enable update match action True True @@ -71,7 +71,7 @@ - + True True True @@ -99,7 +99,7 @@ - + True True True @@ -126,7 +126,7 @@ - + True True True @@ -153,7 +153,7 @@ - + True True True @@ -186,7 +186,7 @@ 0 Commercial ATM _fees threshold True - pref/dialogs.import.generic/atm_fee_threshold + pref/dialogs.import.generic/atm-fee-threshold 7 @@ -203,7 +203,7 @@ 0 Auto-c_lear threshold True - pref/dialogs.import.generic/auto_clear_threshold + pref/dialogs.import.generic/auto-clear-threshold 6 @@ -220,7 +220,7 @@ 0 Auto-_add threshold True - pref/dialogs.import.generic/auto_add_threshold + pref/dialogs.import.generic/auto-add-threshold 5 @@ -237,7 +237,7 @@ 0 Match _display threshold True - pref/dialogs.import.generic/match_threshold + pref/dialogs.import.generic/match-threshold 4 @@ -248,7 +248,7 @@ - + Use _bayesian matching True True @@ -270,7 +270,7 @@ - + Automatically create new commodities True True diff --git a/src/import-export/gschemas/Makefile.am b/src/import-export/gschemas/Makefile.am index 4198736c2a..1c138cbde1 100644 --- a/src/import-export/gschemas/Makefile.am +++ b/src/import-export/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in b/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in index 961c5bc05b..2ff4462865 100644 --- a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in +++ b/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in @@ -1,64 +1,64 @@ - - + + true Enable SKIP transaction action Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default. - + true Enable UPDATE match action Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default. - + true Use bayesian matching Enables bayesian matching when matching imported transaction against existing transactions. Otherwise a less sophisticated rule-based matching mechanism will be used. - + 1.0 Minimum score to be displayed This field specifies the minimum matching score a potential matching transaction must have to be displayed in the match list. - + 3.0 Add matching transactions below this score This field specifies the threshold below which a matching transaction will be added automatically. A transaction whose best match's score is in the red zone (above the display minimum score but below or equal to the Add match score) will be added to the GnuCash file by default. - + 6.0 Clear matching transactions above this score This field specifies the threshold above which a matching transaction will be cleared by default. A transaction whose best match's score is in the green zone (above or equal to this Clear threshold) will be cleared by default. - + 2.0 Maximum ATM fee amount in your area This field specifies the extra fee that is taken into account when matching imported transactions. In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match. - + false Automatically create new commodities Enables the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity. - - - + + + - - + + false Whether or not to display this column This setting controls wether the given column will be visible in the view. True means visible, false means hidden. - + 0 Width of this column This setting stores the width of the given column in pixels. - + (-1,-1,-1,-1) Last window position and size @@ -68,7 +68,7 @@ - + (-1,-1,-1,-1) Last window position and size diff --git a/src/import-export/import-main-matcher.c b/src/import-export/import-main-matcher.c index 421663a2b8..3793212a2b 100644 --- a/src/import-export/import-main-matcher.c +++ b/src/import-export/import-main-matcher.c @@ -50,7 +50,7 @@ #include "import-account-matcher.h" #include "app-utils/gnc-component-manager.h" -#define GNC_PREFS_GROUP "dialogs.import.generic.transaction_list" +#define GNC_PREFS_GROUP "dialogs.import.generic.transaction-list" struct _main_matcher_info { diff --git a/src/import-export/import-match-picker.c b/src/import-export/import-match-picker.c index 98ee97293f..01550bf130 100644 --- a/src/import-export/import-match-picker.c +++ b/src/import-export/import-match-picker.c @@ -41,7 +41,7 @@ * Constants * \********************************************************************/ -#define GNC_PREFS_GROUP "dialogs.import.generic.match_picker" +#define GNC_PREFS_GROUP "dialogs.import.generic.match-picker" enum downloaded_cols { diff --git a/src/import-export/import-utilities.h b/src/import-export/import-utilities.h index f8518049bc..fd0d599471 100644 --- a/src/import-export/import-utilities.h +++ b/src/import-export/import-utilities.h @@ -28,13 +28,13 @@ /** The preferences used by the importer */ #define GNC_PREFS_GROUP_IMPORT "dialogs.import.generic" -#define GNC_PREF_ENABLE_SKIP "enable_skip" -#define GNC_PREF_ENABLE_UPDATE "enable_update" -#define GNC_PREF_USE_BAYES "use_bayes" -#define GNC_PREF_ATM_FEE_THRESHOLD "atm_fee_threshold" -#define GNC_PREF_AUTO_CLEAR_THRESHOLD "auto_clear_threshold" -#define GNC_PREF_AUTO_ADD_THRESHOLD "auto_add_threshold" -#define GNC_PREF_MATCH_THRESHOLD "match_threshold" +#define GNC_PREF_ENABLE_SKIP "enable-skip" +#define GNC_PREF_ENABLE_UPDATE "enable-update" +#define GNC_PREF_USE_BAYES "use-bayes" +#define GNC_PREF_ATM_FEE_THRESHOLD "atm-fee-threshold" +#define GNC_PREF_AUTO_CLEAR_THRESHOLD "auto-clear-threshold" +#define GNC_PREF_AUTO_ADD_THRESHOLD "auto-add-threshold" +#define GNC_PREF_MATCH_THRESHOLD "match-threshold" #include "Account.h" diff --git a/src/import-export/log-replay/gnc-log-replay.c b/src/import-export/log-replay/gnc-log-replay.c index 8dfddf5b9b..d4ddaefce1 100644 --- a/src/import-export/log-replay/gnc-log-replay.c +++ b/src/import-export/log-replay/gnc-log-replay.c @@ -43,7 +43,7 @@ #include "gnc-ui-util.h" #include "gnc-gui-query.h" -#define GNC_PREFS_GROUP "dialogs.log_replay" +#define GNC_PREFS_GROUP "dialogs.log-replay" /* NW: If you want a new log_module, just define a unique string either in gnc-engine.h or diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c index 2a934a063a..56a407f045 100644 --- a/src/import-export/ofx/gnc-ofx-import.c +++ b/src/import-export/ofx/gnc-ofx-import.c @@ -54,7 +54,7 @@ #include "gnc-ofx-kvp.h" #define GNC_PREFS_GROUP "dialogs.import.ofx" -#define GNC_PREF_AUTO_COMMODITY "auto_create_commodity" +#define GNC_PREF_AUTO_COMMODITY "auto-create-commodity" static QofLogModule log_module = GNC_MOD_IMPORT; diff --git a/src/import-export/ofx/gschemas/Makefile.am b/src/import-export/ofx/gschemas/Makefile.am index 8fed20b3d8..1e26e636da 100644 --- a/src/import-export/ofx/gschemas/Makefile.am +++ b/src/import-export/ofx/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in b/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in index ac83c8a0e5..da9e030b9e 100644 --- a/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in +++ b/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in @@ -1,6 +1,6 @@ - - + + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. diff --git a/src/import-export/qif-import/assistant-qif-import.c b/src/import-export/qif-import/assistant-qif-import.c index 89c6d0eba1..e7da4ba1af 100644 --- a/src/import-export/qif-import/assistant-qif-import.c +++ b/src/import-export/qif-import/assistant-qif-import.c @@ -59,10 +59,10 @@ #define ASSISTANT_QIF_IMPORT_CM_CLASS "assistant-qif-import" #define GNC_PREFS_GROUP "dialogs.import.qif" -#define GNC_PREF_SHOW_DOC "show_doc" -#define GNC_PREF_DEFAULT_TRANS_STATUS_CLEARED "default_status-cleared" -#define GNC_PREF_DEFAULT_TRANS_STATUS_NOTCLEARED "default_status-notcleared" -#define GNC_PREF_DEFAULT_TRANS_STATUS_RECONCILED "default_status-reconciled" +#define GNC_PREF_SHOW_DOC "show-doc" +#define GNC_PREF_DEFAULT_TRANS_STATUS_CLEARED "default-status-cleared" +#define GNC_PREF_DEFAULT_TRANS_STATUS_NOTCLEARED "default-status-notcleared" +#define GNC_PREF_DEFAULT_TRANS_STATUS_RECONCILED "default-status-reconciled" #define PREV_ROW "prev_row" diff --git a/src/import-export/qif-import/dialog-account-picker.glade b/src/import-export/qif-import/dialog-account-picker.glade index 96ea73434b..e45699e2a2 100644 --- a/src/import-export/qif-import/dialog-account-picker.glade +++ b/src/import-export/qif-import/dialog-account-picker.glade @@ -26,7 +26,7 @@ - + _Show documentation True True @@ -48,7 +48,7 @@ - + _Reconciled True True @@ -70,7 +70,7 @@ - + _Cleared True True @@ -81,7 +81,7 @@ False True True - pref/dialogs.import.qif/default_status-reconciled + pref/dialogs.import.qif/default-status-reconciled 5 @@ -92,7 +92,7 @@ - + _Not cleared True True @@ -103,7 +103,7 @@ False True True - pref/dialogs.import.qif/default_status-reconciled + pref/dialogs.import.qif/default-status-reconciled 4 diff --git a/src/import-export/qif-import/gschemas/Makefile.am b/src/import-export/qif-import/gschemas/Makefile.am index 7dee29f303..b5faa3c0ed 100644 --- a/src/import-export/qif-import/gschemas/Makefile.am +++ b/src/import-export/qif-import/gschemas/Makefile.am @@ -5,12 +5,7 @@ gschema_in_files = \ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) -# During the conversion from GConf to GSettings we are using -# the gconf backend for GSettings. Allow the more liberal -# GConf key names for GSettings so both tools see the -# same settings -# FIXME this has to be removed once GConf is dropped. -GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name +#GLIB_COMPILE_SCHEMAS = glib-compile-schemas --allow-any-name @GSETTINGS_RULES@ diff --git a/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in b/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in index dc0f7a06c2..3b192d8a18 100644 --- a/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in +++ b/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in @@ -1,16 +1,16 @@ - - + + true Default QIF transaction status Default status for QIF transaction when not specified in QIF file. - + false Default QIF transaction status Default status for QIF transaction when not specified in QIF file. - + false When the status is not specified in a QIF file, the transactions are marked as reconciled. Default status for QIF transaction when not specified in QIF file. @@ -22,12 +22,12 @@ The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window. - + '' Last pathname used This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened. - + true Show documentation Show some documentation-only pages in QIF Import assistant. diff --git a/src/register/ledger-core/gnc-ledger-display.c b/src/register/ledger-core/gnc-ledger-display.c index c41067b09c..299c18b875 100644 --- a/src/register/ledger-core/gnc-ledger-display.c +++ b/src/register/ledger-core/gnc-ledger-display.c @@ -46,11 +46,11 @@ #define REGISTER_GL_CM_CLASS "register-gl" #define REGISTER_TEMPLATE_CM_CLASS "register-template" -#define GNC_PREF_DOUBLE_LINE_MODE "double_line_mode" -#define GNC_PREF_MAX_TRANS "max_transactions" -#define GNC_PREF_DEFAULT_STYLE_LEDGER "default_style-ledger" -#define GNC_PREF_DEFAULT_STYLE_AUTOLEDGER "default_style-autoledger" -#define GNC_PREF_DEFAULT_STYLE_JOURNAL "default_style-journal" +#define GNC_PREF_DOUBLE_LINE_MODE "double-line-mode" +#define GNC_PREF_MAX_TRANS "max-transactions" +#define GNC_PREF_DEFAULT_STYLE_LEDGER "default-style-ledger" +#define GNC_PREF_DEFAULT_STYLE_AUTOLEDGER "default-style-autoledger" +#define GNC_PREF_DEFAULT_STYLE_JOURNAL "default-style-journal" struct gnc_ledger_display diff --git a/src/register/ledger-core/gnc-ledger-display2.c b/src/register/ledger-core/gnc-ledger-display2.c index 585ced3895..3ee7c35fa0 100644 --- a/src/register/ledger-core/gnc-ledger-display2.c +++ b/src/register/ledger-core/gnc-ledger-display2.c @@ -50,11 +50,11 @@ #define REGISTER_GL_CM_CLASS "register-gl" #define REGISTER_TEMPLATE_CM_CLASS "register-template" -#define GNC_PREF_DOUBLE_LINE_MODE "double_line_mode" -#define GNC_PREF_MAX_TRANS "max_transactions" -#define GNC_PREF_DEFAULT_STYLE_LEDGER "default_style-ledger" -#define GNC_PREF_DEFAULT_STYLE_AUTOLEDGER "default_style-autoledger" -#define GNC_PREF_DEFAULT_STYLE_JOURNAL "default_style-journal" +#define GNC_PREF_DOUBLE_LINE_MODE "double-line-mode" +#define GNC_PREF_MAX_TRANS "max-transactions" +#define GNC_PREF_DEFAULT_STYLE_LEDGER "default-style-ledger" +#define GNC_PREF_DEFAULT_STYLE_AUTOLEDGER "default-style-autoledger" +#define GNC_PREF_DEFAULT_STYLE_JOURNAL "default-style-journal" struct gnc_ledger_display2 diff --git a/src/register/register-gnome/combocell-gnome.c b/src/register/register-gnome/combocell-gnome.c index ed16fe6b65..ecdbd5e06b 100644 --- a/src/register/register-gnome/combocell-gnome.c +++ b/src/register/register-gnome/combocell-gnome.c @@ -47,7 +47,7 @@ #include "gnucash-sheetP.h" #include "table-allgui.h" -#define GNC_PREF_AUTO_RAISE_LISTS "auto_raise_lists" +#define GNC_PREF_AUTO_RAISE_LISTS "auto-raise-lists" typedef struct _PopBox { diff --git a/src/report/report-gnome/gnc-plugin-page-report.c b/src/report/report-gnome/gnc-plugin-page-report.c index 327050e5de..1472003b97 100644 --- a/src/report/report-gnome/gnc-plugin-page-report.c +++ b/src/report/report-gnome/gnc-plugin-page-report.c @@ -1613,9 +1613,9 @@ static GncInvoice *lookup_invoice(GncPluginPageReportPrivate *priv) "Invoice Number", NULL); } -#define GNC_PREFS_GROUP_REPORT_PDFEXPORT GNC_PREFS_GROUP_GENERAL_REPORT "/pdf_export" -#define GNC_PREF_FILENAME_DATE_FMT "filename_date_format" -#define GNC_PREF_FILENAME_FMT "filename_format" +#define GNC_PREFS_GROUP_REPORT_PDFEXPORT GNC_PREFS_GROUP_GENERAL_REPORT "/pdf-export" +#define GNC_PREF_FILENAME_DATE_FMT "filename-date-format" +#define GNC_PREF_FILENAME_FMT "filename-format" static gchar *report_create_jobname(GncPluginPageReportPrivate *priv) {