r23272 - gnucash/trunk/src - Gsettings schema corrections
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 7 10:31:50 EDT 2013
Author: gjanssens
Date: 2013-10-07 10:31:50 -0400 (Mon, 07 Oct 2013)
New Revision: 23272
Trac: http://svn.gnucash.org/trac/changeset/23272
Removed:
gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in
Modified:
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/gnome/dialog-price-editor.c
gnucash/trunk/src/gnome/gschemas/Makefile.am
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.gschema.xml.in
gnucash/trunk/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
gnucash/trunk/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
Log:
Gsettings schema corrections
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2013-10-07 14:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2013-10-07 14:31:50 UTC (rev 23272)
@@ -2290,7 +2290,7 @@
gnc_set_auto_decimal_places (gpointer settings, gchar *key, gpointer user_data)
{
auto_decimal_places =
- gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL, GNC_PREF_AUTO_DECIMAL_PLACES);
+ gnc_prefs_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_AUTO_DECIMAL_PLACES);
}
static void
@@ -2299,7 +2299,7 @@
auto_decimal_enabled =
gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_AUTO_DECIMAL_POINT);
auto_decimal_places =
- gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL, GNC_PREF_AUTO_DECIMAL_PLACES);
+ gnc_prefs_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_AUTO_DECIMAL_PLACES);
}
void
Modified: gnucash/trunk/src/gnome/dialog-price-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-editor.c 2013-10-07 14:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/dialog-price-editor.c 2013-10-07 14:31:50 UTC (rev 23272)
@@ -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.prices"
#define DIALOG_PRICE_EDIT_SOURCE "user:price-editor"
Modified: gnucash/trunk/src/gnome/gschemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/gschemas/Makefile.am 2013-10-07 14:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/gschemas/Makefile.am 2013-10-07 14:31:50 UTC (rev 23272)
@@ -10,8 +10,7 @@
org.gnucash.dialogs.totd.gschema.xml.in \
org.gnucash.gschema.xml.in \
org.gnucash.window.pages.account.tree.gschema.xml.in \
- org.gnucash.window.pages.gschema.xml.in \
- org.gnucash.window.pages.register.gschema.xml.in
+ org.gnucash.window.pages.gschema.xml.in
gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -1,74 +1,16 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
<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">
- <default>true</default>
- <summary>Show the Namespace column</summary>
- <description>Show the Namespace column</description>
- </key>
- <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">
- <default>true</default>
- <summary>Show the name column</summary>
- <description>Show the name column</description>
- </key>
- <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">
- <default>false</default>
- <summary>Show the Print Name column</summary>
- <description>Show the Print Name column</description>
- </key>
- <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">
- <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">
- <default>true</default>
- <summary>Show the fraction column</summary>
- <description>Show the fraction column</description>
- </key>
- <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">
- <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">
- <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">
- <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">
<default>false</default>
<summary>Show currencies in this dialog</summary>
<description>Show currencies in this dialog</description>
</key>
+ <key name="last-geometry" type="(iiii)">
+ <default>(-1,-1,-1,-1)</default>
+ <summary>Last window position and size</summary>
+ <description>This setting describes the size and position of the window when it was last closed.
+ 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>
</schema>
</schemalist>
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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -1,7 +1,6 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
<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="preferences" schema="org.gnucash.dialogs.preferences"/>
<child name="price-editor" schema="org.gnucash.dialogs.price-editor"/>
@@ -31,16 +30,6 @@
</key>
</schema>
- <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>
- <description>This setting describes the size and position of the window when it was last closed.
- 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>
- </schema>
-
<schema id="org.gnucash.dialogs.preferences" path="/org/gnucash/dialogs/preferences/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
@@ -153,26 +142,6 @@
</key>
</schema>
- <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>
- <description>This setting describes the size and position of the window when it was last closed.
- 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">
- <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>
- </key>
- <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="/org/gnucash/dialogs/lot-viewer/">
<key name="hpane-position" type="i">
<default>200</default>
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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -1,19 +1,11 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <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>
+ <schema id="org.gnucash.dialogs.prices" path="/org/gnucash/dialogs/prices/">
+ <key name="last-geometry" type="(iiii)">
+ <default>(-1,-1,-1,-1)</default>
+ <summary>Last window position and size</summary>
+ <description>This setting describes the size and position of the window when it was last closed.
+ 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="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">
- <default>0</default>
- <summary>Width of this column</summary>
- <description>This setting stores the width of the given column in pixels.</description>
- </key>
</schema>
</schemalist>
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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -39,8 +39,8 @@
<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">
- <default>2.0</default>
+ <key name="auto-decimal-places" type="i">
+ <default>2</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>
@@ -297,11 +297,6 @@
<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">
- <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>
- </key>
<key name="currency-choice-locale" type="b">
<default>true</default>
<summary>Use the system locale currency for all newly created reports.</summary>
Deleted: 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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -1,9 +0,0 @@
-<schemalist gettext-domain="GETTEXT_PACKAGE">
- <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>
- </key>
- </schema>
-</schemalist>
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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -1,5 +1,5 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.export.csv" path="/apps/gnucash/dialogs/export/csv/">
+ <schema id="org.gnucash.dialogs.export.csv" path="/org/gnucash/dialogs/export/csv/">
<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/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:31:37 UTC (rev 23271)
+++ gnucash/trunk/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in 2013-10-07 14:31:50 UTC (rev 23272)
@@ -1,5 +1,5 @@
<schemalist gettext-domain="GETTEXT_PACKAGE">
- <schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic-matcher/">
+ <schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic/">
<key name="enable-skip" type="b">
<default>true</default>
<summary>Enable SKIP transaction action</summary>
@@ -40,25 +40,11 @@
<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="match-picker" schema="org.gnucash.dialogs.import.generic.match-picker"/>
<child name="transaction-list" schema="org.gnucash.dialogs.import.generic.transaction-list"/>
</schema>
- <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">
- <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="/org/gnucash/dialogs/import/generic-matcher/matcher-picker/">
+ <schema id="org.gnucash.dialogs.import.generic.match-picker" path="/org/gnucash/dialogs/import/generic/match-picker/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
@@ -68,7 +54,7 @@
</key>
</schema>
- <schema id="org.gnucash.dialogs.import.generic.transaction-list" path="/org/gnucash/dialogs/import/generic-matcher/transaction-list/">
+ <schema id="org.gnucash.dialogs.import.generic.transaction-list" path="/org/gnucash/dialogs/import/generic/transaction-list/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>
<summary>Last window position and size</summary>
More information about the gnucash-changes
mailing list