From ce33da254f3d62e0e58e7ab97768663efeea9d35 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Mon, 7 Oct 2013 14:31:50 +0000 Subject: [PATCH] Gsettings schema corrections git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23272 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/app-utils/gnc-ui-util.c | 4 +- src/gnome/dialog-price-editor.c | 2 +- src/gnome/gschemas/Makefile.am | 3 +- ...gnucash.dialogs.commodities.gschema.xml.in | 72 ++----------------- .../org.gnucash.dialogs.gschema.xml.in | 31 -------- .../org.gnucash.dialogs.prices.gschema.xml.in | 22 ++---- src/gnome/gschemas/org.gnucash.gschema.xml.in | 9 +-- ...ucash.window.pages.register.gschema.xml.in | 9 --- ....gnucash.dialogs.export.csv.gschema.xml.in | 2 +- ...cash.dialogs.import.generic.gschema.xml.in | 22 ++---- 10 files changed, 25 insertions(+), 151 deletions(-) delete mode 100644 src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in diff --git a/src/app-utils/gnc-ui-util.c b/src/app-utils/gnc-ui-util.c index 667532bdfc..4de05812e5 100644 --- a/src/app-utils/gnc-ui-util.c +++ b/src/app-utils/gnc-ui-util.c @@ -2290,7 +2290,7 @@ static void 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 @@ gnc_auto_decimal_init (void) 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 diff --git a/src/gnome/dialog-price-editor.c b/src/gnome/dialog-price-editor.c index 282282e249..9090c3b7f5 100644 --- a/src/gnome/dialog-price-editor.c +++ b/src/gnome/dialog-price-editor.c @@ -49,7 +49,7 @@ #define DIALOG_PRICE_EDIT_CM_CLASS "dialog-price-edit" -#define GNC_PREFS_GROUP "dialogs.price-editor" +#define GNC_PREFS_GROUP "dialogs.prices" #define DIALOG_PRICE_EDIT_SOURCE "user:price-editor" diff --git a/src/gnome/gschemas/Makefile.am b/src/gnome/gschemas/Makefile.am index 904d42ba5e..39abd7e194 100644 --- a/src/gnome/gschemas/Makefile.am +++ b/src/gnome/gschemas/Makefile.am @@ -10,8 +10,7 @@ gschema_in_files = \ 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) diff --git a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in index 4e932383bd..63a617cc75 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in @@ -1,74 +1,16 @@ - - [ 'namespace', 'symbol', 'name', 'printname', 'uniquename', 'cusip_code', 'fraction', 'quote_flag', 'quote_source', 'quote_timezone' ] - Order of columns in the dialog - This setting contains a list of names which controls the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order. - - - true - Show the Namespace column - Show the Namespace column - - - true - Show the symbol column - Show the symbol column - - - true - Show the name column - Show the name column - - - false - Show the Full Name column - Show the Full Name column - - - false - Show the Print Name column - Show the Print Name column - - - false - Show the Unique Name column - Show the Unique Name column - - - true - Show the ISIN/CUSIP Code (Exchange Specific Data) column - Show the ISIN/CUSIP Code (Exchange Specific Data) column - - - true - Show the fraction column - Show the fraction column - - - false - Show the Quote Flag column - Show the Quote Flag column - - - false - Show the Quote Source column - Show the Quote Source column - - - false - Show the Quote Timezone column - Show the Quote Timezone column - - - 0 - Width of this column - This setting stores the width of the given column in pixels. - false Show currencies in this dialog Show currencies in this dialog + + (-1,-1,-1,-1) + Last window position and size + 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. + diff --git a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in index 0dad24ac55..6c4fdf92c1 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in @@ -1,7 +1,6 @@ - @@ -31,16 +30,6 @@ - - - (-1,-1,-1,-1) - Last window position and size - 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. - - - (-1,-1,-1,-1) @@ -153,26 +142,6 @@ - - - (-1,-1,-1,-1) - Last window position and size - 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. - - - [] - Columns used for sorting - This setting indicates which column in the tree is used for sorting. Possible values for this setting are the name of any column in this window (see the column-order key) or the keyword 'none'. - - - [] - Sort column ascending or descending - This setting indicates how the key column is sorted. Possible values for this setting are 'ascending' and 'descending'. - - - 200 diff --git a/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in index ca4e52b357..084f9b28d3 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.prices.gschema.xml.in @@ -1,19 +1,11 @@ - - - [ 'commodity', 'currency', 'date', 'source', 'type', 'price' ] - Order of columns in the dialog - This setting contains a list of names which controls the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order. - - - true - Display this column - This setting controls wether the given column will be visible in the view. TRUE means visible, FALSE means hidden. - - - 0 - Width of this column - This setting stores the width of the given column in pixels. + + + (-1,-1,-1,-1) + Last window position and size + 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. diff --git a/src/gnome/gschemas/org.gnucash.gschema.xml.in b/src/gnome/gschemas/org.gnucash.gschema.xml.in index f1a4d62972..7084e45381 100644 --- a/src/gnome/gschemas/org.gnucash.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.gschema.xml.in @@ -39,8 +39,8 @@ Automatically insert a decimal point If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers. - - 2.0 + + 2 Number of automatic decimal places This field specifies the number of automatic decimal places that will be filled in. @@ -297,11 +297,6 @@ Create a new window for each new report If active, each new report will be opened in its own window. Otherwise new reports will be opened as tabs in the main window. - - 'locale' - Source of default report currency - This setting controls the default currency used for reports. If set to "locale" then GnuCash will retrieve the default currency from the user's locale setting. If set to "other", GnuCash will use the setting specified by the currency-other key. - true Use the system locale currency for all newly created reports. diff --git a/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in b/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in deleted file mode 100644 index de950c110b..0000000000 --- a/src/gnome/gschemas/org.gnucash.window.pages.register.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - 0 - Width of a column in the dialog - This setting contains the width of the named column in the most recently closed register window. Changing these values will change the sizes of the columns in the next opened register - - - diff --git a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in b/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in index 541e33b4cf..ec7b844c0c 100644 --- a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in +++ b/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in @@ -1,5 +1,5 @@ - + (-1,-1,-1,-1) Last window position and size diff --git a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in b/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in index 2ff4462865..e9ecd5a2fb 100644 --- a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in +++ b/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in @@ -1,5 +1,5 @@ - + true Enable SKIP transaction action @@ -40,25 +40,11 @@ Automatically create new commodities Enables the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity. - - + - - - false - Whether or not to display this column - This setting controls wether the given column will be visible in the view. True means visible, false means hidden. - - - 0 - Width of this column - This setting stores the width of the given column in pixels. - - - - + (-1,-1,-1,-1) Last window position and size @@ -68,7 +54,7 @@ - + (-1,-1,-1,-1) Last window position and size