[Gnucash-changes] Convert the "search limit" preference over to
gconf.
David Hampton
hampton at cvs.gnucash.org
Wed Sep 21 23:06:45 EDT 2005
Log Message:
-----------
Convert the "search limit" preference over to gconf.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/app-utils:
prefs.scm
gnucash/src/gnome/schemas:
apps_gnucash_dialog_common.schemas
gnucash/src/gnome-search:
dialog-search.c
gnucash/src/gnome-utils:
preferences.glade
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.289
retrieving revision 1.1487.2.290
diff -LChangeLog -LChangeLog -u -r1.1487.2.289 -r1.1487.2.290
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,18 @@
2005-09-21 David Hampton <hampton at employees.org>
+ * src/app-utils/prefs.scm:
+ * src/gnome/schemas/apps_gnucash_dialog_common.schemas:
+ * src/gnome-search/dialog-search.c:
+ * src/gnome-utils/preferences.glade: Convert the "search limit"
+ preference over to gconf.
+
+ * src/gnome-utils/dialog-transfer.c: Fix warning message when
+ opening reconciliation window.
+
+ * src/gnome-utils/transfer.glade: Fix crash when clicking the "no
+ automatic transfer" button in the automatic interest transfer
+ dialog.
+
* doc/What_is_Euro_support:
* src/app-utils/prefs.scm:
* src/core-utils/gnc-gconf-utils.h:
Index: dialog-search.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-search/dialog-search.c,v
retrieving revision 1.35.4.16
retrieving revision 1.35.4.17
diff -Lsrc/gnome-search/dialog-search.c -Lsrc/gnome-search/dialog-search.c -u -r1.35.4.16 -r1.35.4.17
--- src/gnome-search/dialog-search.c
+++ src/gnome-search/dialog-search.c
@@ -292,7 +292,7 @@
gnc_query_list_reset_query (GNC_QUERY_LIST(sw->result_list), sw->q);
/* set 'new search' if fewer than max_count items is returned. */
- max_count = gnc_lookup_number_option ("_+Advanced", "New Search Limit", 0.0);
+ max_count = gnc_gconf_get_float("dialogs/search", "new_search_limit", NULL);
if (gnc_query_list_get_num_entries(GNC_QUERY_LIST(sw->result_list)) < max_count)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (sw->new_rb), TRUE);
}
Index: prefs.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/prefs.scm,v
retrieving revision 1.28.4.15
retrieving revision 1.28.4.16
diff -Lsrc/app-utils/prefs.scm -Lsrc/app-utils/prefs.scm -u -r1.28.4.15 -r1.28.4.16
--- src/app-utils/prefs.scm
+++ src/app-utils/prefs.scm
@@ -212,11 +212,6 @@
;;; General Options
-(gnc:register-configuration-option
- (gnc:make-simple-boolean-option
- (N_ "General") (N_ "Show Advanced Settings")
- "a" (N_ "Allow modification of less commonly used settings.") #f))
-
;; Network/security options
;;(gnc:register-configuration-option
;; (gnc:make-simple-boolean-option
@@ -243,20 +238,6 @@
;; "www.gnucash.org"))
-;;; Advanced Options
-
-(gnc:register-configuration-option
- (gnc:make-number-range-option
- (N_ "_+Advanced") (N_ "New Search Limit")
- "j" (N_ "Default to 'new search' if fewer than this number of items is returned.")
- 1.0 ;; default
- 1.0 ;; lower bound
- 100.0 ;; upper bound
- 0.0 ;; number of decimals
- 1.0 ;; step size
- ))
-
-
;;; Internal options -- Section names that start with "__" are not
;;; displayed in option dialogs.
Index: apps_gnucash_dialog_common.schemas
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/schemas/Attic/apps_gnucash_dialog_common.schemas,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lsrc/gnome/schemas/apps_gnucash_dialog_common.schemas -Lsrc/gnome/schemas/apps_gnucash_dialog_common.schemas -u -r1.1.2.5 -r1.1.2.6
--- src/gnome/schemas/apps_gnucash_dialog_common.schemas
+++ src/gnome/schemas/apps_gnucash_dialog_common.schemas
@@ -147,5 +147,17 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/search/new_search_limit</key>
+ <applyto>/apps/gnucash/dialogs/search/new_search_limit</applyto>
+ <owner>gnucash</owner>
+ <type>float</type>
+ <default>1.0</default>
+ <locale name="C">
+ <short>Default to 'new search' if fewer than this number of items is returned.</short>
+ <long>Default to 'new search' if fewer than this number of items is returned.</long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
Index: preferences.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/preferences.glade,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lsrc/gnome-utils/preferences.glade -Lsrc/gnome-utils/preferences.glade -u -r1.1.2.8 -r1.1.2.9
--- src/gnome-utils/preferences.glade
+++ src/gnome-utils/preferences.glade
@@ -1012,6 +1012,114 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label84">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label78">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Search Dialog</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">New Search Limit:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">16</property>
+ <property name="bottom_attach">17</property>
+ <property name="x_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="gconf/dialogs/search/new_search_limit">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Default to 'new search' if fewer than this number of items is returned.</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 1 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">16</property>
+ <property name="bottom_attach">17</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="tab_expand">False</property>
More information about the gnucash-changes
mailing list