From 2a990a6cfd4770936dca58ccf9eb23c6be206a38 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Wed, 24 Jul 2002 06:31:26 +0000 Subject: [PATCH] 2002-07-24 Christian Stimming * src/import-export/hbci/glade/hbci.glade: Some HBCI GUI work -- still no real code yet. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7124 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 + src/import-export/hbci/Makefile.am | 56 +- src/import-export/hbci/glade/hbci.glade | 1564 +++++++++++++++++++++++ src/import-export/hbci/gncmod-hbci.c | 16 +- src/import-export/hbci/hbci.scm | 9 +- 5 files changed, 1600 insertions(+), 50 deletions(-) create mode 100644 src/import-export/hbci/glade/hbci.glade diff --git a/ChangeLog b/ChangeLog index 037c3038b2..dd2d291cb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-07-24 Christian Stimming + + * src/import-export/hbci/glade/hbci.glade: Some HBCI GUI work -- + still no real code yet. + 2002-07-21 Christian Stimming * src/app-utils/guile-util.c (gnc_get_debit_string): Fix by Matt diff --git a/src/import-export/hbci/Makefile.am b/src/import-export/hbci/Makefile.am index fd6c557891..56745cc141 100644 --- a/src/import-export/hbci/Makefile.am +++ b/src/import-export/hbci/Makefile.am @@ -1,40 +1,18 @@ -SUBDIRS = . test +gladedir = $(GNC_GLADE_DIR) +glade_DATA = \ + account.glade \ + commodities.glade \ + fincalc.glade \ + help.glade \ + newuser.glade \ + price.glade \ + print.glade \ + progress.glade \ + register.glade \ + stocks.glade \ + tax.glade \ + transfer.glade \ + userpass.glade \ + sched-xact.glade -pkglib_LTLIBRARIES = libgncmod-hbci.la - -libgncmod_hbci_la_SOURCES = \ - gncmod-hbci.c - -libgncmod_hbci_la_LDFLAGS = -module -libgncmod_hbci_la_LIBADD = \ - ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/src/app-file/libgncmod-app-file.la \ - ${top_builddir}/src/gnc-module/libgncmodule.la \ - ${top_builddir}/src/engine/libgncmod-engine.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} - -AM_CFLAGS = -I${top_srcdir}/src/gnc-module \ - ${GLIB_CFLAGS} \ - ${GUILE_INCS} - - -.scm-links: - rm -f gnucash import-export - ln -sf . gnucash - ln -sf . import-export - touch .scm-links - -noinst_DATA = .scm-links - -gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/import-export -gncscmmod_DATA = hbci.scm - -gncscmdir = ${GNC_SHAREDIR}/scm -gncscm_DATA = - -EXTRA_DIST = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} - -CLEANFILES = ${SCM_FILE_LINKS} gnucash import-export .scm-links +EXTRA_DIST = $(glade_DATA) diff --git a/src/import-export/hbci/glade/hbci.glade b/src/import-export/hbci/glade/hbci.glade new file mode 100644 index 0000000000..e2e5a5d1ea --- /dev/null +++ b/src/import-export/hbci/glade/hbci.glade @@ -0,0 +1,1564 @@ + + + + + Glade + glade + + + + C + True + True + False + False + False + False + + + + GnomeDialog + Account Dialog + New Account + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox12 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area12 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button63 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + cancel_button + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + GtkButton + button72 + True + True + GNOME_STOCK_BUTTON_HELP + + + + + GtkNotebook + account_notebook + True + True + True + GTK_POS_TOP + False + 2 + 2 + False + + 0 + True + True + + + + GtkVBox + vbox75 + False + 0 + + + GtkFrame + frame28 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkHBox + hbox62 + False + 0 + + + GtkVBox + vbox76 + 3 + True + 0 + + 0 + True + True + + + + GtkLabel + label807 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label808 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label809 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label811 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkVBox + vbox77 + 3 + True + 0 + + 0 + True + True + + + + GtkEntry + name_entry + True + True + True + 0 + + + 0 + False + False + + + + + GtkEntry + description_entry + True + True + True + 0 + + + 0 + False + False + + + + + GtkHBox + commodity_hbox + False + 0 + + 0 + True + True + + + + Placeholder + + + + + GtkEntry + code_entry + True + True + True + 0 + + + 0 + False + False + + + + + + + + GtkHBox + hbox65 + 3 + False + 0 + + 0 + True + True + + + + GtkFrame + frame29 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkScrolledWindow + scrolledwindow7 + 3 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + + GtkCList + type_list + True + 1 + 80 + GTK_SELECTION_SINGLE + False + GTK_SHADOW_IN + + + GtkLabel + CList:title + label812 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + + GtkFrame + frame30 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkScrolledWindow + parent_scroll + 3 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + + Placeholder + + + + + + + GtkFrame + price_quote_frame + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkVBox + vbox129 + 3 + False + 3 + + + GtkCheckButton + get_quote_check + True + + False + True + + 0 + False + False + + + + + GtkHBox + hbox103 + False + 2 + + 0 + True + True + + + + GtkVBox + vbox116 + True + 0 + + 0 + False + False + + + + GtkLabel + label813 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label847713 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkVBox + vbox117 + True + 0 + + 0 + True + True + + + + GtkHBox + source_box + False + 0 + + 0 + True + True + + + + Placeholder + + + + + GtkHBox + quote_tz_box + False + 0 + + 0 + True + True + + + + Placeholder + + + + + + + + + GtkFrame + frame32 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkScrolledWindow + scrolledwindow9 + 3 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + + GtkText + notes_text + True + True + + + + + + + GtkHBox + hbox104 + True + 0 + + 0 + False + False + + + + GtkCheckButton + tax_related_button + 3 + True + + False + True + + 0 + False + False + + + + + Placeholder + + + + GtkCheckButton + placeholder_button + 3 + This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account. + True + + False + True + + 0 + False + False + + + + + + + GtkLabel + Notebook:tab + label8477388 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox118 + False + 0 + + + GtkFrame + opening_balance_frame + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkHBox + hbox101 + 3 + False + 2 + + + GtkVBox + vbox114 + True + 0 + + 0 + False + False + + + + GtkLabel + label847737 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label847738 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkVBox + vbox115 + True + 0 + + 0 + True + True + + + + GtkHBox + opening_balance_box + False + 0 + + 0 + True + True + + + + Placeholder + + + + + GtkHBox + opening_balance_date_box + False + 0 + + 0 + True + True + + + + Placeholder + + + + + + + + GtkFrame + frame49 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkVBox + vbox120 + 3 + False + 0 + + + GtkRadioButton + opening_equity_radio + True + + False + True + transfer_type_group + + 0 + False + False + + + + + GtkRadioButton + radiobutton8 + True + + False + True + transfer_type_group + + 0 + False + False + + + + + + + GtkFrame + transfer_account_frame + 3 + False + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkScrolledWindow + transfer_account_scroll + 3 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + + Placeholder + + + + + + + GtkLabel + Notebook:tab + label847739 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + + GtkWindow + HBCI Init Druid + 540 + 370 + New Account Hierarchy Setup + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_MOUSE + False + 640 + 480 + False + True + False + + + GnomeDruid + druid1 + + cancel + on_cancel + Sat, 16 Jun 2001 23:54:54 GMT + + + + GnomeDruidPageStart + druidpagestart1 + Initial HBCI Setup + This druid will help you setting up your HBCI connection to your bank. + +Click 'Cancel' if you do not wish to setup any +HBCI connection now. + 255,255,255 + 0,0,0 + 25,25,112 + 255,255,255 + 255,255,255 + + + + GnomeDruidPageStandard + druidpagestandard1 + + prepare + on_choose_currency_prepare + Sat, 16 Jun 2001 23:27:41 GMT + + Enter Bank Information + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + vbox130 + 10 + True + 5 + + 0 + True + True + + + + GtkFrame + frame54 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkTable + table1 + 20 + 2 + 3 + False + 0 + 0 + + + GtkLabel + label8477399 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + country_code_entry + True + True + True + 0 + 280 + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + False + False + + + + + GtkEntry + bank_code_entry + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + False + False + + + + + GtkLabel + label8477398 + + GTK_JUSTIFY_RIGHT + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkFrame + frame55 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkTable + table2 + 10 + 2 + 3 + False + 0 + 0 + + + GtkLabel + label8477400 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label8477401 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + ip_address_entry + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + False + False + + + + + GtkEntry + port_nr_entry + True + True + True + 0 + 3000 + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + False + False + + + + + + + + + GnomeDruidPageStandard + druidpagestandard2 + + prepare + on_choose_account_types_prepare + Sat, 16 Jun 2001 23:59:57 GMT + + Enter User Information + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + vbox132 + 10 + False + 5 + + 0 + True + True + + + + GtkFrame + frame56 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkHBox + hbox108 + 10 + False + 0 + + + GtkLabel + label8477402 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkEntry + user_id_entry + True + True + True + 0 + + + 0 + True + False + + + + + Placeholder + + + + + + + + GnomeDruidPageStandard + druidpagestandard3 + + prepare + on_final_account_prepare + Sun, 17 Jun 2001 00:30:49 GMT + + + next + on_final_account_next + Sun, 17 Jun 2001 05:40:45 GMT + + Enter Security Medium Information + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + vbox134 + 5 + False + 10 + + 0 + True + True + + + + GtkFrame + frame57 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox139 + False + 0 + + + GtkRadioButton + rdh_radiobutton + True + + True + True + choose_medium + + 0 + False + False + + + + + GtkHBox + hbox109 + 20 + False + 0 + + 0 + False + False + + + + GtkLabel + label36251 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkEntry + path_entry + True + True + True + 0 + /floppy/ + + 0 + True + True + + + + + + GtkRadioButton + ddv_radiobutton + True + + False + True + choose_medium + + 0 + False + False + + + + + Placeholder + + + + + + GtkLabel + label8477403 + + GTK_JUSTIFY_FILL + True + 0.05 + 0.05 + 0 + 0 + + 0 + True + False + GTK_PACK_END + + + + + + + GnomeDruidPageStandard + druidpagestandard4 + + prepare + on_choose_account_types_prepare + Sat, 16 Jun 2001 23:59:57 GMT + + Initialization Letter from Server + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + vbox132 + 10 + False + 5 + + 0 + True + True + + + + GtkFrame + frame56 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkHBox + hbox108 + 10 + False + 0 + + + GtkLabel + label8477402 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkEntry + user_id_entry + True + True + True + 0 + + + 0 + True + False + + + + + Placeholder + + + + + + + + GnomeDruidPageStandard + druidpagestandard5 + + prepare + on_choose_account_types_prepare + Sat, 16 Jun 2001 23:59:57 GMT + + Enter User Information + 255,255,255 + 25,25,112 + 255,255,255 + + + GtkVBox + GnomeDruidPageStandard:vbox + vbox132 + 10 + False + 5 + + 0 + True + True + + + + GtkFrame + frame56 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkHBox + hbox108 + 10 + False + 0 + + + GtkLabel + label8477402 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkEntry + user_id_entry + True + True + True + 0 + + + 0 + True + False + + + + + Placeholder + + + + + + + + GnomeDruidPageFinish + druidpagefinish1 + + finish + on_finish + Sat, 16 Jun 2001 23:41:40 GMT + + Finish Account Setup + Press `Finish' to create your new accounts. + +Press `Back' to review your selections. + +Press `Cancel' to close this dialog without creating any new accounts. + 25,25,112 + 255,255,255 + 255,255,255 + 0,0,0 + 255,255,255 + + + + + diff --git a/src/import-export/hbci/gncmod-hbci.c b/src/import-export/hbci/gncmod-hbci.c index d561005050..7e8b6c14db 100644 --- a/src/import-export/hbci/gncmod-hbci.c +++ b/src/import-export/hbci/gncmod-hbci.c @@ -1,8 +1,8 @@ /********************************************************************* - * gncmod-tax-us.c - * module definition/initialization for us tax info + * gncmod-hbci.c + * module definition/initialization for HBCI support * - * Copyright (c) 2001 Linux Developers Group, Inc. + * Copyright (c) 2002 Christian *********************************************************************/ #include @@ -37,13 +37,6 @@ libgncmod_hbci_LTX_gnc_module_description(void) { return g_strdup("Support for HBCI protocol"); } -static void -lmod(char * mn) -{ - char * form = g_strdup_printf("(use-modules %s)\n", mn); - gh_eval_str(form); - g_free(form); -} int libgncmod_hbci_LTX_gnc_module_init(int refcount) { @@ -56,6 +49,9 @@ libgncmod_hbci_LTX_gnc_module_init(int refcount) { if(!gnc_module_load("gnucash/app-utils", 0)) { return FALSE; } + if(!gnc_module_load("gnucash/gnome-utils", 0)) { + return FALSE; + } /* load the HBCI Scheme code */ if(gh_eval_str("(use-modules (gnucash import-export hbci))") == diff --git a/src/import-export/hbci/hbci.scm b/src/import-export/hbci/hbci.scm index 5752e87711..b9a042856e 100644 --- a/src/import-export/hbci/hbci.scm +++ b/src/import-export/hbci/hbci.scm @@ -1,6 +1,13 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; hbci.scm +;; load the HBCI support code +;; +;; Copyright (c) 2002 Christian +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (define-module (gnucash import-export hbci)) ;;(export gnc:txf-get-payer-name-source) ;;(export txf-expense-categories) -;;(load-from-path "txf.scm") +(use-modules (gnucash main))