[Gnucash-changes] Migrate QIF and 'Generic Matcher' preferences
over to gconf.
David Hampton
hampton at cvs.gnucash.org
Wed Sep 21 20:20:05 EDT 2005
Log Message:
-----------
Migrate QIF and 'Generic Matcher' preferences over to gconf.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
configure.in
gnucash/src/app-utils:
prefs.scm
gnucash/src/import-export:
Makefile.am
generic-import.glade
gncmod-generic-import.c
import-settings.c
gnucash/src/import-export/qif-import:
druid-qif-import.c
gnc-plugin-qif-import.c
qif.glade
Added Files:
-----------
gnucash/src/import-export/schemas:
.cvsignore
Makefile.am
apps_gnucash_import_generic_matcher.schemas
Removed Files:
-------------
gnucash/src/import-export:
generic-import.scm
Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.62
retrieving revision 1.359.2.63
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.62 -r1.359.2.63
--- configure.in
+++ configure.in
@@ -1283,6 +1283,7 @@
src/import-export/qif-import/test/Makefile
src/import-export/qif-io-core/Makefile
src/import-export/qif-io-core/test/Makefile
+ src/import-export/schemas/Makefile
src/import-export/ofx/Makefile
src/import-export/ofx/test/Makefile
src/import-export/mt940/Makefile
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.287
retrieving revision 1.1487.2.288
diff -LChangeLog -LChangeLog -u -r1.1487.2.287 -r1.1487.2.288
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,30 @@
+2005-09-21 David Hampton <hampton at employees.org>
+
+ * configure.in:
+ * src/app-utils/prefs.scm:
+ * src/import-export/Makefile.am:
+ * src/import-export/generic-import.glade:
+ * src/import-export/generic-import.scm:
+ * src/import-export/gncmod-generic-import.c:
+ * src/import-export/import-settings.c:
+ * src/import-export/qif-import/druid-qif-import.c:
+ * src/import-export/qif-import/gnc-plugin-qif-import.c:
+ * src/import-export/qif-import/qif.glade:
+ * src/import-export/schemas/.cvsignore:
+ * src/import-export/schemas/Makefile.am:
+ * src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas:
+ Migrate QIF and 'Generic Matcher' preferences over to gconf.
+
+ * src/import-export/qif-import/qif.glade: Remove non-standard
+ background color declarations.
+
+ * src/gnome-utils/dialog-preferences.c: Do a better job spacing
+ preferences pages that are merged together.
+
+ * src/import-export/qif-import/druid-qif-import.c: Remove
+ double-free of memory. Remove access of GDK window data
+ structure.
+
2005-09-17 David Hampton <hampton at employees.org>
* src/gnome/dialog-price-editor.c:
Index: generic-import.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/generic-import.glade,v
retrieving revision 1.18.4.6
retrieving revision 1.18.4.7
diff -Lsrc/import-export/generic-import.glade -Lsrc/import-export/generic-import.glade -u -r1.18.4.6 -r1.18.4.7
--- src/import-export/generic-import.glade
+++ src/import-export/generic-import.glade
@@ -1215,4 +1215,294 @@
</child>
</widget>
+<widget class="GtkWindow" id="Preferences">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Preferences</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+
+ <child>
+ <widget class="GtkTable" id="matcher_prefs">
+ <property name="visible">True</property>
+ <property name="n_rows">9</property>
+ <property name="n_columns">4</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton1">
+ <property name="tooltip" translatable="yes">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 SKIPed by default.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable SKIP transaction action</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton2">
+ <property name="tooltip" translatable="yes">Enable the EDIT action in the transaction matcher. NOT YET SUPPORTED</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable EDIT match action</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label847787">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Auto-_ADD threshold</property>
+ <property name="use_underline">True</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>
+ <property name="mnemonic_widget">spinbutton2</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label847788">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Auto-CLEAR threshold</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">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label847789">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Commercial ATM fees threshold</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">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label847786">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Match _display threshold</property>
+ <property name="use_underline">True</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>
+ <property name="mnemonic_widget">spinbutton1</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label847785">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Generic Importer</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">4</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton4">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convienience store. These ATM add its 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.</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">2</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">2 0 1000 0.01 1 1</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton3">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</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 6 12 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton2">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</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 6 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The minimum score a potential match must have to be displayed in the match list.</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</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 0 6 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Index: import-settings.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-settings.c,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -Lsrc/import-export/import-settings.c -Lsrc/import-export/import-settings.c -u -r1.4.4.2 -r1.4.4.3
--- src/import-export/import-settings.c
+++ src/import-export/import-settings.c
@@ -32,13 +32,14 @@
#include "dialog-utils.h"
#include "global-options.h"
#include "import-settings.h"
+#include "gnc-gconf-utils.h"
/********************************************************************\
* Default values for user prefs (or values for unimplemented prefs.*
* If you modify the value of any of these, you must do the same in *
* generic-import.scm *
\********************************************************************/
-#define MATCHER_PREF_PAGE _("Online Banking & Importing")
+#define GCONF_SECTION "dialogs/import/generic_matcher"
/** Transaction who's best match probability is equal or higher than
this will reconcile their best match by default */
@@ -101,28 +102,20 @@
settings->action_skip_enabled =
- gnc_lookup_boolean_option(MATCHER_PREF_PAGE,
- "Enable SKIP transaction action",
- DEFAULT_ACTION_SKIP_ENABLED);
+ gnc_gconf_get_bool(GCONF_SECTION, "enable_skip", NULL);
settings->action_edit_enabled =
- gnc_lookup_boolean_option(MATCHER_PREF_PAGE,
- "Enable EDIT match action",
- DEFAULT_ACTION_EDIT_ENABLED);
+ gnc_gconf_get_bool(GCONF_SECTION, "enable_edit", NULL);
settings->action_add_enabled=DEFAULT_ACTION_ADD_ENABLED;
settings->action_clear_enabled=DEFAULT_ACTION_CLEAR_ENABLED;
- settings->clear_threshold=gnc_lookup_number_option(MATCHER_PREF_PAGE,
- "Auto-CLEAR threshold",
- DEFAULT_CLEAR_THRESHOLD);
- settings->add_threshold=gnc_lookup_number_option(MATCHER_PREF_PAGE,
- "Auto-ADD threshold",
- DEFAULT_ADD_THRESHOLD);
+ settings->clear_threshold=
+ gnc_gconf_get_float(GCONF_SECTION, "auto_clear_threshold", NULL);
+ settings->add_threshold=
+ gnc_gconf_get_float(GCONF_SECTION, "auto_add_threshold", NULL);
settings->display_threshold =
- gnc_lookup_number_option(MATCHER_PREF_PAGE,"Match display threshold",
- DEFAULT_DISPLAY_THRESHOLD);
+ gnc_gconf_get_float(GCONF_SECTION, "match_threshold", NULL);
settings->fuzzy_amount =
- gnc_lookup_number_option(MATCHER_PREF_PAGE,"Commercial ATM fees threshold",
- DEFAULT_ATM_FEE_THRESHOLD);
+ gnc_gconf_get_float(GCONF_SECTION, "atm_fee_threshold", NULL);
settings->match_date_hardlimit = 42; /* 6 weeks */
return settings;
--- src/import-export/generic-import.scm
+++ /dev/null
@@ -1,79 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; generic-import.scm
-;;
-;;
-;; Copyright (c) 2002 Benoit Grégoire <bock at step.polymtl.ca>
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;
-; If you ever move the prefs from one page to another, DON'T forget to change MATCHER_PREF_PAGE in import-settings.c !!!!!!!
-;;
-
-;; Register Preferences
-;(gnc:register-configuration-option
-; (gnc:make-simple-boolean-option
-; (N_ "Transaction Matcher") (N_ "Enable SKIP transaction action")
-; "b" (N_ "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 SKIPed by default.")
-; #t))
-
-; Disable for 1.8 release until implemented
-
-;(gnc:register-configuration-option
-; (gnc:make-simple-boolean-option
-; (N_ "Transaction Matcher") (N_ "Enable EDIT match action")
-; "b" (N_ "Enable the EDIT action in the transaction matcher. NOT YET SUPPORTED")
-; #f))
-
-(gnc:register-configuration-option
- (gnc:make-number-range-option
- ;;(N_ "Transaction Matcher")
- (N_ "Online Banking & Importing")
- (N_ "Match display threshold")
- ;; Please leave this sorting argument at no less than "d" since
- ;; other (optional) items might want to appear in front of it.
- "d" (N_ "The minimum score a potential match must have to be displayed in the match list.")
- 1.0 ;; default
- 0.0 ;; lower bound
- 6.0 ;; upper bound
- 0.0 ;; number of decimals
- 1.0 ;; step size
- ))
-
-(gnc:register-configuration-option
- (gnc:make-number-range-option
- ;;(N_ "Transaction Matcher")
- (N_ "Online Banking & Importing")
- (N_ "Auto-ADD threshold")
- "e" (N_ "A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.")
- 3.0 ;; default
- 1.0 ;; lower bound
- 6.0 ;; upper bound
- 0.0 ;; number of decimals
- 1.0 ;; step size
- ))
-
-(gnc:register-configuration-option
- (gnc:make-number-range-option
- ;;(N_ "Transaction Matcher")
- (N_ "Online Banking & Importing")
- (N_ "Auto-CLEAR threshold")
- "f" (N_ "A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.")
- 6.0 ;; default
- 1.0 ;; lower bound
- 12.0 ;; upper bound
- 0.0 ;; number of decimals
- 1.0 ;; step size
- ))
-
-(gnc:register-configuration-option
- (gnc:make-number-range-option
- ;;(N_ "Transaction Matcher")
- (N_ "Online Banking & Importing")
- (N_ "Commercial ATM fees threshold")
- "g" (N_ "In some places commercial ATMs (not belonging to a financial institution) are installed in places like convienience store. These ATM add its 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.")
- 2.00 ;; default
- 0.0 ;; lower bound
- 1000.0 ;; upper bound
- 2.0 ;; number of decimals
- 0.01 ;; step size
- ))
Index: gncmod-generic-import.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/gncmod-generic-import.c,v
retrieving revision 1.7.4.2
retrieving revision 1.7.4.3
diff -Lsrc/import-export/gncmod-generic-import.c -Lsrc/import-export/gncmod-generic-import.c -u -r1.7.4.2 -r1.7.4.3
--- src/import-export/gncmod-generic-import.c
+++ src/import-export/gncmod-generic-import.c
@@ -9,6 +9,7 @@
#include <libguile.h>
#include "gnc-import-format-gnome.h"
+#include "dialog-preferences.h"
#include "gnc-module.h"
#include "gnc-module-api.h"
@@ -54,10 +55,12 @@
{
return FALSE;
}
- scm_c_eval_string("(load-from-path \"generic-import/generic-import.scm\")");
if (!refcount) {
gnc_import_format_gnome_register();
+ gnc_preferences_add_to_page("generic-import.glade", "matcher_prefs",
+ "Online Banking");
+
}
return TRUE;
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/Makefile.am,v
retrieving revision 1.25.4.11
retrieving revision 1.25.4.12
diff -Lsrc/import-export/Makefile.am -Lsrc/import-export/Makefile.am -u -r1.25.4.11 -r1.25.4.12
--- src/import-export/Makefile.am
+++ src/import-export/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . binary-import qif qif-import ${OFX_DIR} ${HBCI_DIR} ${MT940_DIR} log-replay test
+SUBDIRS = . schemas binary-import qif qif-import ${OFX_DIR} ${HBCI_DIR} ${MT940_DIR} log-replay test
DIST_SUBDIRS = binary-import qif qif-import qif-io-core ofx hbci mt940 log-replay test
pkglib_LTLIBRARIES=libgncmod-generic-import.la
@@ -44,14 +44,10 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
+ ${top_builddir}/src/core-utils/libcore-utils.la \
${GLADE_LIBS} \
${GLIB_LIBS}
-gncscmdir = ${GNC_SCM_INSTALL_DIR}/generic-import
-
-gncscm_DATA = \
- generic-import.scm
-
gladedir = ${GNC_GLADE_DIR}
glade_DATA = \
generic-import.glade \
@@ -59,6 +55,7 @@
AM_CFLAGS = \
-I${top_srcdir}/src \
+ -I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
@@ -74,7 +71,6 @@
EXTRA_DIST = \
$(glade_DATA) \
- ${gncscm_DATA} \
.cvsignore \
generic-import-design.txt
Index: druid-qif-import.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-import/druid-qif-import.c,v
retrieving revision 1.22.4.14
retrieving revision 1.22.4.15
diff -Lsrc/import-export/qif-import/druid-qif-import.c -Lsrc/import-export/qif-import/druid-qif-import.c -u -r1.22.4.14 -r1.22.4.15
--- src/import-export/qif-import/druid-qif-import.c
+++ src/import-export/qif-import/druid-qif-import.c
@@ -1955,9 +1955,7 @@
retval->commodity_pages = NULL;
retval->show_doc_pages =
- gnc_lookup_boolean_option("Online Banking & Importing",
- "QIF Verbose documentation",
- TRUE);
+ gnc_gconf_get_bool("dialogs/import/qif", "show_doc", NULL);
for(i=0; i < NUM_PRE_PAGES; i++) {
retval->pre_comm_pages =
Index: gnc-plugin-qif-import.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-import/Attic/gnc-plugin-qif-import.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -Lsrc/import-export/qif-import/gnc-plugin-qif-import.c -Lsrc/import-export/qif-import/gnc-plugin-qif-import.c -u -r1.1.2.12 -r1.1.2.13
--- src/import-export/qif-import/gnc-plugin-qif-import.c
+++ src/import-export/qif-import/gnc-plugin-qif-import.c
@@ -26,6 +26,7 @@
#include "gnc-plugin-qif-import.h"
#include "gnc-plugin-manager.h"
+#include "dialog-preferences.h"
#include "druid-qif-import.h"
#include "messages.h"
@@ -164,4 +165,6 @@
GncPlugin *plugin = gnc_plugin_qif_import_new ();
gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (), plugin);
+ gnc_preferences_add_to_page ("qif.glade", "prefs_table",
+ "Online Banking");
}
Index: qif.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-import/qif.glade,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -Lsrc/import-export/qif-import/qif.glade -Lsrc/import-export/qif-import/qif.glade -u -r1.3.4.5 -r1.3.4.6
--- src/import-export/qif-import/qif.glade
+++ src/import-export/qif-import/qif.glade
@@ -215,13 +215,8 @@
accounts will not be changed until you click "Finish"
at the end of the process.
-Click "Next" to start loading your QIF data, or "Cancel"
+Click "Forward" to start loading your QIF data, or "Cancel"
to abort the process. </property>
- <property name="title_color">#ffffffffffff</property>
- <property name="text_color">#000000000000</property>
- <property name="background_color">#9999bfbf9999</property>
- <property name="logo_background_color">#ffffffffffff</property>
- <property name="textbox_color">#ffffffffffff</property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
</widget>
</child>
@@ -230,9 +225,7 @@
<widget class="GnomeDruidPageStandard" id="load_file_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Select a QIF file to load</property>
- <property name="title_foreground">#5b50082ddd38</property>
- <property name="background">#6800082de9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_load_file_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_load_file_back_cb"/>
@@ -246,7 +239,7 @@
<child>
<widget class="GtkLabel" id="label822">
<property name="visible">True</property>
- <property name="label" translatable="yes">Please select a file to load. When you click "Next", the file will be loaded
+ <property name="label" translatable="yes">Please select a file to load. When you click "Forward", the file will be loaded
and analyzed. You may need to answer some questions about the account(s)
in the file.
@@ -350,9 +343,7 @@
<widget class="GnomeDruidPageStandard" id="date_format_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Set a date format for this QIF file</property>
- <property name="title_foreground">#a2d8082ddd38</property>
- <property name="background">#b2d8082de9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_date_format_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_default_acct_back_cb"/>
@@ -482,9 +473,7 @@
<widget class="GnomeDruidPageStandard" id="account_name_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Set the default QIF account name</property>
- <property name="title_foreground">#1170082edd38</property>
- <property name="background">#2398082ee9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_default_acct_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_default_acct_back_cb"/>
@@ -605,9 +594,7 @@
<widget class="GnomeDruidPageStandard" id="loaded_files_page">
<property name="visible">True</property>
<property name="title" translatable="yes">QIF files you have loaded</property>
- <property name="title_foreground">#3f68082edd38</property>
- <property name="background">#4a50082ee9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="prepare" handler="gnc_ui_qif_import_loaded_files_prepare_cb"/>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -696,7 +683,7 @@
<property name="label" translatable="yes">Click "Load another file" if you have more data to import at this time.
Do this if you have saved your accounts to separate QIF files.
-Click "Next" to finish loading files and move to the next step
+Click "Forward" to finish loading files and move to the next step
of the QIF import process. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
@@ -770,9 +757,7 @@
<widget class="GnomeDruidPageStandard" id="account_doc_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Accounts and stock holdings</property>
- <property name="title_foreground">#a410082edd38</property>
- <property name="background">#a9a8082ee9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -825,9 +810,7 @@
<widget class="GnomeDruidPageStandard" id="account_match_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Match QIF accounts with GnuCash accounts</property>
- <property name="title_foreground">#b648082edd38</property>
- <property name="background">#e3a8082ee9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="prepare" handler="gnc_ui_qif_import_accounts_prepare_cb"/>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -915,7 +898,7 @@
<child>
<widget class="GtkLabel" id="label828">
<property name="visible">True</property>
- <property name="label" translatable="yes">Click "Next" to check matchings for QIF categories. </property>
+ <property name="label" translatable="yes">Click "Forward" to check matchings for QIF categories. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -941,9 +924,7 @@
<widget class="GnomeDruidPageStandard" id="category_doc_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Income and Expense categories</property>
- <property name="title_foreground">#20e8082fdd38</property>
- <property name="background">#33a8082fe9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -992,9 +973,7 @@
<widget class="GnomeDruidPageStandard" id="category_match_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Match QIF categories with GnuCash accounts</property>
- <property name="title_foreground">#47f0082fdd38</property>
- <property name="background">#5938082fe9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="prepare" handler="gnc_ui_qif_import_categories_prepare_cb"/>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -1082,7 +1061,7 @@
<child>
<widget class="GtkLabel" id="label829">
<property name="visible">True</property>
- <property name="label" translatable="yes">Click "Next" to enter information about the currency used in your QIF files.</property>
+ <property name="label" translatable="yes">Click "Forward" to enter information about the currency used in your QIF files.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1108,9 +1087,7 @@
<widget class="GnomeDruidPageStandard" id="memo_doc_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Payees and memos</property>
- <property name="title_foreground">#8b78082fdd38</property>
- <property name="background">#9d38082fe9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -1158,9 +1135,7 @@
<widget class="GnomeDruidPageStandard" id="memo_match_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Match payees/memos to GnuCash accounts</property>
- <property name="title_foreground">#9ff8082fdd38</property>
- <property name="background">#bd98082fe9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_memo_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
<signal name="prepare" handler="gnc_ui_qif_import_memo_prepare_cb"/>
@@ -1253,9 +1228,7 @@
<widget class="GnomeDruidPageStandard" id="currency_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Enter the currency used for new accounts</property>
- <property name="title_foreground">#eee8082fdd38</property>
- <property name="background">#f7f8082fe9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_currency_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -1354,7 +1327,7 @@
<child>
<widget class="GtkLabel" id="label832">
<property name="visible">True</property>
- <property name="label" translatable="yes">Click "Next" to enter information about stocks and
+ <property name="label" translatable="yes">Click "Forward" to enter information about stocks and
mutual funds in the imported data.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
@@ -1382,9 +1355,7 @@
<widget class="GnomeDruidPageStandard" id="commodity_doc_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Tradable commodities</property>
- <property name="title_foreground">#3fe80830dd38</property>
- <property name="background">#47800830e9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="prepare" handler="gnc_ui_qif_import_commodity_prepare_cb"/>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -1437,9 +1408,7 @@
<widget class="GnomeDruidPageStandard" id="match_doc_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Match duplicate transactions</property>
- <property name="title_foreground">#52180830dd38</property>
- <property name="background">#35a80830e9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -1468,7 +1437,7 @@
You can control the rules used by GnuCash to find duplicate transactions
in the "QIF Import" section of the GnuCash Preferences dialog.
-Click "Next" to find duplicate transactions. </property>
+Click "Forward" to find duplicate transactions. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1494,9 +1463,7 @@
<widget class="GnomeDruidPageStandard" id="match_duplicates_page">
<property name="visible">True</property>
<property name="title" translatable="yes">Select possible duplicates</property>
- <property name="title_foreground">#76180830dd38</property>
- <property name="background">#a8400830e9eb</property>
- <property name="logo_background">#1e40081d0001</property>
+ <property name="title_foreground">#f5f5f5f5f5f5</property>
<signal name="next" handler="gnc_ui_qif_import_generic_next_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
@@ -1756,11 +1723,6 @@
or to add more files to the staging area.
Click "Cancel" to abort the QIF import process.</property>
- <property name="title_color">#ffffffffffff</property>
- <property name="text_color">#010101010101</property>
- <property name="background_color">#9a9abfbf9a9a</property>
- <property name="logo_background_color">#ffffffffffff</property>
- <property name="textbox_color">#ffffffffffff</property>
<signal name="finish" handler="gnc_ui_qif_import_finish_cb"/>
<signal name="back" handler="gnc_ui_qif_import_generic_back_cb"/>
</widget>
@@ -1769,4 +1731,78 @@
</child>
</widget>
+<widget class="GtkWindow" id="Preferences">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Preferences</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+
+ <child>
+ <widget class="GtkTable" id="prefs_table">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">4</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label847718">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>QIF Import</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">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="gconf/dialogs/import/qif/show_doc">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show some documentation-only pages in QIF Import druid.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show documentation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Index: prefs.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/prefs.scm,v
retrieving revision 1.28.4.13
retrieving revision 1.28.4.14
diff -Lsrc/app-utils/prefs.scm -Lsrc/app-utils/prefs.scm -u -r1.28.4.13 -r1.28.4.14
--- src/app-utils/prefs.scm
+++ src/app-utils/prefs.scm
@@ -247,15 +247,6 @@
(N_ "General") (N_ "Show Advanced Settings")
"a" (N_ "Allow modification of less commonly used settings.") #f))
-;; QIF Import options.
-
-(gnc:register-configuration-option
- (gnc:make-simple-boolean-option
- (N_ "Online Banking & Importing") (N_ "QIF Verbose documentation")
- "a" (N_ "Show some documentation-only pages in QIF Import druid")
- #t))
-
-
;; Network/security options
;;(gnc:register-configuration-option
;; (gnc:make-simple-boolean-option
--- /dev/null
+++ src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/enable_skip</key>
+ <applyto>/apps/gnucash/dialogs/import/generic_matcher/enable_skip</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>TRUE</default>
+ <locale name="C">
+ <short>Enable SKIP transaction action</short>
+ <long>
+ 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 SKIPed by default.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/enable_edit</key>
+ <applyto>/apps/gnucash/dialogs/import/generic_matcher/enable_edit</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>FALSE</default>
+ <locale name="C">
+ <short>Enable EDIT transaction action</short>
+ <long>
+ Enable the EDIT action in the transaction matcher. NOT YET
+ SUPPORTED.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/match_threshold</key>
+ <applyto>/apps/gnucash/dialogs/import/generic_matcher/match_threshold</applyto>
+ <owner>gnucash</owner>
+ <type>float</type>
+ <default>1.0</default>
+ <locale name="C">
+ <short>
+ The minimum score a potential match must have to be
+ displayed in the match list.
+ </short>
+ <long>
+ The minimum score a potential match must have to be
+ displayed in the match list.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_add_threshold</key>
+ <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_add_threshold</applyto>
+ <owner>gnucash</owner>
+ <type>float</type>
+ <default>3.0</default>
+ <locale name="C">
+ <short>
+ Score below this is automatically added.
+ </short>
+ <long>
+ A transaction whose best match's score is in the red zone
+ (above the display threshold but below or equal to the
+ Auto-ADD threshold) will be ADDed by default.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_clear_threshold</key>
+ <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_clear_threshold</applyto>
+ <owner>gnucash</owner>
+ <type>float</type>
+ <default>6.0</default>
+ <locale name="C">
+ <short>
+ Score above this is automatically cleared.
+ </short>
+ <long>
+ A transaction whose best match's score is in the green zone
+ (above or equal to the Auto-CLEAR threshold) will be CLEARed
+ by default.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/atm_fee_threshold</key>
+ <applyto>/apps/gnucash/dialogs/import/generic_matcher/atm_fee_threshold</applyto>
+ <owner>gnucash</owner>
+ <type>float</type>
+ <default>2.0</default>
+ <locale name="C">
+ <short>
+ Maximum atm fees in your area.
+ </short>
+ <long>
+ In some places commercial ATMs (not belonging to a financial
+ institution) are installed in places like convienience
+ store. These ATM add its 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.
+ </long>
+ </locale>
+ </schema>
+
+ </schemalist>
+</gconfschemafile>
--- /dev/null
+++ src/import-export/schemas/.cvsignore
@@ -0,0 +1,8 @@
+*.gladep
+*.la
+*.lo
+.deps
+.libs
+.scm-links
+Makefile
+Makefile.in
--- /dev/null
+++ src/import-export/schemas/Makefile.am
@@ -0,0 +1,15 @@
+schemadir = @GCONF_SCHEMA_FILE_DIR@
+schema_DATA = \
+ apps_gnucash_import_generic_matcher.schemas
+
+install-data-local:
+if GCONF_SCHEMAS_INSTALL
+ -mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+endif
+
+uninstall-local:
+if GCONF_SCHEMAS_INSTALL
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+endif
+
More information about the gnucash-changes
mailing list