From d7317fb0d478b471664d87de61bfda2156f9610c Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Sat, 8 Dec 2001 01:33:59 +0000 Subject: [PATCH] * src/report/report-system/report.scm: move a gnome function to report-gnome module * src/report/report-system/report-system.scm: remove export * src/report/report-gnome/report-gnome.scm: new file. * src/report/report-gnome/gw-report-gnome-spec.scm: wrap some more report bindings. * src/report/report-gnome/gncmod-report-gnome.c: load g-wrapped and gnucash report-gnome modules. * src/report/report-gnome/Makefile.am: add report-gnome.scm module * src/gnome/gw-gnc-spec.scm: remove some report bindings git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6273 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome/gw-gnc-spec.scm | 14 +-------- src/report/report-gnome/Makefile.am | 7 ++++- src/report/report-gnome/gncmod-report-gnome.c | 5 ++- .../report-gnome/gw-report-gnome-spec.scm | 8 +++++ src/report/report-gnome/report-gnome.scm | 31 +++++++++++++++++++ src/report/report-system/report-system.scm | 1 - src/report/report-system/report.scm | 14 --------- 7 files changed, 50 insertions(+), 30 deletions(-) create mode 100644 src/report/report-gnome/report-gnome.scm diff --git a/src/gnome/gw-gnc-spec.scm b/src/gnome/gw-gnc-spec.scm index fc90fb09db..0f5d920b73 100644 --- a/src/gnome/gw-gnc-spec.scm +++ b/src/gnome/gw-gnc-spec.scm @@ -10,8 +10,6 @@ (use-modules (g-wrapped gw-engine-spec)) (use-modules (g-wrapped gw-glib-spec)) (use-modules (g-wrapped gw-gnome-utils-spec)) -;; FIXME take out when finished creating report-gnome -(use-modules (g-wrapped gw-report-gnome-spec)) (let ((mod (gw:new-module "gw-gnc"))) (define (standard-c-call-gen result func-call-code) @@ -39,8 +37,6 @@ (gw:module-depends-on mod "gw-engine") (gw:module-depends-on mod "gw-glib") (gw:module-depends-on mod "gw-gnome-utils") - ;; FIXME take out when finished creating report-gnome - (gw:module-depends-on mod "gw-report-gnome") (gw:module-set-guile-module! mod '(g-wrapped gw-gnc)) @@ -147,14 +143,6 @@ '() "Destroy the UI.") - (gw:wrap-function - mod - 'gnc:report-raise-editor - ' - "gnc_report_raise_editor" - '(( report)) - "Raise the report's editor window") - (gw:wrap-function mod 'gnc:main-window-open-report @@ -162,7 +150,7 @@ "gnc_main_window_open_report" '(( report-id) ( top-level)) "Show report window") - + (gw:wrap-function mod 'gnc:style-sheet-dialog-open diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am index 2ba96cad57..716f4c9909 100644 --- a/src/report/report-gnome/Makefile.am +++ b/src/report/report-gnome/Makefile.am @@ -37,10 +37,15 @@ libgw_report_gnome_la_LDFLAGS = -module gwmoddir = ${GNC_GWRAP_LIBDIR} gwmod_DATA = gw-report-gnome.scm gw-report-gnome-spec.scm +gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report +gncmod_DATA = report-gnome.scm + noinst_DATA = .scm-links EXTRA_DIST = \ - .cvsignore + .cvsignore \ + ${gwmod_DATA} \ + ${gncmod_DATA} .scm-links: rm -f gnucash g-wrapped diff --git a/src/report/report-gnome/gncmod-report-gnome.c b/src/report/report-gnome/gncmod-report-gnome.c index 634091d883..d1cab9a009 100644 --- a/src/report/report-gnome/gncmod-report-gnome.c +++ b/src/report/report-gnome/gncmod-report-gnome.c @@ -31,7 +31,7 @@ gnc_module_description(void) { } static void -lmod(char * mn) +lmod(char * mn) { char * form = g_strdup_printf("(use-modules %s)\n", mn); gh_eval_str(form); @@ -56,6 +56,9 @@ gnc_module_init(int refcount) { return FALSE; } + lmod ("(g-wrapped gw-report-gnome)"); + lmod ("(gnucash report report-gnome)"); + return TRUE; } diff --git a/src/report/report-gnome/gw-report-gnome-spec.scm b/src/report/report-gnome/gw-report-gnome-spec.scm index 7670e33bb4..061d598396 100644 --- a/src/report/report-gnome/gw-report-gnome-spec.scm +++ b/src/report/report-gnome/gw-report-gnome-spec.scm @@ -83,4 +83,12 @@ "gnc_print_report" '(( report-id)) "Print a report with dialog support") + + (gw:wrap-function + mod + 'gnc:report-raise-editor + ' + "gnc_report_raise_editor" + '(( report)) + "Raise the report's editor window") ) diff --git a/src/report/report-gnome/report-gnome.scm b/src/report/report-gnome/report-gnome.scm new file mode 100644 index 0000000000..b3e45f65e3 --- /dev/null +++ b/src/report/report-gnome/report-gnome.scm @@ -0,0 +1,31 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; report-gnome.scm +;; module definition for the gnome report system code +;; +;; Copyright (c) 2001 Linux Developers Group, Inc. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-module (gnucash report report-gnome)) +(use-modules (gnucash main) (g-wrapped gw-gnc)) ;; FIXME: delete after we finish modularizing. +(use-modules (gnucash gnc-module)) + +(use-modules (g-wrapped gw-report-gnome)) + +(gnc:module-load "gnucash/gnome-utils" 0) +(gnc:module-load "gnucash/report/report-system" 0) + +(export gnc:report-edit-options) + +(define (gnc:report-edit-options report) + (let* ((editor-widg (gnc:report-editor-widget report))) + (if editor-widg + (gnc:report-raise-editor report) + (begin + (if (gnc:report-options report) + (begin + (set! editor-widg + ((gnc:report-options-editor report) + (gnc:report-options report) + report)) + (gnc:report-set-editor-widget! report editor-widg)) + (gnc:warning-dialog (_ "This report has no options."))))))) diff --git a/src/report/report-system/report-system.scm b/src/report/report-system/report-system.scm index 6c2b8bc990..7dc7900f2a 100644 --- a/src/report/report-system/report-system.scm +++ b/src/report/report-system/report-system.scm @@ -132,7 +132,6 @@ (export gnc:report-set-editor-widget!) (export gnc:report-ctext) (export gnc:report-set-ctext!) -(export gnc:report-edit-options) (export gnc:make-report) (export gnc:restore-report) (export gnc:make-report-options) diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm index 2beae7d334..d779eaaa26 100644 --- a/src/report/report-system/report.scm +++ b/src/report/report-system/report.scm @@ -223,20 +223,6 @@ (define gnc:report-set-ctext! (record-modifier 'ctext)) -(define (gnc:report-edit-options report) - (let* ((editor-widg (gnc:report-editor-widget report))) - (if editor-widg - (gnc:report-raise-editor report) - (begin - (if (gnc:report-options report) - (begin - (set! editor-widg - ((gnc:report-options-editor report) - (gnc:report-options report) - report)) - (gnc:report-set-editor-widget! report editor-widg)) - (gnc:warning-dialog "This report has no options.")))))) - (define (gnc:make-report template-name . rest) (let ((r ((record-constructor ) template-name ;; type