[Gnucash-changes] Make HBCI setup work again.
David Hampton
hampton at cvs.gnucash.org
Thu Jul 28 23:52:56 EDT 2005
Log Message:
-----------
Make HBCI setup work again. Use gconf and the new preferences dialog
for HBCI preferences. (Would be nice if these could be pushed out to
the dialogs where they apply.)
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
GNOME2_STATUS
gnucash/src/import-export/hbci:
Makefile.am
gnc-hbci-utils.c
gncmod-hbci.c
hbci-interaction.c
hbci-interaction.h
gnucash/src/import-export/hbci/glade:
Makefile.am
hbci.glade
gnucash/src/import-export/hbci/schemas:
Makefile.am
apps_gnucash_dialog_hbci.schemas
Added Files:
-----------
gnucash/src/import-export/hbci/glade:
hbciprefs.glade
Removed Files:
-------------
gnucash/src/import-export/hbci:
hbci.scm
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.256
retrieving revision 1.1487.2.257
diff -LChangeLog -LChangeLog -u -r1.1487.2.256 -r1.1487.2.257
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,36 @@
+2005-07-28 David Hampton <hampton at employees.org>
+
+ * src/import-export/hbci/Makefile.am:
+ * src/import-export/hbci/gnc-hbci-utils.c:
+ * src/import-export/hbci/gncmod-hbci.c:
+ * src/import-export/hbci/hbci-interaction.[ch]:
+ * src/import-export/hbci/hbci.scm:
+ * src/import-export/hbci/glade/Makefile.am:
+ * src/import-export/hbci/glade/hbci.glade:
+ * src/import-export/hbci/glade/hbcipass.glade:
+ * src/import-export/hbci/glade/hbciprefs.glade:
+ * src/import-export/hbci/schemas/Makefile.am:
+ * src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas:
+ Make HBCI setup work again. Use gconf and the new preferences
+ dialog for HBCI preferences. (Would be nice if these could be
+ pushed out to the dialogs where they apply.)
+
+ * src/import-export/import-account-matcher.c: Must specify what
+ columns should be visible columns after adding a new column.
+
+ * src/gnome-utils/gnc-tree-view-account.c: Build a kvp based column properly.
+
+ * src/import-export/hbci/glade/hbcipass.glade: Wrap the text in
+ labels.
+
+ * src/import-export/hbci/glade/hbci.glade: Run through glade-2.6
+ to reset properties to the gtk-2.4 level. The changes are mostly
+ formatting though. Content changes to follow in separate commits.
+
+ * src/gnome-utils/preferences.glade: When selecting the toolbar
+ style use the same labels as the gnome preferences dialog. Add a
+ couple of explicit mnemonic targets.
+
2005-07-27 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/dialog-hbcitrans.c: Eventually enable all
Index: GNOME2_STATUS
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Attic/GNOME2_STATUS,v
retrieving revision 1.1.2.61
retrieving revision 1.1.2.62
diff -LGNOME2_STATUS -LGNOME2_STATUS -u -r1.1.2.61 -r1.1.2.62
--- GNOME2_STATUS
+++ GNOME2_STATUS
@@ -32,7 +32,7 @@
Properties Dialog
QIF Import
OFX Import
-HBCI Actions (Statement download, online transfer)
+HBCI Actions
Export Accounts
Stock Split Dialog
@@ -138,11 +138,8 @@
- Importing
- - HBCI - Transaction templates for not yet work because the GTK_LIST
- code still needs to be changed to GTK_TREE_VIEW. Apart from that,
- everything in the hbci subdirectory works. (Earlier this said:
- "Needs new HTTP support [gnet]", but no, the import-export/hbci
- module does not need any extra http library. cstim, 2005-04-09.)
+ - HBCI - Transaction templates eventually need to be converted from a GTK_CLIST
+ to a GTK_TREE_VIEW. Currently working as a GtkClist.
- Budgeting
Index: hbci.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/glade/hbci.glade,v
retrieving revision 1.27.2.14
retrieving revision 1.27.2.15
diff -Lsrc/import-export/hbci/glade/hbci.glade -Lsrc/import-export/hbci/glade/hbci.glade -u -r1.27.2.14 -r1.27.2.15
--- src/import-export/hbci/glade/hbci.glade
+++ src/import-export/hbci/glade/hbci.glade
@@ -211,13 +211,59 @@
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkTreeView" id="account_page_list">
+ <widget class="GtkCList" id="account_page_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_widths">281,242,53</property>
+ <property name="selection_mode">GTK_SELECTION_SINGLE</property>
+ <property name="show_titles">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <widget class="GtkLabel" id="label834">
+ <property name="label" translatable="yes">HBCI account name</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label835">
+ <property name="label" translatable="yes">GnuCash account name</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label836">
+ <property name="label" translatable="yes">New?</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -2055,13 +2101,29 @@
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkTreeView" id="version_clist">
+ <widget class="GtkCList" id="version_clist">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
+ <property name="n_columns">1</property>
+ <property name="column_widths">80</property>
+ <property name="selection_mode">GTK_SELECTION_SINGLE</property>
+ <property name="show_titles">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <widget class="GtkLabel" id="label8877437">
+ <property name="label" translatable="yes">Version</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>
</child>
</widget>
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/glade/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -Lsrc/import-export/hbci/glade/Makefile.am -Lsrc/import-export/hbci/glade/Makefile.am -u -r1.2 -r1.2.4.1
--- src/import-export/hbci/glade/Makefile.am
+++ src/import-export/hbci/glade/Makefile.am
@@ -1,6 +1,7 @@
gladedir = $(GNC_GLADE_DIR)
glade_DATA = \
hbci.glade \
- hbcipass.glade
+ hbcipass.glade \
+ hbciprefs.glade
EXTRA_DIST = $(glade_DATA)
--- /dev/null
+++ src/import-export/hbci/glade/hbciprefs.glade
@@ -0,0 +1,104 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="window1">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</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="hbci_prefs">
+ <property name="visible">True</property>
+ <property name="n_rows">4</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="label55">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>HBCI</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="checkbutton15">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Remember the PIN for HBCI in memory during a session.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Remember _PIN </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">2</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="checkbutton33">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Activate verbose debug messages for HBCI Online Banking.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Verbose _Debug Messages</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">2</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>
+ </widget>
+ </child>
+</widget>
+
+</glade-interface>
Index: hbci-interaction.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/hbci-interaction.h,v
retrieving revision 1.6.4.5
retrieving revision 1.6.4.6
diff -Lsrc/import-export/hbci/hbci-interaction.h -Lsrc/import-export/hbci/hbci-interaction.h -u -r1.6.4.5 -r1.6.4.6
--- src/import-export/hbci/hbci-interaction.h
+++ src/import-export/hbci/hbci-interaction.h
@@ -26,6 +26,11 @@
#include <aqbanking/banking.h>
#include <gnome.h>
+#define GCONF_SECTION "dialogs/import/hbci"
+#define KEY_CLOSE_ON_FINISH "close_on_finish"
+#define KEY_REMEMBER_PIN "remember_pin"
+#define KEY_VERBOSE_DEBUG "verbose_debug"
+
typedef struct _inter_data GNCInteractor;
/** Adds the interactor and progressmonitor classes to the api. */
--- src/import-export/hbci/hbci.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; hbci.scm
-;; load the HBCI support code
-;;
-;; Copyright (c) 2002 Christian <Stimming at tuhh.de>
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Register Preferences
-(gnc:register-configuration-option
- (gnc:make-simple-boolean-option
- (N_ "Online Banking & Importing") (N_ "HBCI Remember PIN in memory")
- "b" (N_ "Remember the PIN for HBCI in memory during a session")
- #f))
-
-;(gnc:register-configuration-option
-; (gnc:make-simple-boolean-option
-; (N_ "Online Banking & Importing") (N_ "HBCI Use generic import matcher")
-; "b" (N_ "Use the transaction matcher from the generic import infrastructure instead of the HBCI specific one")
-; #f))
-
-(gnc:register-configuration-option
- (gnc:make-simple-boolean-option
- (N_ "_+Advanced") (N_ "HBCI Verbose Debug Messages")
- "m" (N_ "Activate verbose debug messages for HBCI Online Banking.") #f))
Index: hbci-interaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/hbci-interaction.c,v
retrieving revision 1.16.4.14
retrieving revision 1.16.4.15
diff -Lsrc/import-export/hbci/hbci-interaction.c -Lsrc/import-export/hbci/hbci-interaction.c -u -r1.16.4.14 -r1.16.4.15
--- src/import-export/hbci/hbci-interaction.c
+++ src/import-export/hbci/hbci-interaction.c
@@ -44,10 +44,6 @@
#include <iconv.h>
-#define PREF_TAB_ONLINE_BANKING N_("Online Banking & Importing")
-#define GCONF_SECTION "dialogs/import/hbci"
-#define KEY_CLOSE_ON_FINISH "close_on_finish"
-
gchar *gnc__extractText(const char *text);
/** Adds the interactor and progressmonitor classes to the api. */
@@ -66,9 +62,7 @@
g_assert(data->gnc_iconv_handler != (iconv_t)(-1));
data->keepAlive = TRUE;
data->cache_pin =
- gnc_lookup_boolean_option(PREF_TAB_ONLINE_BANKING,
- "HBCI Remember PIN in memory",
- FALSE);
+ gnc_gconf_get_bool(GCONF_SECTION, KEY_REMEMBER_PIN, NULL);
data->showbox_id = 1;
data->showbox_hash = g_hash_table_new(NULL, NULL);
@@ -147,9 +141,7 @@
void GNCInteractor_show_nodelete(GNCInteractor *i)
{
gboolean cache_pin =
- gnc_lookup_boolean_option(PREF_TAB_ONLINE_BANKING,
- "HBCI Remember PIN in memory",
- FALSE);
+ gnc_gconf_get_bool(GCONF_SECTION, KEY_REMEMBER_PIN, NULL);
g_assert(i);
/* Show widgets */
gtk_widget_show_all (i->dialog);
Index: gnc-hbci-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/gnc-hbci-utils.c,v
retrieving revision 1.23.4.11
retrieving revision 1.23.4.12
diff -Lsrc/import-export/hbci/gnc-hbci-utils.c -Lsrc/import-export/hbci/gnc-hbci-utils.c -u -r1.23.4.11 -r1.23.4.12
--- src/import-export/hbci/gnc-hbci-utils.c
+++ src/import-export/hbci/gnc-hbci-utils.c
@@ -32,6 +32,7 @@
#include "gnc-ui.h"
#include "gnc-hbci-kvp.h"
+#include "gnc-gconf-utils.h"
#include "gnc-ui-util.h"
#include "gnc-engine-util.h"
#include "global-options.h"
@@ -438,8 +439,7 @@
if (inter)
GNCInteractor_show (inter);
- if (gnc_lookup_boolean_option("_+Advanced",
- "HBCI Verbose Debug Messages", FALSE)) {
+ if (gnc_gconf_get_bool(GCONF_SECTION, KEY_VERBOSE_DEBUG, NULL)) {
GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevelNotice);
GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevelInfo);
GWEN_Logger_SetLevel("aqhbci", GWEN_LoggerLevelInfo);
Index: gncmod-hbci.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/gncmod-hbci.c,v
retrieving revision 1.16.4.4
retrieving revision 1.16.4.5
diff -Lsrc/import-export/hbci/gncmod-hbci.c -Lsrc/import-export/hbci/gncmod-hbci.c -u -r1.16.4.4 -r1.16.4.5
--- src/import-export/hbci/gncmod-hbci.c
+++ src/import-export/hbci/gncmod-hbci.c
@@ -16,6 +16,7 @@
#include "druid-hbci-initial.h"
#include "gnc-hbci-utils.h"
#include <gwenhywfar/gwenhywfar.h>
+#include "dialog-preferences.h"
/* version of the gnc module system interface we require */
int libgncmod_hbci_LTX_gnc_module_system_interface = 0;
@@ -62,12 +63,12 @@
return FALSE;
}
- /* load the HBCI Scheme code */
- scm_c_eval_string("(load-from-path \"hbci/hbci.scm\")");
-
/* Add menu items with C callbacks */
gnc_plugin_hbci_create_plugin();
+ gnc_preferences_add_to_page("hbciprefs.glade", "hbci_prefs",
+ "Data Import");
+
/* Initialize gwen library */
GWEN_Init();
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/Makefile.am,v
retrieving revision 1.22.4.12
retrieving revision 1.22.4.13
diff -Lsrc/import-export/hbci/Makefile.am -Lsrc/import-export/hbci/Makefile.am -u -r1.22.4.12 -r1.22.4.13
--- src/import-export/hbci/Makefile.am
+++ src/import-export/hbci/Makefile.am
@@ -54,14 +54,6 @@
${GNOME_LIBS} \
${HBCI_LIBS}
-gncscmdir = ${GNC_SCM_INSTALL_DIR}/hbci
-
-gncscm_DATA = \
- hbci.scm
-
-#gladedir = ${GNC_GLADE_DIR}
-#glade_DATA =
-
AM_CFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
Index: apps_gnucash_dialog_hbci.schemas
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/schemas/Attic/apps_gnucash_dialog_hbci.schemas,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas -Lsrc/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas
+++ src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<gconfschemafile>
<schemalist>
+
<schema>
<key>/schemas/apps/gnucash/dialogs/import/hbci/close_on_finish</key>
<applyto>/apps/gnucash/dialogs/import/hbci/close_on_finish</applyto>
@@ -16,5 +17,30 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/hbci/remember_pin</key>
+ <applyto>/apps/gnucash/dialogs/import/hbci/remember_pin</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>False</default>
+ <locale name="C">
+ <short>Remember the PIN for HBCI in memory during a session.</short>
+ <long>Remember the PIN for HBCI in memory during a session.</long>
+ </locale>
+ </schema>
+
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/hbci/verbose_debug</key>
+ <applyto>/apps/gnucash/dialogs/import/hbci/verbose_debug</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>False</default>
+ <locale name="C">
+ <short>Activate verbose debug messages for HBCI Online Banking.</short>
+ <long>Activate verbose debug messages for HBCI Online Banking.</long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/schemas/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/hbci/schemas/Makefile.am -Lsrc/import-export/hbci/schemas/Makefile.am -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/hbci/schemas/Makefile.am
+++ src/import-export/hbci/schemas/Makefile.am
@@ -4,6 +4,7 @@
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
More information about the gnucash-changes
mailing list