r23266 - gnucash/trunk/src - Gnc-Prefs: rename preferences to be compliant with gsettings syntax rules
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 7 10:30:20 EDT 2013
Author: gjanssens
Date: 2013-10-07 10:30:10 -0400 (Mon, 07 Oct 2013)
New Revision: 23266
Trac: http://svn.gnucash.org/trac/changeset/23266
Modified:
gnucash/trunk/src/app-utils/gnc-accounting-period.c
gnucash/trunk/src/app-utils/gnc-prefs-utils.c
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/app-utils/gnc-ui-util.h
gnucash/trunk/src/business/business-gnome/dialog-customer.c
gnucash/trunk/src/business/business-gnome/dialog-employee.c
gnucash/trunk/src/business/business-gnome/dialog-invoice.c
gnucash/trunk/src/business/business-gnome/dialog-job.c
gnucash/trunk/src/business/business-gnome/dialog-order.c
gnucash/trunk/src/business/business-gnome/dialog-vendor.c
gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
gnucash/trunk/src/business/business-gnome/gschemas/Makefile.am
gnucash/trunk/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
gnucash/trunk/src/business/business-gnome/gtkbuilder/business-prefs.glade
gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c
gnucash/trunk/src/core-utils/gnc-prefs.h
gnucash/trunk/src/gnome-search/dialog-search.c
gnucash/trunk/src/gnome-utils/dialog-preferences.c
gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c
gnucash/trunk/src/gnome-utils/dialog-tax-table.c
gnucash/trunk/src/gnome-utils/dialog-totd.c
gnucash/trunk/src/gnome-utils/gnc-autosave.c
gnucash/trunk/src/gnome-utils/gnc-main-window.c
gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
gnucash/trunk/src/gnome-utils/gnc-splash.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c
gnucash/trunk/src/gnome-utils/gschemas/Makefile.am
gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in
gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in
gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade
gnucash/trunk/src/gnome-utils/window-main-summarybar.c
gnucash/trunk/src/gnome/assistant-hierarchy.c
gnucash/trunk/src/gnome/dialog-commodities.c
gnucash/trunk/src/gnome/dialog-lot-viewer.c
gnucash/trunk/src/gnome/dialog-new-user.h
gnucash/trunk/src/gnome/dialog-price-edit-db.c
gnucash/trunk/src/gnome/dialog-price-editor.c
gnucash/trunk/src/gnome/dialog-print-check.c
gnucash/trunk/src/gnome/dialog-print-check2.c
gnucash/trunk/src/gnome/dialog-sx-editor.h
gnucash/trunk/src/gnome/dialog-sx-editor2.h
gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
gnucash/trunk/src/gnome/dialog-tax-info.c
gnucash/trunk/src/gnome/gschemas/Makefile.am
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in
gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in
gnucash/trunk/src/gnome/gtkbuilder/dialog-sx.glade
gnucash/trunk/src/gnome/reconcile-view.c
gnucash/trunk/src/gnome/window-reconcile.c
gnucash/trunk/src/gnome/window-reconcile2.c
gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c
gnucash/trunk/src/import-export/aqbanking/dialog-ab.glade
gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h
gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
gnucash/trunk/src/import-export/aqbanking/gschemas/Makefile.am
gnucash/trunk/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c
gnucash/trunk/src/import-export/csv-export/gschemas/Makefile.am
gnucash/trunk/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
gnucash/trunk/src/import-export/csv-import/gschemas/Makefile.am
gnucash/trunk/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
gnucash/trunk/src/import-export/dialog-import.glade
gnucash/trunk/src/import-export/gschemas/Makefile.am
gnucash/trunk/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
gnucash/trunk/src/import-export/import-main-matcher.c
gnucash/trunk/src/import-export/import-match-picker.c
gnucash/trunk/src/import-export/import-utilities.h
gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c
gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
gnucash/trunk/src/import-export/ofx/gschemas/Makefile.am
gnucash/trunk/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
gnucash/trunk/src/import-export/qif-import/dialog-account-picker.glade
gnucash/trunk/src/import-export/qif-import/gschemas/Makefile.am
gnucash/trunk/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c
gnucash/trunk/src/register/ledger-core/gnc-ledger-display2.c
gnucash/trunk/src/register/register-gnome/combocell-gnome.c
gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
Log:
Gnc-Prefs: rename preferences to be compliant with gsettings syntax rules
Syntax changes in short:
1. replace all _ with - in preference keys and groups (_ is not allowed)
2. base path should be /org/gnucash instead of /apps/gnucash
Modified: gnucash/trunk/src/app-utils/gnc-accounting-period.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-accounting-period.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/app-utils/gnc-accounting-period.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 @@
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 @@
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)
Modified: gnucash/trunk/src/app-utils/gnc-prefs-utils.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-prefs-utils.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/app-utils/gnc-prefs-utils.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 *
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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;
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -47,11 +47,11 @@
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 **********************************************/
Modified: gnucash/trunk/src/business/business-gnome/dialog-customer.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-customer.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/dialog-customer.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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);
Modified: gnucash/trunk/src/business/business-gnome/dialog-employee.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-employee.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/dialog-employee.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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);
Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/business/business-gnome/dialog-job.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-job.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/dialog-job.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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);
Modified: gnucash/trunk/src/business/business-gnome/dialog-order.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-order.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/dialog-order.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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);
Modified: gnucash/trunk/src/business/business-gnome/dialog-vendor.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-vendor.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/dialog-vendor.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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);
Modified: gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -132,8 +132,8 @@
#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
Modified: gnucash/trunk/src/business/business-gnome/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
===================================================================
--- gnucash/trunk/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,17 +1,17 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.business" path="/apps/gnucash/dialogs/business/">
- <child name="customer_search" schema="org.gnucash.dialogs.business.customer_search"/>
- <child name="employee_search" schema="org.gnucash.dialogs.business.employee_search"/>
- <child name="invoice_search" schema="org.gnucash.dialogs.business.invoice_search"/>
- <child name="job_search" schema="org.gnucash.dialogs.business.job_search"/>
- <child name="order_search" schema="org.gnucash.dialogs.business.order_search"/>
- <child name="vendor_search" schema="org.gnucash.dialogs.business.vendor_search"/>
+ <schema id="org.gnucash.dialogs.business" path="/org/gnucash/dialogs/business/">
+ <child name="customer-search" schema="org.gnucash.dialogs.business.customer-search"/>
+ <child name="employee-search" schema="org.gnucash.dialogs.business.employee-search"/>
+ <child name="invoice-search" schema="org.gnucash.dialogs.business.invoice-search"/>
+ <child name="job-search" schema="org.gnucash.dialogs.business.job-search"/>
+ <child name="order-search" schema="org.gnucash.dialogs.business.order-search"/>
+ <child name="vendor-search" schema="org.gnucash.dialogs.business.vendor-search"/>
<child name="invoice" schema="org.gnucash.dialogs.business.invoice"/>
<child name="bill" schema="org.gnucash.dialogs.business.bill"/>
- <child name="tax_tables" schema="org.gnucash.dialogs.business.tax_tables"/>
+ <child name="tax-tables" schema="org.gnucash.dialogs.business.tax-tables"/>
</schema>
- <schema id="org.gnucash.dialogs.business.customer_search" path="/apps/gnucash/dialogs/business/customer_search/">
+ <schema id="org.gnucash.dialogs.business.customer-search" path="/org/gnucash/dialogs/business/customer-search/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.employee_search" path="/apps/gnucash/dialogs/business/employee_search/">
+ <schema id="org.gnucash.dialogs.business.employee-search" path="/org/gnucash/dialogs/business/employee-search/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.invoice_search" path="/apps/gnucash/dialogs/business/invoice_search/">
+ <schema id="org.gnucash.dialogs.business.invoice-search" path="/org/gnucash/dialogs/business/invoice-search/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.job_search" path="/apps/gnucash/dialogs/business/job_search/">
+ <schema id="org.gnucash.dialogs.business.job-search" path="/org/gnucash/dialogs/business/job-search/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.order_search" path="/apps/gnucash/dialogs/business/order_search/">
+ <schema id="org.gnucash.dialogs.business.order-search" path="/org/gnucash/dialogs/business/order-search/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.vendor_search" path="/apps/gnucash/dialogs/business/vendor_search/">
+ <schema id="org.gnucash.dialogs.business.vendor-search" path="/org/gnucash/dialogs/business/vendor-search/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.invoice" path="/apps/gnucash/dialogs/business/invoice/">
- <key name="tax_included" type="b">
+ <schema id="org.gnucash.dialogs.business.invoice" path="/org/gnucash/dialogs/business/invoice/">
+ <key name="tax-included" type="b">
<default>true</default>
<summary>Is tax included in this type of business entry?</summary>
<description>If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors.</description>
</key>
- <key name="enable_toolbuttons" type="b">
+ <key name="enable-toolbuttons" type="b">
<default>false</default>
<summary>Enable extra toolbar buttons for business</summary>
<description>If active, extra toolbar buttons for common business functions are shown as well. Otherwise they are not shown.</description>
</key>
- <key name="invoice_printreport" type="i">
+ <key name="invoice-printreport" type="i">
<default>0</default>
<summary>The invoice report to be used for printing</summary>
<description>The name of the report to be used for invoice printing.</description>
</key>
- <key name="use_new_window" type="b">
+ <key name="use-new-window" type="b">
<default>false</default>
<summary>Open new invoice in new window</summary>
<description>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.</description>
</key>
- <key name="accumulate_splits" type="b">
+ <key name="accumulate-splits" type="b">
<default>true</default>
<summary>Accumulate multiple splits into one</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.bill" path="/apps/gnucash/dialogs/business/bill/">
- <key name="tax_included" type="b">
+ <schema id="org.gnucash.dialogs.business.bill" path="/org/gnucash/dialogs/business/bill/">
+ <key name="tax-included" type="b">
<default>true</default>
<summary>Is tax included in this type of business entry?</summary>
<description>If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors.</description>
</key>
- <key name="notify_when_due" type="b">
+ <key name="notify-when-due" type="b">
<default>true</default>
<summary>Show bills due reminder at startup</summary>
<description>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.</description>
</key>
- <key name="days_in_advance" type="d">
+ <key name="days-in-advance" type="d">
<default>7.0</default>
<summary>Show bills due within this many days</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.business.tax_tables" path="/apps/gnucash/dialogs/business/tax_tables/">
+ <schema id="org.gnucash.dialogs.business.tax-tables" path="/org/gnucash/dialogs/business/tax-tables/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
Modified: gnucash/trunk/src/business/business-gnome/gtkbuilder/business-prefs.glade
===================================================================
--- gnucash/trunk/src/business/business-gnome/gtkbuilder/business-prefs.glade 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-gnome/gtkbuilder/business-prefs.glade 2013-10-07 14:30:10 UTC (rev 23266)
@@ -44,7 +44,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.business.bill/tax_included">
+ <object class="GtkCheckButton" id="pref/dialogs.business.bill/tax-included">
<property name="label" translatable="yes">Ta_x included</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -65,7 +65,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.business.bill/days_in_advance">
+ <object class="GtkSpinButton" id="pref/dialogs.business.bill/days-in-advance">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -97,7 +97,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Days in advance:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.business.bill/days_in_advance</property>
+ <property name="mnemonic_widget">pref/dialogs.business.bill/days-in-advance</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -109,7 +109,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.business.bill/notify_when_due">
+ <object class="GtkCheckButton" id="pref/dialogs.business.bill/notify-when-due">
<property name="label" translatable="yes">_Notify when due</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -160,7 +160,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.business.invoice/tax_included">
+ <object class="GtkCheckButton" id="pref/dialogs.business.invoice/tax-included">
<property name="label" translatable="yes">_Tax included</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -182,7 +182,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.business.invoice/accumulate_splits">
+ <object class="GtkCheckButton" id="pref/dialogs.business.invoice/accumulate-splits">
<property name="label" translatable="yes">_Accumulate splits on post</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -204,7 +204,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.business.invoice/use_new_window">
+ <object class="GtkCheckButton" id="pref/dialogs.business.invoice/use-new-window">
<property name="label" translatable="yes">_Open in new window</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -240,7 +240,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.business.invoice/enable_toolbuttons">
+ <object class="GtkCheckButton" id="pref/dialogs.business.invoice/enable-toolbuttons">
<property name="label" translatable="yes">Enable extra _buttons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -262,7 +262,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="pref/dialogs.business.invoice/invoice_printreport">
+ <object class="GtkComboBox" id="pref/dialogs.business.invoice/invoice-printreport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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)
Modified: gnucash/trunk/src/core-utils/gnc-prefs.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-prefs.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/core-utils/gnc-prefs.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
@{
Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
{
Modified: gnucash/trunk/src/gnome/dialog-commodities.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-commodities.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-commodities.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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; */
Modified: gnucash/trunk/src/gnome/dialog-lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-lot-viewer.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-lot-viewer.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -82,9 +82,9 @@
#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
{
Modified: gnucash/trunk/src/gnome/dialog-new-user.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-new-user.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-new-user.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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);
Modified: gnucash/trunk/src/gnome/dialog-price-edit-db.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-edit-db.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-price-edit-db.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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;
Modified: gnucash/trunk/src/gnome/dialog-price-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-editor.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-price-editor.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-print-check.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/gnome/dialog-print-check2.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check2.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-print-check2.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/gnome/dialog-sx-editor.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-sx-editor.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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;
Modified: gnucash/trunk/src/gnome/dialog-sx-editor2.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor2.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-sx-editor2.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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;
Modified: gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-since-last-run.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-sx-since-last-run.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -61,8 +61,8 @@
#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
{
Modified: gnucash/trunk/src/gnome/dialog-tax-info.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-tax-info.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/dialog-tax-info.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
{
Modified: gnucash/trunk/src/gnome/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -15,12 +15,7 @@
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@
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,106 +1,106 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.checkprinting" path="/apps/gnucash/dialogs/print_checks/">
- <key name="check_format_guid" type="s">
+ <schema id="org.gnucash.dialogs.checkprinting" path="/org/gnucash/dialogs/print-checks/">
+ <key name="check-format-guid" type="s">
<default>''</default>
<summary>GUID of predefined check format to use</summary>
<description>This value specifies the predefined check format to use. The number is the guid of a known check format.</description>
</key>
- <key name="check_position" type="i">
+ <key name="check-position" type="i">
<default>0</default>
<summary>Which check position to print</summary>
<description>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.</description>
</key>
- <key name="first_page_count" type="i">
+ <key name="first-page-count" type="i">
<default>0</default>
<summary>Number of checks to print on the first page.</summary>
<description>Number of checks to print on the first page.</description>
</key>
- <key name="date_format" type="i">
+ <key name="date-format" type="i">
<default>0</default>
<summary>Date format to use</summary>
<description>This is the numerical identifier of the predefined date format to use.</description>
</key>
- <key name="date_format_user" type="s">
+ <key name="date-format-user" type="s">
<default>'0'</default>
<summary>Custom date format</summary>
- <description>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".</description>
+ <description>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".</description>
</key>
- <key name="custom_units" type="i">
+ <key name="custom-units" type="i">
<default>0</default>
<summary>Units in which the custom coordinates are expressed</summary>
<description>Units in which the custom coordinates are expressed (inches, mm, ...).</description>
</key>
- <key name="custom_payee" type="(dd)">
+ <key name="custom-payee" type="(dd)">
<default>(0,0)</default>
<summary>Position of payee name</summary>
<description>This value contains the X,Y coordinates for the start of the payee line on the check.</description>
</key>
- <key name="custom_date" type="(dd)">
+ <key name="custom-date" type="(dd)">
<default>(0,0)</default>
<summary>Position of date line</summary>
<description>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.</description>
</key>
- <key name="custom_amount_words" type="(dd)">
+ <key name="custom-amount-words" type="(dd)">
<default>(0,0)</default>
<summary>Position of check amount in words</summary>
<description>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.</description>
</key>
- <key name="custom_amount_number" type="(dd)">
+ <key name="custom-amount-number" type="(dd)">
<default>(0,0)</default>
<summary>Position of check amount in numbers</summary>
<description>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.</description>
</key>
- <key name="custom_address" type="(dd)">
+ <key name="custom-address" type="(dd)">
<default>(0,0)</default>
<summary>Position of payee address</summary>
<description>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.</description>
</key>
- <key name="custom_notes" type="(dd)">
+ <key name="custom-notes" type="(dd)">
<default>(0,0)</default>
<summary>Position of notes line</summary>
<description>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.</description>
</key>
- <key name="custom_memo" type="(dd)">
+ <key name="custom-memo" type="(dd)">
<default>(0,0)</default>
<summary>Position of memo line</summary>
<description>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.</description>
</key>
- <key name="custom_translation" type="(dd)">
+ <key name="custom-translation" type="(dd)">
<default>(0,0)</default>
<summary>Offset for complete check</summary>
<description>This value contains the X,Y offset for the complete check. Coordinates are from the lower left corner of the specified check position.</description>
</key>
- <key name="custom_rotation" type="d">
+ <key name="custom-rotation" type="d">
<default>0.0</default>
<summary>Rotation angle</summary>
<description>Number of degrees to rotate the check.</description>
</key>
- <key name="splits_amount" type="(dd)">
+ <key name="splits-amount" type="(dd)">
<default>(0,0)</default>
<summary>Position of split's amount in numbers</summary>
<description>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.</description>
</key>
- <key name="splits_memo" type="(dd)">
+ <key name="splits-memo" type="(dd)">
<default>(0,0)</default>
<summary>Position of split's memo line</summary>
<description>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.</description>
</key>
- <key name="splits_account" type="(dd)">
+ <key name="splits-account" type="(dd)">
<default>(0,0)</default>
<summary>Position of split's account line</summary>
<description>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.</description>
</key>
- <key name="print_date_format" type="b">
+ <key name="print-date-format" type="b">
<default>false</default>
<summary>Print the date format below the date.</summary>
<description>Each time the date is printed, print the date format immediately below in 8 point type using the characters Y, M, and D.</description>
</key>
- <key name="default_font" type="s">
+ <key name="default-font" type="s">
<default>'sans 10'</default>
<summary>The default check printing font</summary>
<description>The default font to use when printing checks. This value will be overridden by any font specified in a check description file.</description>
</key>
- <key name="blocking_chars" type="b">
+ <key name="blocking-chars" type="b">
<default>false</default>
<summary>Print '***' before and after text.</summary>
<description>Print '***' before and after text.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,71 +1,71 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.commodities" path="/apps/gnucash/dialogs/edit_commodities/">
- <key name="column_order" type="as">
+ <schema id="org.gnucash.dialogs.commodities" path="/org/gnucash/dialogs/edit-commodities/">
+ <key name="column-order" type="as">
<default>[ 'namespace', 'symbol', 'name', 'printname', 'uniquename', 'cusip_code', 'fraction', 'quote_flag', 'quote_source', 'quote_timezone' ]</default>
<summary>Order of columns in the dialog</summary>
<description>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.</description>
</key>
- <key name="namespace_visible" type="b">
+ <key name="namespace-visible" type="b">
<default>true</default>
<summary>Show the Namespace column</summary>
<description>Show the Namespace column</description>
</key>
- <key name="symbol_visible" type="b">
+ <key name="symbol-visible" type="b">
<default>true</default>
<summary>Show the symbol column</summary>
<description>Show the symbol column</description>
</key>
- <key name="name_visible" type="b">
+ <key name="name-visible" type="b">
<default>true</default>
<summary>Show the name column</summary>
<description>Show the name column</description>
</key>
- <key name="fullname_visible" type="b">
+ <key name="fullname-visible" type="b">
<default>false</default>
<summary>Show the Full Name column</summary>
<description>Show the Full Name column</description>
</key>
- <key name="printname_visible" type="b">
+ <key name="printname-visible" type="b">
<default>false</default>
<summary>Show the Print Name column</summary>
<description>Show the Print Name column</description>
</key>
- <key name="uniquename_visible" type="b">
+ <key name="uniquename-visible" type="b">
<default>false</default>
<summary>Show the Unique Name column</summary>
<description>Show the Unique Name column</description>
</key>
- <key name="cusip_code_visible" type="b">
+ <key name="cusip-code-visible" type="b">
<default>true</default>
<summary>Show the ISIN/CUSIP Code (Exchange Specific Data) column</summary>
<description>Show the ISIN/CUSIP Code (Exchange Specific Data) column</description>
</key>
- <key name="fraction_visible" type="b">
+ <key name="fraction-visible" type="b">
<default>true</default>
<summary>Show the fraction column</summary>
<description>Show the fraction column</description>
</key>
- <key name="quote_flag_visible" type="b">
+ <key name="quote-flag-visible" type="b">
<default>false</default>
<summary>Show the Quote Flag column</summary>
<description>Show the Quote Flag column</description>
</key>
- <key name="quote_source_visible" type="b">
+ <key name="quote-source-visible" type="b">
<default>false</default>
<summary>Show the Quote Source column</summary>
<description>Show the Quote Source column</description>
</key>
- <key name="quote_timezone_visible" type="b">
+ <key name="quote-timezone-visible" type="b">
<default>false</default>
<summary>Show the Quote Timezone column</summary>
<description>Show the Quote Timezone column</description>
</key>
- <key name="cusip_code_width" type="i">
+ <key name="cusip-code-width" type="i">
<default>0</default>
<summary>Width of this column</summary>
<description>This setting stores the width of the given column in pixels.</description>
</key>
- <key name="include_iso" type="b">
+ <key name="include-iso" type="b">
<default>false</default>
<summary>Show currencies in this dialog</summary>
<description>Show currencies in this dialog</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,27 +1,27 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs" path="/apps/gnucash/dialogs/">
+ <schema id="org.gnucash.dialogs" path="/org/gnucash/dialogs/">
<child name="account" schema="org.gnucash.dialogs.account"/>
- <child name="edit_commodities" schema="org.gnucash.dialogs.edit_commodities"/>
- <child name="edit_prices" schema="org.gnucash.dialogs.edit_prices"/>
+ <child name="edit-commodities" schema="org.gnucash.dialogs.edit-commodities"/>
+ <child name="edit-prices" schema="org.gnucash.dialogs.edit-prices"/>
<child name="preferences" schema="org.gnucash.dialogs.preferences"/>
- <child name="price_editor" schema="org.gnucash.dialogs.price_editor"/>
- <child name="reset_warnings" schema="org.gnucash.dialogs.reset_warnings"/>
- <child name="tax_info" schema="org.gnucash.dialogs.tax_info"/>
- <child name="tip_of_the_day" schema="org.gnucash.dialogs.tip_of_the_day"/>
+ <child name="price-editor" schema="org.gnucash.dialogs.price-editor"/>
+ <child name="reset-warnings" schema="org.gnucash.dialogs.reset-warnings"/>
+ <child name="tax-info" schema="org.gnucash.dialogs.tax-info"/>
+ <child name="tip-of-the-day" schema="org.gnucash.dialogs.tip-of-the-day"/>
<child name="fincalc" schema="org.gnucash.dialogs.fincalc"/>
<child name="find" schema="org.gnucash.dialogs.find"/>
- <child name="export_accounts" schema="org.gnucash.dialogs.export_accounts"/>
- <child name="log_replay" schema="org.gnucash.dialogs.log_replay"/>
- <child name="open_save" schema="org.gnucash.dialogs.open_save"/>
+ <child name="export-accounts" schema="org.gnucash.dialogs.export-accounts"/>
+ <child name="log-replay" schema="org.gnucash.dialogs.log-replay"/>
+ <child name="open-save" schema="org.gnucash.dialogs.open-save"/>
<child name="report" schema="org.gnucash.dialogs.report"/>
- <child name="lot_viewer" schema="org.gnucash.dialogs.lot_viewer"/>
- <child name="new_user" schema="org.gnucash.dialogs.new_user"/>
- <child name="new_hierarchy" schema="org.gnucash.dialogs.new_hierarchy"/>
+ <child name="lot-viewer" schema="org.gnucash.dialogs.lot-viewer"/>
+ <child name="new-user" schema="org.gnucash.dialogs.new-user"/>
+ <child name="new-hierarchy" schema="org.gnucash.dialogs.new-hierarchy"/>
<child name="search" schema="org.gnucash.dialogs.search"/>
<child name="transfer" schema="org.gnucash.dialogs.transfer"/>
</schema>
- <schema id="org.gnucash.dialogs.account" path="/apps/gnucash/dialogs/account/">
+ <schema id="org.gnucash.dialogs.account" path="/org/gnucash/dialogs/account/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -31,7 +31,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.edit_prices" path="/apps/gnucash/dialogs/edit_prices/">
+ <schema id="org.gnucash.dialogs.edit-prices" path="/org/gnucash/dialogs/edit-prices/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -41,7 +41,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.preferences" path="/apps/gnucash/dialogs/preferences/">
+ <schema id="org.gnucash.dialogs.preferences" path="/org/gnucash/dialogs/preferences/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -51,7 +51,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.price_editor" path="/apps/gnucash/dialogs/price_editor/">
+ <schema id="org.gnucash.dialogs.price-editor" path="/org/gnucash/dialogs/price-editor/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -61,7 +61,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.reset_warnings" path="/apps/gnucash/dialogs/reset_warnings/">
+ <schema id="org.gnucash.dialogs.reset-warnings" path="/org/gnucash/dialogs/reset-warnings/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -71,8 +71,8 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.tax_info" path="/apps/gnucash/dialogs/tax_info/">
- <key name="paned_position" type="i">
+ <schema id="org.gnucash.dialogs.tax-info" path="/org/gnucash/dialogs/tax-info/">
+ <key name="paned-position" type="i">
<default>0</default>
<summary>Position of the horizontal pane divider.</summary>
<description>Position of the horizontal pane divider.</description>
@@ -86,7 +86,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.tip_of_the_day" path="/apps/gnucash/dialogs/tip_of_the_day/">
+ <schema id="org.gnucash.dialogs.tip-of-the-day" path="/org/gnucash/dialogs/tip-of-the-day/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -96,7 +96,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.fincalc" path="/apps/gnucash/dialogs/fincalc/">
+ <schema id="org.gnucash.dialogs.fincalc" path="/org/gnucash/dialogs/fincalc/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -106,7 +106,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.find" path="/apps/gnucash/dialogs/find/">
+ <schema id="org.gnucash.dialogs.find" path="/org/gnucash/dialogs/find/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="search_for_active_only" type="b">
+ <key name="search-for-active-only" type="b">
<default>false</default>
<summary>Search only in active items</summary>
<description>This setting indicates whether to search in all items in the current class, or only in 'active' items in the current class.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.export_accounts" path="/apps/gnucash/dialogs/export_accounts/">
- <key name="last_path" type="s">
+ <schema id="org.gnucash.dialogs.export-accounts" path="/org/gnucash/dialogs/export-accounts/">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.log_replay" path="/apps/gnucash/dialogs/log_replay/">
- <key name="last_path" type="s">
+ <schema id="org.gnucash.dialogs.log-replay" path="/org/gnucash/dialogs/log-replay/">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.open_save" path="/apps/gnucash/dialogs/open_save/">
- <key name="last_path" type="s">
+ <schema id="org.gnucash.dialogs.open-save" path="/org/gnucash/dialogs/open-save/">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.report" path="/apps/gnucash/dialogs/report/">
- <key name="last_path" type="s">
+ <schema id="org.gnucash.dialogs.report" path="/org/gnucash/dialogs/report/">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.edit_commodities" path="/apps/gnucash/dialogs/edit_commodities/">
+ <schema id="org.gnucash.dialogs.edit-commodities" path="/org/gnucash/dialogs/edit-commodities/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="sort_column" type="as">
+ <key name="sort-column" type="as">
<default>[]</default>
<summary>Columns used for sorting</summary>
- <description>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'.</description>
+ <description>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'.</description>
</key>
- <key name="sort_order" type="as">
+ <key name="sort-order" type="as">
<default>[]</default>
<summary>Sort column ascending or descending</summary>
<description>This setting indicates how the key column is sorted. Possible values for this setting are 'ascending' and 'descending'.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.lot_viewer" path="/apps/gnucash/dialogs/lot_viewer/">
- <key name="hpane_position" type="i">
+ <schema id="org.gnucash.dialogs.lot-viewer" path="/org/gnucash/dialogs/lot-viewer/">
+ <key name="hpane-position" type="i">
<default>200</default>
<summary>Position of the horizontal pane divider.</summary>
<description>Position of the horizontal pane divider.</description>
</key>
- <key name="vpane_position" type="i">
+ <key name="vpane-position" type="i">
<default>200</default>
<summary>Position of the vertical pane divider.</summary>
<description>Position of the vertical pane divider.</description>
@@ -193,15 +193,15 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.new_user" path="/apps/gnucash/dialogs/new_user/">
- <key name="first_startup" type="b">
+ <schema id="org.gnucash.dialogs.new-user" path="/org/gnucash/dialogs/new-user/">
+ <key name="first-startup" type="b">
<default>true</default>
<summary>Show the new user window</summary>
<description>If active, the new user window will be shown. Otherwise it will not be shown.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.new_hierarchy" path="/apps/gnucash/dialogs/new_hierarchy/">
+ <schema id="org.gnucash.dialogs.new-hierarchy" path="/org/gnucash/dialogs/new-hierarchy/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="show_on_new_file" type="b">
+ <key name="show-on-new-file" type="b">
<default>true</default>
<summary>New hierarchy window on "New File"</summary>
<description>If active, the "New Hierarchy" window will be shown whenever the "New File" menu item is chosen. Otherwise it will not be shown.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.search" path="/apps/gnucash/dialogs/search/">
- <key name="new_search_limit" type="d">
+ <schema id="org.gnucash.dialogs.search" path="/org/gnucash/dialogs/search/">
+ <key name="new-search-limit" type="d">
<default>1.0</default>
<summary>Default to 'new search' if fewer than this number of items is returned</summary>
<description>Default to 'new search' if fewer than this number of items is returned</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.transfer" path="/apps/gnucash/dialogs/transfer/">
+ <schema id="org.gnucash.dialogs.transfer" path="/org/gnucash/dialogs/transfer/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,16 +1,16 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.prices" path="/apps/gnucash/dialogs/edit_prices/">
- <key name="column_order" type="as">
+ <schema id="org.gnucash.dialogs.prices" path="/org/gnucash/dialogs/edit-prices/">
+ <key name="column-order" type="as">
<default>[ 'commodity', 'currency', 'date', 'source', 'type', 'price' ]</default>
<summary>Order of columns in the dialog</summary>
<description>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.</description>
</key>
- <key name="commodity_visible" type="b">
+ <key name="commodity-visible" type="b">
<default>true</default>
<summary>Display this column</summary>
<description>This setting controls wether the given column will be visible in the view. TRUE means visible, FALSE means hidden.</description>
</key>
- <key name="commodity_width" type="i">
+ <key name="commodity-width" type="i">
<default>0</default>
<summary>Width of this column</summary>
<description>This setting stores the width of the given column in pixels.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,21 +1,21 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.reconcile" path="/apps/gnucash/dialogs/reconcile/">
- <key name="check_cleared" type="b">
+ <schema id="org.gnucash.dialogs.reconcile" path="/org/gnucash/dialogs/reconcile/">
+ <key name="check-cleared" type="b">
<default>true</default>
<summary>Pre-select cleared transactions</summary>
<description>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.</description>
</key>
- <key name="auto_interest_transfer" type="b">
+ <key name="auto-interest-transfer" type="b">
<default>false</default>
<summary>Prompt for interest charges</summary>
<description>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.</description>
</key>
- <key name="auto_cc_payment" type="b">
+ <key name="auto-cc-payment" type="b">
<default>true</default>
<summary>Prompt for credit card payment</summary>
<description>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.</description>
</key>
- <key name="always_reconcile_to_today" type="b">
+ <key name="always-reconcile-to-today" type="b">
<default>false</default>
<summary>Always reconcile to today</summary>
<description>If active, always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,10 +1,10 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.sxs" path="/apps/gnucash/dialogs/scheduled_trans/">
- <child name="since_last_run" schema="org.gnucash.dialogs.sxs.since_last_run"/>
- <child name="transaction_editor" schema="org.gnucash.dialogs.sxs.transaction_editor"/>
+ <schema id="org.gnucash.dialogs.sxs" path="/org/gnucash/dialogs/scheduled-trans/">
+ <child name="since-last-run" schema="org.gnucash.dialogs.sxs.since-last-run"/>
+ <child name="transaction-editor" schema="org.gnucash.dialogs.sxs.transaction-editor"/>
</schema>
- <schema id="org.gnucash.dialogs.sxs.since_last_run" path="/apps/gnucash/dialogs/scheduled_trans/since_last_run/">
+ <schema id="org.gnucash.dialogs.sxs.since-last-run" path="/org/gnucash/dialogs/scheduled-trans/since-last-run/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="show_at_file_open" type="b">
+ <key name="show-at-file-open" type="b">
<default>true</default>
<summary>Show "since last run" dialog when a file is opened.</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.sxs.transaction_editor" path="/apps/gnucash/dialogs/scheduled_trans/transaction_editor/">
- <key name="create_auto" type="b">
+ <schema id="org.gnucash.dialogs.sxs.transaction-editor" path="/org/gnucash/dialogs/scheduled-trans/transaction-editor/">
+ <key name="create-auto" type="b">
<default>false</default>
<summary>Set the "auto create" flag by default</summary>
<description>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.</description>
</key>
- <key name="create_days" type="d">
+ <key name="create-days" type="d">
<default>0</default>
<summary>How many days in advance to notify the user.</summary>
<description>How many days in advance to notify the user.</description>
@@ -40,9 +40,9 @@
<key name="notify" type="b">
<default>true</default>
<summary>Set the "notify" flag by default</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="remind_days" type="d">
+ <key name="remind-days" type="d">
<default>0</default>
<summary>How many days in advance to remind the user.</summary>
<description>How many days in advance to remind the user.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,6 +1,6 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.totd" path="/apps/gnucash/dialogs/tip_of_the_day/">
- <key name="current_tip" type="i">
+ <schema id="org.gnucash.dialogs.totd" path="/org/gnucash/dialogs/tip-of-the-day/">
+ <key name="current-tip" type="i">
<default>0</default>
<summary>The next tip to show.</summary>
<description>The next tip to show.</description>
@@ -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.</description>
</key>
- <key name="show_at_startup" type="b">
+ <key name="show-at-startup" type="b">
<default>true</default>
<summary>Show "Tip Of The Day" at GnuCash start</summary>
<description>Enables the "Tip Of The Day" when GnuCash starts up. If active, the dialog will be shown. Otherwise it will not be shown.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,190 +1,190 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash" path="/apps/gnucash/">
+ <schema id="org.gnucash" path="/org/gnucash/">
<child name="general" schema="org.gnucash.general"/>
<child name="dev" schema="org.gnucash.dev"/>
</schema>
- <schema id="org.gnucash.general" path="/apps/gnucash/general/">
- <key name="save_window_geometry" type="b">
+ <schema id="org.gnucash.general" path="/org/gnucash/general/">
+ <key name="save-window-geometry" type="b">
<default>true</default>
<summary>Save window sizes and locations</summary>
<description>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.</description>
</key>
- <key name="account_separator" type="s">
+ <key name="account-separator" type="s">
<default>'colon'</default>
<summary>Character to use as separator between account names</summary>
<description>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".</description>
</key>
- <key name="file_compression" type="b">
+ <key name="file-compression" type="b">
<default>true</default>
<summary>Compress the data file</summary>
<description>Enables file compression when writing the data file.</description>
</key>
- <key name="autosave_show_explanation" type="b">
+ <key name="autosave-show-explanation" type="b">
<default>true</default>
<summary>Show auto-save explanation</summary>
<description>If active, GnuCash shows an explanation of the auto-save feature the first time that feature is started. Otherwise no extra explanation is shown.</description>
</key>
- <key name="autosave_interval_minutes" type="d">
+ <key name="autosave-interval-minutes" type="d">
<default>5</default>
<summary>Auto-save time interval</summary>
<description>The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically.</description>
</key>
- <key name="negative_in_red" type="b">
+ <key name="negative-in-red" type="b">
<default>true</default>
<summary>Display negative amounts in red</summary>
<description>Display negative amounts in red</description>
</key>
- <key name="auto_decimal_point" type="b">
+ <key name="auto-decimal-point" type="b">
<default>false</default>
<summary>Automatically insert a decimal point</summary>
<description>If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers.</description>
</key>
- <key name="auto_decimal_places" type="d">
+ <key name="auto-decimal-places" type="d">
<default>2.0</default>
<summary>Number of automatic decimal places</summary>
<description>This field specifies the number of automatic decimal places that will be filled in.</description>
</key>
- <key name="retain_type-never" type="b">
+ <key name="retain-type-never" type="b">
<default>false</default>
<summary>Do not create log/backup files.</summary>
- <description>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'</description>
+ <description>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'</description>
</key>
- <key name="retain_type-days" type="b">
+ <key name="retain-type-days" type="b">
<default>true</default>
<summary>Delete old log/backup files after this many days (0 = never).</summary>
- <description>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'</description>
+ <description>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'</description>
</key>
- <key name="retain_type-forever" type="b">
+ <key name="retain-type-forever" type="b">
<default>false</default>
<summary>Do not delete log/backup files.</summary>
- <description>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'</description>
+ <description>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'</description>
</key>
- <key name="retain_days" type="d">
+ <key name="retain-days" type="d">
<default>30.0</default>
<summary>Delete old log/backup files after this many days (0 = never)</summary>
<description>This setting specifies the number of days after which old log/backup files will be deleted (0 = never).</description>
</key>
- <key name="reversed_accounts-none" type="b">
+ <key name="reversed-accounts-none" type="b">
<default>false</default>
<summary>Don't sign reverse any accounts.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="reversed_accounts-credit" type="b">
+ <key name="reversed-accounts-credit" type="b">
<default>true</default>
<summary>Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="reversed_accounts-incomeexpense" type="b">
+ <key name="reversed-accounts-incomeexpense" type="b">
<default>false</default>
<summary>Sign reverse balances on income and expense accounts.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="show_account_color" type="b">
+ <key name="show-account-color" type="b">
<default>false</default>
<summary>Use account colors in the account hierarchy</summary>
<description>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.</description>
</key>
- <key name="show_account_color_tabs" type="b">
+ <key name="show-account-color-tabs" type="b">
<default>false</default>
<summary>Use account colors in the tabs of open account registers</summary>
<description>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.</description>
</key>
- <key name="use_accounting_labels" type="b">
+ <key name="use-accounting-labels" type="b">
<default>false</default>
<summary>Use formal account labels</summary>
<description>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.</description>
</key>
- <key name="tab_close_buttons" type="b">
- <default>false</default>
+ <key name="tab-close-buttons" type="b">
+ <default>true</default>
<summary>Show close buttons on notebook tabs</summary>
<description>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.</description>
</key>
- <key name="tab_width" type="d">
+ <key name="tab-width" type="d">
<default>30.0</default>
<summary>Width of notebook tabs</summary>
<description>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.</description>
</key>
- <key name="currency_choice-locale" type="b">
+ <key name="currency-choice-locale" type="b">
<default>true</default>
<summary>Use the system locale currency for all newly created accounts.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="currency_choice-other" type="b">
+ <key name="currency-choice-other" type="b">
<default>false</default>
<summary>Use the specified currency for all newly created accounts.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="currency_other" type="s">
+ <key name="currency-other" type="s">
<default>'USD'</default>
<summary>Default currency for new accounts</summary>
- <description>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).</description>
+ <description>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).</description>
</key>
<key name="clock-24h" type="b">
<default>false</default>
<summary>Use 24 hour time format</summary>
<description>If active, use a 24 hour time format. Otherwise use a 12 hour time format.</description>
</key>
- <key name="date_format" type="i">
+ <key name="date-format" type="i">
<default>4</default>
<summary>Date format choice</summary>
<description>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.</description>
</key>
- <key name="date_completion-thisyear" type="b">
+ <key name="date-completion-thisyear" type="b">
<default>true</default>
<summary>In the current calendar year</summary>
<description>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.</description>
</key>
- <key name="date_completion-sliding" type="b">
+ <key name="date-completion-sliding" type="b">
<default>false</default>
<summary>In a sliding 12-month window starting a configurable number of months before the current month</summary>
<description>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.</description>
</key>
- <key name="date_backmonths" type="d">
+ <key name="date-backmonths" type="d">
<default>6.0</default>
<summary>Maximum number of months to go back.</summary>
<description>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.</description>
</key>
- <key name="show_splash_screen" type="b">
+ <key name="show-splash-screen" type="b">
<default>true</default>
<summary>Show splash screen</summary>
<description>If active, a splash screen will be shown at startup. Otherwise no splash screen will be shown.</description>
</key>
- <key name="tab_position-top" type="b">
+ <key name="tab-position-top" type="b">
<default>true</default>
<summary>Display the notebook tabs at the top of the window.</summary>
<description>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".</description>
</key>
- <key name="tab_position-bottom" type="b">
+ <key name="tab-position-bottom" type="b">
<default>false</default>
<summary>Display the notebook tabs at the bottom of the window.</summary>
<description>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".</description>
</key>
- <key name="tab_position-left" type="b">
+ <key name="tab-position-left" type="b">
<default>false</default>
<summary>Display the notebook tabs at the left of the window.</summary>
<description>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".</description>
</key>
- <key name="tab_position-right" type="b">
+ <key name="tab-position-right" type="b">
<default>false</default>
<summary>Display the notebook tabs at the right of the window.</summary>
<description>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".</description>
</key>
- <key name="summarybar_position-top" type="b">
+ <key name="summarybar-position-top" type="b">
<default>false</default>
<summary>Display the summary bar at the top of the page.</summary>
<description>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".</description>
</key>
- <key name="summarybar_position-bottom" type="b">
+ <key name="summarybar-position-bottom" type="b">
<default>true</default>
<summary>Display the summary bar at the bottom of the page.</summary>
<description>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".</description>
</key>
- <key name="tab_next_recent" type="b">
+ <key name="tab-next-recent" type="b">
<default>false</default>
<summary>Closing a tab moves to the most recently visited tab.</summary>
<description>If active, closing a tab moves to the most recently visited tab. Otherwise closing a tab moves one tab to the left.</description>
</key>
- <key name="num_source" type="b">
+ <key name="num-source" type="b">
<default>false</default>
<summary>Set book option on new files to use split "action" field for "Num" field on registers/reports</summary>
<description>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.</description>
@@ -193,146 +193,146 @@
<child name="report" schema="org.gnucash.general.report"/>
</schema>
- <schema id="org.gnucash.general.register" path="/apps/gnucash/general/register/">
- <key name="use_theme_colors" type="b">
+ <schema id="org.gnucash.general.register" path="/org/gnucash/general/register/">
+ <key name="use-theme-colors" type="b">
<default>false</default>
<summary>Color the register as specified by the system theme</summary>
<description>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.</description>
</key>
- <key name="enter_moves_to_end" type="b">
+ <key name="enter-moves-to-end" type="b">
<default>false</default>
<summary>"Enter" key moves to bottom of register</summary>
<description>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.</description>
</key>
- <key name="auto_raise_lists" type="b">
+ <key name="auto-raise-lists" type="b">
<default>true</default>
<summary>Automatically raise the list of accounts or actions during input</summary>
<description>Automatically raise the list of accounts or actions during input</description>
</key>
- <key name="tab_includes_transfer_on_memorised" type="b">
+ <key name="tab-includes-transfer-on-memorised" type="b">
<default>false</default>
<summary>Move to Transfer field when memorised transaction auto filled</summary>
<description>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.</description>
</key>
- <key name="use_new_window" type="b">
+ <key name="use-new-window" type="b">
<default>false</default>
<summary>Create a new window for each new register</summary>
<description>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.</description>
</key>
- <key name="alternate_color_by_transaction" type="b">
+ <key name="alternate-color-by-transaction" type="b">
<default>false</default>
<summary>Color all lines of a transaction the same</summary>
<description>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.</description>
</key>
- <key name="draw_horizontal_lines" type="b">
+ <key name="draw-horizontal-lines" type="b">
<default>true</default>
<summary>Show horizontal borders in a register</summary>
<description>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.</description>
</key>
- <key name="draw_vertical_lines" type="b">
+ <key name="draw-vertical-lines" type="b">
<default>true</default>
<summary>Show vertical borders in a register</summary>
<description>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.</description>
</key>
- <key name="default_style-ledger" type="b">
+ <key name="default-style-ledger" type="b">
<default>true</default>
<summary>Show all transactions on one line. (Two in double line mode.)</summary>
<description>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.</description>
</key>
- <key name="default_style-autoledger" type="b">
+ <key name="default-style-autoledger" type="b">
<default>false</default>
<summary>Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</summary>
<description>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.</description>
</key>
- <key name="default_style-journal" type="b">
+ <key name="default-style-journal" type="b">
<default>false</default>
<summary>All transactions are expanded to show all splits.</summary>
<description>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.</description>
</key>
- <key name="double_line_mode" type="b">
+ <key name="double-line-mode" type="b">
<default>false</default>
<summary>Show two lines of information for each transaction</summary>
<description>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.</description>
</key>
- <key name="show_leaf_account_names" type="b">
+ <key name="show-leaf-account-names" type="b">
<default>false</default>
<summary>Only display leaf account names.</summary>
<description>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.</description>
</key>
- <key name="show_extra_dates" type="b">
+ <key name="show-extra-dates" type="b">
<default>false</default>
<summary>Show the entered and reconcile dates</summary>
<description>Show the date when the transaction was entered below the posted date and reconciled date on split row.</description>
</key>
- <key name="show_extra_dates_on_selection" type="b">
+ <key name="show-extra-dates-on-selection" type="b">
<default>false</default>
<summary>Show entered and reconciled dates on selection</summary>
<description>Show the entered date and reconciled date on transaction selection.</description>
</key>
- <key name="show_calendar_buttons" type="b">
+ <key name="show-calendar-buttons" type="b">
<default>false</default>
<summary>Show the calendar buttons</summary>
<description>Show the calendar buttons Cancel, Today and Select.</description>
</key>
- <key name="selection_to_blank_on_expand" type="b">
+ <key name="selection-to-blank-on-expand" type="b">
<default>false</default>
<summary>Move the selection to the blank split on expand</summary>
<description>This will move the selection to the blank split when the transaction is expanded.</description>
</key>
- <key name="max_transactions" type="d">
+ <key name="max-transactions" type="d">
<default>0.0</default>
<summary>Number of transactions to show in a register.</summary>
<description>Show this many transactions in a register. A value of zero means show all transactions.</description>
</key>
- <key name="key_length" type="d">
+ <key name="key-length" type="d">
<default>2.0</default>
<summary>Number of characters for auto complete.</summary>
<description>This sets the number of characters before auto complete starts for description, notes and memo fields.</description>
</key>
</schema>
- <schema id="org.gnucash.general.report" path="/apps/gnucash/general/report/">
- <key name="use_new_window" type="b">
+ <schema id="org.gnucash.general.report" path="/org/gnucash/general/report/">
+ <key name="use-new-window" type="b">
<default>false</default>
<summary>Create a new window for each new report</summary>
<description>If active, each new report will be opened in its own window. Otherwise new reports will be opened as tabs in the main window.</description>
</key>
- <key name="currency_choice" type="s">
+ <key name="currency-choice" type="s">
<default>'locale'</default>
<summary>Source of default report currency</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="currency_choice-locale" type="b">
+ <key name="currency-choice-locale" type="b">
<default>true</default>
<summary>Use the system locale currency for all newly created reports.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="currency_choice-other" type="b">
+ <key name="currency-choice-other" type="b">
<default>false</default>
<summary>Use the specified currency for all newly created reports.</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="currency_other" type="s">
+ <key name="currency-other" type="s">
<default>'USD'</default>
<summary>Default currency for new reports</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <child name="pdf_export" schema="org.gnucash.general.report.pdf_export"/>
+ <child name="pdf-export" schema="org.gnucash.general.report.pdf-export"/>
</schema>
- <schema id="org.gnucash.general.report.pdf_export" path="/apps/gnucash/general/report/pdf_export/">
- <key name="filename_format" type="s">
- <default>'%1$s_%2$s_%3$s'</default>
+ <schema id="org.gnucash.general.report.pdf-export" path="/org/gnucash/general/report/pdf-export/">
+ <key name="filename-format" type="s">
+ <default>'%1$s-%2$s-%3$s'</default>
<summary>PDF export file name format</summary>
- <description>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.)</description>
+ <description>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.)</description>
</key>
- <key name="filename_date_format" type="s">
+ <key name="filename-date-format" type="s">
<default>'locale'</default>
<summary>PDF export file name date format choice</summary>
<description>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.</description>
</key>
</schema>
- <schema id="org.gnucash.dev" path="/apps/gnucash/dev/">
- <key name="allow_file_incompatibility" type="b">
+ <schema id="org.gnucash.dev" path="/org/gnucash/dev/">
+ <key name="allow-file-incompatibility" type="b">
<default>false</default>
<summary>Allow file incompatibility with older versions.</summary>
<description>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.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,54 +1,54 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.window.pages.account_tree.summary" path="/apps/gnucash/window/pages/account_tree/summary/">
- <key name="grand_total" type="b">
+ <schema id="org.gnucash.window.pages.account-tree.summary" path="/org/gnucash/window/pages/account-tree/summary/">
+ <key name="grand-total" type="b">
<default>true</default>
<summary>Show a grand total of all accounts converted to the default report currency</summary>
<description>Show a grand total of all accounts converted to the default report currency</description>
</key>
- <key name="non_currency" type="b">
+ <key name="non-currency" type="b">
<default>true</default>
<summary>Show non currency commodities</summary>
<description>If active, non currency commodities (stocks) will be shown. Otherwise they will be hidden.</description>
</key>
- <key name="start_choice-relative" type="b">
+ <key name="start-choice-relative" type="b">
<default>true</default>
<summary>Use relative profit/loss starting date</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="start_choice-absolute" type="b">
+ <key name="start-choice-absolute" type="b">
<default>false</default>
<summary>Use absolute profit/loss starting date</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="start_date" type="x">
+ <key name="start-date" type="x">
<default>0</default>
<summary>Starting date (in seconds from Jan 1, 1970)</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="start_period" type="i">
+ <key name="start-period" type="i">
<default>5</default>
<summary>Starting time period identifier</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="end_choice-relative" type="b">
+ <key name="end-choice-relative" type="b">
<default>true</default>
<summary>Use relative profit/loss ending date</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="end_choice-absolute" type="b">
+ <key name="end-choice-absolute" type="b">
<default>false</default>
<summary>Use absolute profit/loss ending date</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="end_date" type="x">
+ <key name="end-date" type="x">
<default>0</default>
<summary>Ending date (in seconds from Jan 1, 1970)</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
- <key name="end_period" type="i">
+ <key name="end-period" type="i">
<default>5</default>
<summary>Ending time period identifier</summary>
- <description>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.</description>
+ <description>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.</description>
</key>
</schema>
</schemalist>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,11 +1,11 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.window.pages" path="/apps/gnucash/window/pages/account_tree/">
- <key name="account-code_visible" type="b">
+ <schema id="org.gnucash.window.pages" path="/org/gnucash/window/pages/account-tree/">
+ <key name="account-code-visible" type="b">
<default>false</default>
<summary>Display this column</summary>
<description>This setting controls wether the given column will be visible in the view. TRUE means visible, FALSE means hidden.</description>
</key>
- <key name="account-code_width" type="i">
+ <key name="account-code-width" type="i">
<default>0</default>
<summary>Width of this column</summary>
<description>This setting stores the width of the given column in pixels.</description>
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,6 +1,6 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.window.pages.register" path="/apps/gnucash/window/pages/register/">
- <key name="balance_width" type="i">
+ <schema id="org.gnucash.window.pages.register" path="/org/gnucash/window/pages/register/">
+ <key name="balance-width" type="i">
<default>0</default>
<summary>Width of a column in the dialog</summary>
<description>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</description>
Modified: gnucash/trunk/src/gnome/gtkbuilder/dialog-sx.glade
===================================================================
--- gnucash/trunk/src/gnome/gtkbuilder/dialog-sx.glade 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/gtkbuilder/dialog-sx.glade 2013-10-07 14:30:10 UTC (rev 23266)
@@ -150,7 +150,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.sxs.since_last_run/show_at_file_open">
+ <object class="GtkCheckButton" id="pref/dialogs.sxs.since-last-run/show-at-file-open">
<property name="label" translatable="yes">_Run when data file opened</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -170,7 +170,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.sxs.transaction_editor/create_auto">
+ <object class="GtkCheckButton" id="pref/dialogs.sxs.transaction-editor/create-auto">
<property name="label" translatable="yes">_Auto-create new transactions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -202,7 +202,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Crea_te in advance:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.sxs.transaction_editor/create_days</property>
+ <property name="mnemonic_widget">pref/dialogs.sxs.transaction-editor/create-days</property>
</object>
</child>
</object>
@@ -225,7 +225,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">R_emind in advance:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.sxs.transaction_editor/remind_days</property>
+ <property name="mnemonic_widget">pref/dialogs.sxs.transaction-editor/remind-days</property>
</object>
</child>
</object>
@@ -242,7 +242,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.sxs.transaction_editor/remind_days">
+ <object class="GtkSpinButton" id="pref/dialogs.sxs.transaction-editor/remind-days">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Begin notifications this many days before the transaction is created.</property>
@@ -288,7 +288,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.sxs.transaction_editor/create_days">
+ <object class="GtkSpinButton" id="pref/dialogs.sxs.transaction-editor/create-days">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Create the transaction this many days before its effective date.</property>
@@ -329,7 +329,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.sxs.transaction_editor/notify">
+ <object class="GtkCheckButton" id="pref/dialogs.sxs.transaction-editor/notify">
<property name="label" translatable="yes">_Notify before transactions are created </property>
<property name="visible">True</property>
<property name="sensitive">False</property>
Modified: gnucash/trunk/src/gnome/reconcile-view.c
===================================================================
--- gnucash/trunk/src/gnome/reconcile-view.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/reconcile-view.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/window-reconcile.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 *********************************************************/
Modified: gnucash/trunk/src/gnome/window-reconcile2.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile2.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome/window-reconcile2.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 *********************************************************/
Modified: gnucash/trunk/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-search/dialog-search.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -51,8 +51,8 @@
#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
{
Modified: gnucash/trunk/src/gnome-utils/dialog-preferences.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-preferences.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/dialog-preferences.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1112,37 +1112,43 @@
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);
Modified: gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/gnome-utils/dialog-tax-table.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-tax-table.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/dialog-tax-table.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
{
Modified: gnucash/trunk/src/gnome-utils/dialog-totd.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-totd.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/dialog-totd.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
Modified: gnucash/trunk/src/gnome-utils/gnc-autosave.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-autosave.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gnc-autosave.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -92,14 +92,14 @@
#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"
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 ())
Modified: gnucash/trunk/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -31,7 +31,7 @@
#include "gnc-prefs.h"
#define MARKUP_STRING "<span size='small'>%s</span>"
-#define GNC_PREF_SHOW_SPLASH "show_splash_screen"
+#define GNC_PREF_SHOW_SPLASH "show-splash-screen"
static GtkWidget * splash = NULL;
static GtkWidget * progress = NULL;
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 *******************************************************/
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -291,11 +291,11 @@
#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
Modified: gnucash/trunk/src/gnome-utils/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -6,12 +6,7 @@
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@
Modified: gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,5 +1,5 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.history" path="/apps/gnucash/history/">
+ <schema id="org.gnucash.history" path="/org/gnucash/history/">
<key name="maxfiles" type="i">
<default>4</default>
<summary>Number of files in history</summary>
Modified: gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,188 +1,188 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.warnings" path="/apps/gnucash/warnings/">
+ <schema id="org.gnucash.warnings" path="/org/gnucash/warnings/">
<child name="permanent" schema="org.gnucash.warnings.permanent"/>
<child name="temporary" schema="org.gnucash.warnings.temporary"/>
</schema>
- <schema id="org.gnucash.warnings.permanent" path="/apps/gnucash/warnings/permanent/">
- <key name="checkprinting_multi_acct" type="i">
+ <schema id="org.gnucash.warnings.permanent" path="/org/gnucash/warnings/permanent/">
+ <key name="checkprinting-multi-acct" type="i">
<default>0</default>
<summary>Print checks from multiple accounts</summary>
<description>This dialog is presented if you try to print checks from multiple accounts at the same time.</description>
</key>
- <key name="inv_entry_mod" type="i">
+ <key name="inv-entry-mod" type="i">
<default>0</default>
- <summary>Commit changes to a invoice_entry</summary>
+ <summary>Commit changes to a invoice entry</summary>
<description>This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded.</description>
</key>
- <key name="inv_entry_dup" type="i">
+ <key name="inv-entry-dup" type="i">
<default>0</default>
- <summary>Duplicating a changed invoice_entry</summary>
+ <summary>Duplicating a changed invoice entry</summary>
<description>This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled.</description>
</key>
- <key name="price_comm_del" type="i">
+ <key name="price-comm-del" type="i">
<default>0</default>
<summary>Delete a commodity</summary>
<description>This dialog is presented before allowing you to delete a commodity.</description>
</key>
- <key name="price_comm_del_quotes" type="i">
+ <key name="price-comm-del-quotes" type="i">
<default>0</default>
<summary>Delete a commodity with price quotes</summary>
<description>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.</description>
</key>
- <key name="price_quotes_del" type="i">
+ <key name="price-quotes-del" type="i">
<default>0</default>
<summary>Delete multiple price quotes</summary>
<description>This dialog is presented before allowing you to delete multiple price quotes at one time.</description>
</key>
- <key name="reg_is_acct_pay_rec" type="i">
+ <key name="reg-is-acct-pay-rec" type="i">
<default>0</default>
<summary>Edit account payable/accounts receivable register</summary>
<description>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.</description>
</key>
- <key name="reg_is_read_only" type="i">
+ <key name="reg-is-read-only" type="i">
<default>0</default>
<summary>Read only register</summary>
<description>This dialog is presented when a read-only register is opened.</description>
</key>
- <key name="reg_recd_split_mod" type="i">
+ <key name="reg-recd-split-mod" type="i">
<default>0</default>
<summary>Change contents of reconciled split</summary>
<description>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.</description>
</key>
- <key name="reg_recd_split_unrec" type="i">
+ <key name="reg-recd-split-unrec" type="i">
<default>0</default>
<summary>Mark transaction split as unreconciled</summary>
<description>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.</description>
</key>
- <key name="reg_split_del" type="i">
+ <key name="reg-split-del" type="i">
<default>0</default>
<summary>Remove a split from a transaction</summary>
<description>This dialog is presented before allowing you to remove a split from a transaction.</description>
</key>
- <key name="reg_split_del_recd" type="i">
+ <key name="reg-split-del-recd" type="i">
<default>0</default>
<summary>Remove a reconciled split from a transaction</summary>
<description>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.</description>
</key>
- <key name="reg_split_del_all" type="i">
+ <key name="reg-split-del-all" type="i">
<default>0</default>
<summary>Remove all the splits from a transaction</summary>
<description>This dialog is presented before allowing you to remove all splits from a transaction.</description>
</key>
- <key name="reg_split_del_all_recd" type="i">
+ <key name="reg-split-del-all-recd" type="i">
<default>0</default>
<summary>Remove all the splits from a transaction</summary>
<description>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.</description>
</key>
- <key name="reg_trans_del" type="i">
+ <key name="reg-trans-del" type="i">
<default>0</default>
<summary>Delete a transaction</summary>
<description>This dialog is presented before allowing you to delete a transaction.</description>
</key>
- <key name="reg_trans_del_recd" type="i">
+ <key name="reg-trans-del-recd" type="i">
<default>0</default>
<summary>Delete a transaction with reconciled splits</summary>
<description>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.</description>
</key>
- <key name="reg_trans_dup" type="i">
+ <key name="reg-trans-dup" type="i">
<default>0</default>
<summary>Duplicating a changed transaction</summary>
<description>This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled.</description>
</key>
- <key name="reg_trans_mod" type="i">
+ <key name="reg-trans-mod" type="i">
<default>0</default>
<summary>Commit changes to a transaction</summary>
<description>This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded.</description>
</key>
</schema>
- <schema id="org.gnucash.warnings.temporary" path="/apps/gnucash/warnings/temporary/">
- <key name="checkprinting_multi_acct" type="i">
+ <schema id="org.gnucash.warnings.temporary" path="/org/gnucash/warnings/temporary/">
+ <key name="checkprinting-multi-acct" type="i">
<default>0</default>
<summary>Print checks from multiple accounts</summary>
<description>This dialog is presented if you try to print checks from multiple accounts at the same time.</description>
</key>
- <key name="inv_entry_mod" type="i">
+ <key name="inv-entry-mod" type="i">
<default>0</default>
- <summary>Commit changes to a invoice_entry</summary>
+ <summary>Commit changes to a invoice entry</summary>
<description>This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded.</description>
</key>
- <key name="inv_entry_dup" type="i">
+ <key name="inv-entry-dup" type="i">
<default>0</default>
- <summary>Duplicating a changed invoice_entry</summary>
+ <summary>Duplicating a changed invoice entry</summary>
<description>This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled.</description>
</key>
- <key name="price_comm_del" type="i">
+ <key name="price-comm-del" type="i">
<default>0</default>
<summary>Delete a commodity</summary>
<description>This dialog is presented before allowing you to delete a commodity.</description>
</key>
- <key name="price_comm_del_quotes" type="i">
+ <key name="price-comm-del-quotes" type="i">
<default>0</default>
<summary>Delete a commodity with price quotes</summary>
<description>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.</description>
</key>
- <key name="price_quotes_del" type="i">
+ <key name="price-quotes-del" type="i">
<default>0</default>
<summary>Delete multiple price quotes</summary>
<description>This dialog is presented before allowing you to delete multiple price quotes at one time.</description>
</key>
- <key name="reg_is_acct_pay_rec" type="i">
+ <key name="reg-is-acct-pay-rec" type="i">
<default>0</default>
<summary>Edit account payable/accounts receivable register</summary>
<description>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.</description>
</key>
- <key name="reg_is_read_only" type="i">
+ <key name="reg-is-read-only" type="i">
<default>0</default>
<summary>Read only register</summary>
<description>This dialog is presented when a read-only register is opened.</description>
</key>
- <key name="reg_recd_split_mod" type="i">
+ <key name="reg-recd-split-mod" type="i">
<default>0</default>
<summary>Change contents of reconciled split</summary>
<description>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.</description>
</key>
- <key name="reg_recd_split_unrec" type="i">
+ <key name="reg-recd-split-unrec" type="i">
<default>0</default>
<summary>Mark transaction split as unreconciled</summary>
<description>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.</description>
</key>
- <key name="reg_split_del" type="i">
+ <key name="reg-split-del" type="i">
<default>0</default>
<summary>Remove a split from a transaction</summary>
<description>This dialog is presented before allowing you to remove a split from a transaction.</description>
</key>
- <key name="reg_split_del_recd" type="i">
+ <key name="reg-split-del-recd" type="i">
<default>0</default>
<summary>Remove a reconciled split from a transaction</summary>
<description>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.</description>
</key>
- <key name="reg_split_del_all" type="i">
+ <key name="reg-split-del-all" type="i">
<default>0</default>
<summary>Remove all the splits from a transaction</summary>
<description>This dialog is presented before allowing you to remove all splits from a transaction.</description>
</key>
- <key name="reg_split_del_all_recd" type="i">
+ <key name="reg-split-del-all-recd" type="i">
<default>0</default>
<summary>Remove all the splits from a transaction</summary>
<description>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.</description>
</key>
- <key name="reg_trans_del" type="i">
+ <key name="reg-trans-del" type="i">
<default>0</default>
<summary>Delete a transaction</summary>
<description>This dialog is presented before allowing you to delete a transaction.</description>
</key>
- <key name="reg_trans_del_recd" type="i">
+ <key name="reg-trans-del-recd" type="i">
<default>0</default>
<summary>Delete a transaction with reconciled splits</summary>
<description>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.</description>
</key>
- <key name="reg_trans_dup" type="i">
+ <key name="reg-trans-dup" type="i">
<default>0</default>
<summary>Duplicating a changed transaction</summary>
<description>This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled.</description>
</key>
- <key name="reg_trans_mod" type="i">
+ <key name="reg-trans-mod" type="i">
<default>0</default>
<summary>Commit changes to a transaction</summary>
<description>This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded.</description>
Modified: gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade
===================================================================
--- gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade 2013-10-07 14:30:10 UTC (rev 23266)
@@ -153,7 +153,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/window.pages.account_tree.summary/grand_total">
+ <object class="GtkCheckButton" id="pref/window.pages.account-tree.summary/grand-total">
<property name="label" translatable="yes">Include _grand total</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -174,7 +174,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/window.pages.account_tree.summary/non_currency">
+ <object class="GtkCheckButton" id="pref/window.pages.account-tree.summary/non-currency">
<property name="label" translatable="yes">Include _non-currency totals</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -225,7 +225,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/window.pages.account_tree.summary/start_choice-relative">
+ <object class="GtkRadioButton" id="pref/window.pages.account-tree.summary/start-choice-relative">
<property name="label" translatable="yes">_Relative:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -246,7 +246,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/window.pages.account_tree.summary/start_choice-absolute">
+ <object class="GtkRadioButton" id="pref/window.pages.account-tree.summary/start-choice-absolute">
<property name="label" translatable="yes">_Absolute:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -256,7 +256,7 @@
<property name="tooltip_text" translatable="yes">Use the specified absolute starting date for profit/loss calculations.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/window.pages.account_tree.summary/start_choice-relative</property>
+ <property name="group">pref/window.pages.account-tree.summary/start-choice-relative</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -267,7 +267,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/window.pages.account_tree.summary/end_choice-relative">
+ <object class="GtkRadioButton" id="pref/window.pages.account-tree.summary/end-choice-relative">
<property name="label" translatable="yes">Re_lative:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -288,7 +288,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/window.pages.account_tree.summary/end_choice-absolute">
+ <object class="GtkRadioButton" id="pref/window.pages.account-tree.summary/end-choice-absolute">
<property name="label" translatable="yes">Ab_solute:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -298,7 +298,7 @@
<property name="tooltip_text" translatable="yes">Use the specified absolute ending date for profit/loss calculations. Also use this date for net assets calculations.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/window.pages.account_tree.summary/end_choice-relative</property>
+ <property name="group">pref/window.pages.account-tree.summary/end-choice-relative</property>
</object>
<packing>
<property name="top_attach">6</property>
@@ -335,7 +335,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="pref/window.pages.account_tree.summary/start_period">
+ <object class="GtkHBox" id="pref/window.pages.account-tree.summary/start-period">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -352,7 +352,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="pref/window.pages.account_tree.summary/start_date">
+ <object class="GtkHBox" id="pref/window.pages.account-tree.summary/start-date">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -369,7 +369,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="pref/window.pages.account_tree.summary/end_period">
+ <object class="GtkHBox" id="pref/window.pages.account-tree.summary/end-period">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -386,7 +386,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="pref/window.pages.account_tree.summary/end_date">
+ <object class="GtkHBox" id="pref/window.pages.account-tree.summary/end-date">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -516,7 +516,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/use_accounting_labels">
+ <object class="GtkCheckButton" id="pref/general/use-accounting-labels">
<property name="label" translatable="yes">Use _formal accounting labels</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -565,7 +565,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/reversed_accounts-none">
+ <object class="GtkRadioButton" id="pref/general/reversed-accounts-none">
<property name="label" translatable="yes">_None</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -587,7 +587,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/reversed_accounts-credit">
+ <object class="GtkRadioButton" id="pref/general/reversed-accounts-credit">
<property name="label" translatable="yes">C_redit accounts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -597,7 +597,7 @@
<property name="tooltip_text" translatable="yes">Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/reversed_accounts-none</property>
+ <property name="group">pref/general/reversed-accounts-none</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -609,7 +609,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/reversed_accounts-incomeexpense">
+ <object class="GtkRadioButton" id="pref/general/reversed-accounts-incomeexpense">
<property name="label" translatable="yes">_Income & expense</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -619,7 +619,7 @@
<property name="tooltip_text" translatable="yes">Sign reverse balances on income and expense accounts.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/reversed_accounts-none</property>
+ <property name="group">pref/general/reversed-accounts-none</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -709,7 +709,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkRadioButton" id="pref/general/currency_choice-locale">
+ <object class="GtkRadioButton" id="pref/general/currency-choice-locale">
<property name="label" translatable="yes">Loc_ale:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -736,7 +736,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkRadioButton" id="pref/general/currency_choice-other">
+ <object class="GtkRadioButton" id="pref/general/currency-choice-other">
<property name="label" translatable="yes">Ch_oose:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -746,7 +746,7 @@
<property name="tooltip_text" translatable="yes">Use the specified currency for all newly created accounts.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/currency_choice-locale</property>
+ <property name="group">pref/general/currency-choice-locale</property>
</object>
</child>
</object>
@@ -758,7 +758,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="pref/general/account_separator">
+ <object class="GtkEntry" id="pref/general/account-separator">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
@@ -828,7 +828,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="pref/general/currency_other">
+ <object class="GtkHBox" id="pref/general/currency-other">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -892,7 +892,7 @@
<placeholder/>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/show_account_color">
+ <object class="GtkCheckButton" id="pref/general/show-account-color">
<property name="label" translatable="yes">Show the Account Color as background</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -926,7 +926,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/show_account_color_tabs">
+ <object class="GtkCheckButton" id="pref/general/show-account-color-tabs">
<property name="label" translatable="yes">Show the Account Color on tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1181,7 +1181,7 @@
<placeholder/>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/date_completion-thisyear">
+ <object class="GtkRadioButton" id="pref/general/date-completion-thisyear">
<property name="label" translatable="yes">In the current calendar year</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1203,7 +1203,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/date_completion-sliding">
+ <object class="GtkRadioButton" id="pref/general/date-completion-sliding">
<property name="label" translatable="yes">In a sliding 12-month window starting this
many months before the current month:</property>
<property name="visible">True</property>
@@ -1214,7 +1214,7 @@
<property name="tooltip_text" translatable="yes">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.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/date_completion-thisyear</property>
+ <property name="group">pref/general/date-completion-thisyear</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -1229,7 +1229,7 @@
<placeholder/>
</child>
<child>
- <object class="GtkSpinButton" id="pref/general/date_backmonths">
+ <object class="GtkSpinButton" id="pref/general/date-backmonths">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -1252,7 +1252,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="pref/general/date_format">
+ <object class="GtkComboBox" id="pref/general/date-format">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -1407,7 +1407,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.new_hierarchy/show_on_new_file">
+ <object class="GtkCheckButton" id="pref/dialogs.new-hierarchy/show-on-new-file">
<property name="label" translatable="yes">Perform account list _setup on new file</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1428,7 +1428,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/num_source">
+ <object class="GtkCheckButton" id="pref/general/num-source">
<property name="label" translatable="yes">Set book option on new files to use split "action" field for "Num" field on registers/reports</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1449,7 +1449,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.totd/show_at_startup">
+ <object class="GtkCheckButton" id="pref/dialogs.totd/show-at-startup">
<property name="label" translatable="yes">Display "_tip of the day" dialog</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1475,7 +1475,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkSpinButton" id="pref/general/retain_days">
+ <object class="GtkSpinButton" id="pref/general/retain-days">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -1526,7 +1526,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Retain log files:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/general/retain_days</property>
+ <property name="mnemonic_widget">pref/general/retain-days</property>
</object>
<packing>
<property name="right_attach">4</property>
@@ -1538,7 +1538,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/file_compression">
+ <object class="GtkCheckButton" id="pref/general/file-compression">
<property name="label" translatable="yes">Com_press files</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1593,7 +1593,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Decimal places:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/general/auto_decimal_places</property>
+ <property name="mnemonic_widget">pref/general/auto-decimal-places</property>
</object>
<packing>
<property name="top_attach">9</property>
@@ -1604,7 +1604,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/general/auto_decimal_places">
+ <object class="GtkSpinButton" id="pref/general/auto-decimal-places">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -1629,7 +1629,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/auto_decimal_point">
+ <object class="GtkCheckButton" id="pref/general/auto-decimal-point">
<property name="label" translatable="yes">_Automatic decimal point</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1650,7 +1650,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/negative_in_red">
+ <object class="GtkCheckButton" id="pref/general/negative-in-red">
<property name="label" translatable="yes">Display ne_gative amounts in red</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1720,7 +1720,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">New search _limit:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.search/new_search_limit</property>
+ <property name="mnemonic_widget">pref/dialogs.search/new-search-limit</property>
</object>
<packing>
<property name="top_attach">21</property>
@@ -1731,7 +1731,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.search/new_search_limit">
+ <object class="GtkSpinButton" id="pref/dialogs.search/new-search-limit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -1756,7 +1756,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/show_splash_screen">
+ <object class="GtkCheckButton" id="pref/general/show-splash-screen">
<property name="label" translatable="yes">Show splash scree_n</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1783,7 +1783,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Auto-save time _interval:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/general/autosave_interval_minutes</property>
+ <property name="mnemonic_widget">pref/general/autosave-interval-minutes</property>
</object>
<packing>
<property name="top_attach">14</property>
@@ -1799,7 +1799,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkSpinButton" id="pref/general/autosave_interval_minutes">
+ <object class="GtkSpinButton" id="pref/general/autosave-interval-minutes">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -1844,7 +1844,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/autosave_show_explanation">
+ <object class="GtkCheckButton" id="pref/general/autosave-show-explanation">
<property name="label" translatable="yes">Show auto-save confirmation _question</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1887,7 +1887,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/retain_type-never">
+ <object class="GtkRadioButton" id="pref/general/retain-type-never">
<property name="label" translatable="yes">Never</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1896,7 +1896,7 @@
<property name="tooltip_markup">Do not create log/backup files.</property>
<property name="tooltip_text" translatable="yes">Do not create log/backup files.</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/retain_type-days</property>
+ <property name="group">pref/general/retain-type-days</property>
</object>
<packing>
<property name="top_attach">16</property>
@@ -1905,7 +1905,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/retain_type-days">
+ <object class="GtkRadioButton" id="pref/general/retain-type-days">
<property name="label" translatable="yes">For:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1923,7 +1923,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/retain_type-forever">
+ <object class="GtkRadioButton" id="pref/general/retain-type-forever">
<property name="label" translatable="yes">Forever</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1932,7 +1932,7 @@
<property name="tooltip_markup">Do not delete log/backup files.</property>
<property name="tooltip_text" translatable="yes">Do not delete log/backup files.</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/retain_type-days</property>
+ <property name="group">pref/general/retain-type-days</property>
</object>
<packing>
<property name="top_attach">18</property>
@@ -1996,7 +1996,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.checkprinting/print_date_format">
+ <object class="GtkCheckButton" id="pref/dialogs.checkprinting/print-date-format">
<property name="label" translatable="yes">Print _date format</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2029,7 +2029,7 @@
<property name="label" translatable="yes">Default _font:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.checkprinting/default_font</property>
+ <property name="mnemonic_widget">pref/dialogs.checkprinting/default-font</property>
</object>
</child>
</object>
@@ -2041,7 +2041,7 @@
</packing>
</child>
<child>
- <object class="GtkFontButton" id="pref/dialogs.checkprinting/default_font">
+ <object class="GtkFontButton" id="pref/dialogs.checkprinting/default-font">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2064,7 +2064,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.checkprinting/blocking_chars">
+ <object class="GtkCheckButton" id="pref/dialogs.checkprinting/blocking-chars">
<property name="label" translatable="yes">Print _blocking chars</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2188,7 +2188,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/enter_moves_to_end">
+ <object class="GtkCheckButton" id="pref/general.register/enter-moves-to-end">
<property name="label" translatable="yes">'_Enter' moves to blank transaction</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2222,7 +2222,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/auto_raise_lists">
+ <object class="GtkCheckButton" id="pref/general.register/auto-raise-lists">
<property name="label" translatable="yes">_Auto-raise lists</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2272,7 +2272,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.reconcile/check_cleared">
+ <object class="GtkCheckButton" id="pref/dialogs.reconcile/check-cleared">
<property name="label" translatable="yes">Check cleared _transactions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2293,7 +2293,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.reconcile/auto_interest_transfer">
+ <object class="GtkCheckButton" id="pref/dialogs.reconcile/auto-interest-transfer">
<property name="label" translatable="yes">Automatic _interest transfer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2314,7 +2314,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.reconcile/auto_cc_payment">
+ <object class="GtkCheckButton" id="pref/dialogs.reconcile/auto-cc-payment">
<property name="label" translatable="yes">Automatic credit card _payment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2335,7 +2335,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.reconcile/always_reconcile_to_today">
+ <object class="GtkCheckButton" id="pref/dialogs.reconcile/always-reconcile-to-today">
<property name="label" translatable="yes">Always reconcile to t_oday</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2356,7 +2356,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/draw_vertical_lines">
+ <object class="GtkCheckButton" id="pref/general.register/draw-vertical-lines">
<property name="label" translatable="yes">Draw _vertical lines between columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2377,7 +2377,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/draw_horizontal_lines">
+ <object class="GtkCheckButton" id="pref/general.register/draw-horizontal-lines">
<property name="label" translatable="yes">Draw hori_zontal lines between rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2398,7 +2398,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/alternate_color_by_transaction">
+ <object class="GtkCheckButton" id="pref/general.register/alternate-color-by-transaction">
<property name="label" translatable="yes">Double _mode colors alternate with transactions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2419,7 +2419,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/use_theme_colors">
+ <object class="GtkCheckButton" id="pref/general.register/use-theme-colors">
<property name="label" translatable="yes">_Use system theme colors</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2456,7 +2456,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/tab_includes_transfer_on_memorised">
+ <object class="GtkCheckButton" id="pref/general.register/tab-includes-transfer-on-memorised">
<property name="label" translatable="yes">Tab order in_cludes Transfer on Memorised Transactions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2592,7 +2592,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general.register/default_style-ledger">
+ <object class="GtkRadioButton" id="pref/general.register/default-style-ledger">
<property name="label" translatable="yes">_Basic ledger</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2614,7 +2614,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general.register/default_style-autoledger">
+ <object class="GtkRadioButton" id="pref/general.register/default-style-autoledger">
<property name="label" translatable="yes">_Auto-split ledger</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2624,7 +2624,7 @@
<property name="tooltip_text" translatable="yes">Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general.register/default_style-ledger</property>
+ <property name="group">pref/general.register/default-style-ledger</property>
</object>
<packing>
<property name="right_attach">4</property>
@@ -2636,7 +2636,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general.register/default_style-journal">
+ <object class="GtkRadioButton" id="pref/general.register/default-style-journal">
<property name="label" translatable="yes">Transaction _Journal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2646,7 +2646,7 @@
<property name="tooltip_text" translatable="yes">All transactions are expanded to show all splits.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general.register/default_style-ledger</property>
+ <property name="group">pref/general.register/default-style-ledger</property>
</object>
<packing>
<property name="right_attach">4</property>
@@ -2664,7 +2664,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Number of _transactions:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/general.register/max_transactions</property>
+ <property name="mnemonic_widget">pref/general.register/max-transactions</property>
</object>
<packing>
<property name="top_attach">9</property>
@@ -2675,7 +2675,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/general.register/max_transactions">
+ <object class="GtkSpinButton" id="pref/general.register/max-transactions">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -2703,7 +2703,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/double_line_mode">
+ <object class="GtkCheckButton" id="pref/general.register/double-line-mode">
<property name="label" translatable="yes">_Double line mode</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2724,7 +2724,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/use_new_window">
+ <object class="GtkCheckButton" id="pref/general.register/use-new-window">
<property name="label" translatable="yes">Register opens in a new _window</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2745,7 +2745,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/show_leaf_account_names">
+ <object class="GtkCheckButton" id="pref/general.register/show-leaf-account-names">
<property name="label" translatable="yes">_Only display leaf account names</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2772,7 +2772,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Number of _characters for auto complete:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/general.register/key_length</property>
+ <property name="mnemonic_widget">pref/general.register/key-length</property>
</object>
<packing>
<property name="top_attach">10</property>
@@ -2783,7 +2783,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/general.register/key_length">
+ <object class="GtkSpinButton" id="pref/general.register/key-length">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -2811,7 +2811,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/show_extra_dates">
+ <object class="GtkCheckButton" id="pref/general.register/show-extra-dates">
<property name="label" translatable="yes">Show the _entered and reconcile dates</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2831,7 +2831,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/show_calendar_buttons">
+ <object class="GtkCheckButton" id="pref/general.register/show-calendar-buttons">
<property name="label" translatable="yes">Show the calendar b_uttons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2851,7 +2851,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/selection_to_blank_on_expand">
+ <object class="GtkCheckButton" id="pref/general.register/selection-to-blank-on-expand">
<property name="label" translatable="yes">_Move the selection to the blank split on expand</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2871,7 +2871,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.register/show_extra_dates_on_selection">
+ <object class="GtkCheckButton" id="pref/general.register/show-extra-dates-on-selection">
<property name="label" translatable="yes">_Show entered and reconciled dates on selection</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2957,7 +2957,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkRadioButton" id="pref/general.report/currency_choice-other">
+ <object class="GtkRadioButton" id="pref/general.report/currency-choice-other">
<property name="label" translatable="yes">Ch_oose:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2984,7 +2984,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkRadioButton" id="pref/general.report/currency_choice-locale">
+ <object class="GtkRadioButton" id="pref/general.report/currency-choice-locale">
<property name="label" translatable="yes">Loc_ale:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2994,7 +2994,7 @@
<property name="tooltip_text" translatable="yes">Use the system locale currency for all newly created reports.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general.report/currency_choice-other</property>
+ <property name="group">pref/general.report/currency-choice-other</property>
</object>
</child>
</object>
@@ -3049,7 +3049,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general.report/use_new_window">
+ <object class="GtkCheckButton" id="pref/general.report/use-new-window">
<property name="label" translatable="yes">Report opens in a new _window</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3070,7 +3070,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="pref/general.report/currency_other">
+ <object class="GtkHBox" id="pref/general.report/currency-other">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -3151,7 +3151,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/save_window_geometry">
+ <object class="GtkCheckButton" id="pref/general/save-window-geometry">
<property name="label" translatable="yes">_Save window size and position</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3172,7 +3172,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/tab_next_recent">
+ <object class="GtkCheckButton" id="pref/general/tab-next-recent">
<property name="label" translatable="yes">Bring the most _recent tab to the front</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3222,7 +3222,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/tab_position-top">
+ <object class="GtkRadioButton" id="pref/general/tab-position-top">
<property name="label" translatable="yes">To_p</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3244,7 +3244,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/tab_position-bottom">
+ <object class="GtkRadioButton" id="pref/general/tab-position-bottom">
<property name="label" translatable="yes">B_ottom</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3254,7 +3254,7 @@
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the bottom of the window.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/tab_position-top</property>
+ <property name="group">pref/general/tab-position-top</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -3266,7 +3266,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/tab_position-left">
+ <object class="GtkRadioButton" id="pref/general/tab-position-left">
<property name="label" translatable="yes">_Left</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3276,7 +3276,7 @@
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the left of the window.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/tab_position-top</property>
+ <property name="group">pref/general/tab-position-top</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -3288,7 +3288,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/tab_position-right">
+ <object class="GtkRadioButton" id="pref/general/tab-position-right">
<property name="label" translatable="yes">_Right</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3298,7 +3298,7 @@
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the right of the window.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/tab_position-top</property>
+ <property name="group">pref/general/tab-position-top</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -3327,7 +3327,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/summarybar_position-top">
+ <object class="GtkRadioButton" id="pref/general/summarybar-position-top">
<property name="label" translatable="yes">Top</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3350,7 +3350,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/general/summarybar_position-bottom">
+ <object class="GtkRadioButton" id="pref/general/summarybar-position-bottom">
<property name="label" translatable="yes">Bottom</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3360,7 +3360,7 @@
<property name="tooltip_text" translatable="yes">Display the summary bar at the bottom of the page.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/general/summarybar_position-top</property>
+ <property name="group">pref/general/summarybar-position-top</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -3402,7 +3402,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/general/tab_close_buttons">
+ <object class="GtkCheckButton" id="pref/general/tab-close-buttons">
<property name="label" translatable="yes">Show close button on _notebook tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3448,7 +3448,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSpinButton" id="pref/general/tab_width">
+ <object class="GtkSpinButton" id="pref/general/tab-width">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
Modified: gnucash/trunk/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -49,9 +49,9 @@
#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.
Modified: gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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;
Modified: gnucash/trunk/src/import-export/aqbanking/dialog-ab.glade
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/dialog-ab.glade 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/aqbanking/dialog-ab.glade 2013-10-07 14:30:10 UTC (rev 23266)
@@ -815,7 +815,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.hbci/close_on_finish">
+ <object class="GtkCheckButton" id="pref/dialogs.import.hbci/close-on-finish">
<property name="label" translatable="yes">_Close log window when finished</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -834,7 +834,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember_pin">
+ <object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember-pin">
<property name="label" translatable="yes">Remember _PIN</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -71,10 +71,10 @@
#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;
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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 <gwen-gui-gtk2/gtk2_gui.h>
Modified: gnucash/trunk/src/import-export/aqbanking/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/aqbanking/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,5 +1,5 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.ab_initial" path="/apps/gnucash/dialogs/ab_initial/">
+ <schema id="org.gnucash.dialogs.ab-initial" path="/org/gnucash/dialogs/ab-initial/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -9,51 +9,51 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.import.hbci" path="/apps/gnucash/dialogs/import/hbci/">
- <key name="close_on_finish" type="b">
+ <schema id="org.gnucash.dialogs.import.hbci" path="/org/gnucash/dialogs/import/hbci/">
+ <key name="close-on-finish" type="b">
<default>true</default>
<summary>Close window when finished</summary>
<description>If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</description>
</key>
- <key name="remember_pin" type="b">
+ <key name="remember-pin" type="b">
<default>false</default>
<summary>Remember the PIN in memory</summary>
<description>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.</description>
</key>
- <key name="verbose_debug" type="b">
+ <key name="verbose-debug" type="b">
<default>false</default>
<summary>Verbose HBCI debug messages</summary>
<description>Enables verbose debug messages for HBCI/AqBanking Online Banking.</description>
</key>
- <key name="format_dtaus" type="s">
+ <key name="format-dtaus" type="s">
<default>'default'</default>
<summary>DTAUS import data format</summary>
<description>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.</description>
</key>
- <key name="format_csv" type="s">
+ <key name="format-csv" type="s">
<default>'default'</default>
<summary>CSV import data format</summary>
<description>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.</description>
</key>
- <key name="format_swift_mt940" type="s">
+ <key name="format-swift-mt940" type="s">
<default>'swift-mt940'</default>
<summary>SWIFT MT940 import data format</summary>
<description>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.</description>
</key>
- <key name="format_swift_mt942" type="s">
+ <key name="format-swift-mt942" type="s">
<default>'swift-mt942'</default>
<summary>SWIFT MT942 import data format</summary>
<description>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.</description>
</key>
- <key name="last_path" type="s">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
- <child name="connection_dialog" schema="org.gnucash.dialogs.import.hbci.connection_dialog"/>
+ <child name="connection-dialog" schema="org.gnucash.dialogs.import.hbci.connection-dialog"/>
</schema>
- <schema id="org.gnucash.dialogs.import.hbci.connection_dialog" path="/apps/gnucash/dialogs/import/hbci/connection_dialog/">
+ <schema id="org.gnucash.dialogs.import.hbci.connection-dialog" path="/org/gnucash/dialogs/import/hbci/connection-dialog/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
Modified: gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c
===================================================================
--- gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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. */
Modified: gnucash/trunk/src/import-export/csv-export/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-export/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/csv-export/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
===================================================================
--- gnucash/trunk/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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.</description>
</key>
- <key name="last_path" type="s">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
- <key name="paned_position" type="i">
+ <key name="paned-position" type="i">
<default>0</default>
<summary>Window geometry</summary>
<description>The position of paned window when it was last closed.</description>
Modified: gnucash/trunk/src/import-export/csv-import/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-import/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/csv-import/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
===================================================================
--- gnucash/trunk/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,5 +1,5 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.import.csv" path="/apps/gnucash/dialogs/import/csv/">
+ <schema id="org.gnucash.dialogs.import.csv" path="/org/gnucash/dialogs/import/csv/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -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.</description>
</key>
- <key name="last_path" type="s">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
Modified: gnucash/trunk/src/import-export/dialog-import.glade
===================================================================
--- gnucash/trunk/src/import-export/dialog-import.glade 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/dialog-import.glade 2013-10-07 14:30:10 UTC (rev 23266)
@@ -13,7 +13,7 @@
<property name="n_rows">10</property>
<property name="n_columns">4</property>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable_skip">
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-skip">
<property name="label" translatable="yes">Enable skip transaction action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -35,7 +35,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable_update">
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-update">
<property name="label" translatable="yes">Enable update match action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -71,7 +71,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/atm_fee_threshold">
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/atm-fee-threshold">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -99,7 +99,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto_clear_threshold">
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto-clear-threshold">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -126,7 +126,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto_add_threshold">
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto-add-threshold">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -153,7 +153,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/match_threshold">
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/match-threshold">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -186,7 +186,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Commercial ATM _fees threshold</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/atm_fee_threshold</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/atm-fee-threshold</property>
</object>
<packing>
<property name="top_attach">7</property>
@@ -203,7 +203,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Auto-c_lear threshold</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/auto_clear_threshold</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/auto-clear-threshold</property>
</object>
<packing>
<property name="top_attach">6</property>
@@ -220,7 +220,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Auto-_add threshold</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/auto_add_threshold</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/auto-add-threshold</property>
</object>
<packing>
<property name="top_attach">5</property>
@@ -237,7 +237,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Match _display threshold</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/match_threshold</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/match-threshold</property>
</object>
<packing>
<property name="top_attach">4</property>
@@ -248,7 +248,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/use_bayes">
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/use-bayes">
<property name="label" translatable="yes">Use _bayesian matching</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -270,7 +270,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/auto_create_commodity">
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/auto-create-commodity">
<property name="label" translatable="yes">Automatically create new commodities</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Modified: gnucash/trunk/src/import-export/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
===================================================================
--- gnucash/trunk/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,64 +1,64 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.import.generic" path="/apps/gnucash/dialogs/import/generic_matcher/">
- <key name="enable_skip" type="b">
+ <schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic-matcher/">
+ <key name="enable-skip" type="b">
<default>true</default>
<summary>Enable SKIP transaction action</summary>
<description>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.</description>
</key>
- <key name="enable_update" type="b">
+ <key name="enable-update" type="b">
<default>true</default>
<summary>Enable UPDATE match action</summary>
<description>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.</description>
</key>
- <key name="use_bayes" type="b">
+ <key name="use-bayes" type="b">
<default>true</default>
<summary>Use bayesian matching</summary>
<description>Enables bayesian matching when matching imported transaction against existing transactions. Otherwise a less sophisticated rule-based matching mechanism will be used.</description>
</key>
- <key name="match_threshold" type="d">
+ <key name="match-threshold" type="d">
<default>1.0</default>
<summary>Minimum score to be displayed</summary>
<description>This field specifies the minimum matching score a potential matching transaction must have to be displayed in the match list.</description>
</key>
- <key name="auto_add_threshold" type="d">
+ <key name="auto-add-threshold" type="d">
<default>3.0</default>
<summary>Add matching transactions below this score</summary>
<description>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.</description>
</key>
- <key name="auto_clear_threshold" type="d">
+ <key name="auto-clear-threshold" type="d">
<default>6.0</default>
<summary>Clear matching transactions above this score</summary>
<description>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.</description>
</key>
- <key name="atm_fee_threshold" type="d">
+ <key name="atm-fee-threshold" type="d">
<default>2.0</default>
<summary>Maximum ATM fee amount in your area</summary>
<description>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.</description>
</key>
- <key name="auto_create_commodity" type="b">
+ <key name="auto-create-commodity" type="b">
<default>false</default>
<summary>Automatically create new commodities</summary>
<description>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.</description>
</key>
- <child name="account_matcher" schema="org.gnucash.dialogs.import.generic.account_matcher"/>
- <child name="matcher_picker" schema="org.gnucash.dialogs.import.generic.matcher_picker"/>
- <child name="transaction_list" schema="org.gnucash.dialogs.import.generic.transaction_list"/>
+ <child name="account-matcher" schema="org.gnucash.dialogs.import.generic.account-matcher"/>
+ <child name="matcher-picker" schema="org.gnucash.dialogs.import.generic.matcher-picker"/>
+ <child name="transaction-list" schema="org.gnucash.dialogs.import.generic.transaction-list"/>
</schema>
- <schema id="org.gnucash.dialogs.import.generic.account_matcher" path="/apps/gnucash/dialogs/import/generic_matcher/account_matcher/">
- <key name="account-code_visible" type="b">
+ <schema id="org.gnucash.dialogs.import.generic.account-matcher" path="/org/gnucash/dialogs/import/generic-matcher/account-matcher/">
+ <key name="account-code-visible" type="b">
<default>false</default>
<summary>Whether or not to display this column</summary>
<description>This setting controls wether the given column will be visible in the view. True means visible, false means hidden.</description>
</key>
- <key name="account-code_width" type="i">
+ <key name="account-code-width" type="i">
<default>0</default>
<summary>Width of this column</summary>
<description>This setting stores the width of the given column in pixels.</description>
</key>
</schema>
- <schema id="org.gnucash.dialogs.import.generic.matcher_picker" path="/apps/gnucash/dialogs/import/generic_matcher/matcher_picker/">
+ <schema id="org.gnucash.dialogs.import.generic.matcher-picker" path="/org/gnucash/dialogs/import/generic-matcher/matcher-picker/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -68,7 +68,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.import.generic.transaction_list" path="/apps/gnucash/dialogs/import/generic_matcher/transaction_list/">
+ <schema id="org.gnucash.dialogs.import.generic.transaction-list" path="/org/gnucash/dialogs/import/generic-matcher/transaction-list/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/import-main-matcher.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
{
Modified: gnucash/trunk/src/import-export/import-match-picker.c
===================================================================
--- gnucash/trunk/src/import-export/import-match-picker.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/import-match-picker.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
{
Modified: gnucash/trunk/src/import-export/import-utilities.h
===================================================================
--- gnucash/trunk/src/import-export/import-utilities.h 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/import-utilities.h 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c
===================================================================
--- gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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;
Modified: gnucash/trunk/src/import-export/ofx/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/ofx/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
===================================================================
--- gnucash/trunk/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,6 +1,6 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.import.ofx" path="/apps/gnucash/dialogs/import/ofx/">
- <key name="last_path" type="s">
+ <schema id="org.gnucash.dialogs.import.ofx" path="/org/gnucash/dialogs/import/ofx/">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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"
Modified: gnucash/trunk/src/import-export/qif-import/dialog-account-picker.glade
===================================================================
--- gnucash/trunk/src/import-export/qif-import/dialog-account-picker.glade 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/qif-import/dialog-account-picker.glade 2013-10-07 14:30:10 UTC (rev 23266)
@@ -26,7 +26,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pref/dialogs.import.qif/show_doc">
+ <object class="GtkCheckButton" id="pref/dialogs.import.qif/show-doc">
<property name="label" translatable="yes">_Show documentation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -48,7 +48,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/dialogs.import.qif/default_status-reconciled">
+ <object class="GtkRadioButton" id="pref/dialogs.import.qif/default-status-reconciled">
<property name="label" translatable="yes">_Reconciled</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -70,7 +70,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/dialogs.import.qif/default_status-cleared">
+ <object class="GtkRadioButton" id="pref/dialogs.import.qif/default-status-cleared">
<property name="label" translatable="yes">_Cleared</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -81,7 +81,7 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/dialogs.import.qif/default_status-reconciled</property>
+ <property name="group">pref/dialogs.import.qif/default-status-reconciled</property>
</object>
<packing>
<property name="top_attach">5</property>
@@ -92,7 +92,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="pref/dialogs.import.qif/default_status-notcleared">
+ <object class="GtkRadioButton" id="pref/dialogs.import.qif/default-status-notcleared">
<property name="label" translatable="yes">_Not cleared</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -103,7 +103,7 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">pref/dialogs.import.qif/default_status-reconciled</property>
+ <property name="group">pref/dialogs.import.qif/default-status-reconciled</property>
</object>
<packing>
<property name="top_attach">4</property>
Modified: gnucash/trunk/src/import-export/qif-import/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/gschemas/Makefile.am 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/qif-import/gschemas/Makefile.am 2013-10-07 14:30:10 UTC (rev 23266)
@@ -5,12 +5,7 @@
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@
Modified: gnucash/trunk/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
===================================================================
--- gnucash/trunk/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1,16 +1,16 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.import.qif" path="/apps/gnucash/dialogs/import/qif/">
- <key name="default_status-notcleared" type="b">
+ <schema id="org.gnucash.dialogs.import.qif" path="/org/gnucash/dialogs/import/qif/">
+ <key name="default-status-notcleared" type="b">
<default>true</default>
<summary>Default QIF transaction status</summary>
<description>Default status for QIF transaction when not specified in QIF file.</description>
</key>
- <key name="default_status-cleared" type="b">
+ <key name="default-status-cleared" type="b">
<default>false</default>
<summary>Default QIF transaction status</summary>
<description>Default status for QIF transaction when not specified in QIF file.</description>
</key>
- <key name="default_status-reconciled" type="b">
+ <key name="default-status-reconciled" type="b">
<default>false</default>
<summary>When the status is not specified in a QIF file, the transactions are marked as reconciled.</summary>
<description>Default status for QIF transaction when not specified in QIF file.</description>
@@ -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.</description>
</key>
- <key name="last_path" type="s">
+ <key name="last-path" type="s">
<default>''</default>
<summary>Last pathname used</summary>
<description>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.</description>
</key>
- <key name="show_doc" type="b">
+ <key name="show-doc" type="b">
<default>true</default>
<summary>Show documentation</summary>
<description>Show some documentation-only pages in QIF Import assistant.</description>
Modified: gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
Modified: gnucash/trunk/src/register/ledger-core/gnc-ledger-display2.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/gnc-ledger-display2.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/register/ledger-core/gnc-ledger-display2.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
Modified: gnucash/trunk/src/register/register-gnome/combocell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/combocell-gnome.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/register/register-gnome/combocell-gnome.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -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
{
Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2013-10-07 14:29:30 UTC (rev 23265)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2013-10-07 14:30:10 UTC (rev 23266)
@@ -1613,9 +1613,9 @@
"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)
{
More information about the gnucash-changes
mailing list