From 25cce83f296f22abc05d64ee26759c99838d2131 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 23 Nov 2019 16:15:21 +0100 Subject: [PATCH] gnome-utils - expose wrapped api directly from gnome-utils.scm With that in place we no longer need to (gnc:module-load "gnucash/gnome-utils" 0) the gnome-utils gncmodule. An ordinary (use-modules (gnucash gnome-utils)) suffices --- bindings/guile/CMakeLists.txt | 2 +- bindings/guile/price-quotes.scm | 6 ++---- gnucash/gnome-utils/gnome-utils.scm | 4 ++++ gnucash/gnome/report-menus.scm | 3 +-- gnucash/import-export/qif-imp/qif-import.scm | 4 +--- gnucash/report/report.scm | 2 +- gnucash/report/reports/aging.scm | 4 +--- gnucash/report/reports/example/sample-graphs.scm | 6 +++--- gnucash/report/reports/locale-specific/us/taxtxf.scm | 8 ++------ gnucash/report/reports/standard/budget-flow.scm | 4 ++-- gnucash/report/reports/standard/budget.scm | 4 ++-- gnucash/report/reports/standard/cash-flow.scm | 4 ++-- 12 files changed, 22 insertions(+), 29 deletions(-) diff --git a/bindings/guile/CMakeLists.txt b/bindings/guile/CMakeLists.txt index c4efb6e3a5..a4ece15461 100644 --- a/bindings/guile/CMakeLists.txt +++ b/bindings/guile/CMakeLists.txt @@ -152,7 +152,7 @@ gnc_add_scheme_targets(scm-gnc-module gnc_add_scheme_targets(price-quotes price-quotes.scm gnucash - "scm-engine;scm-app-utils" + "scm-engine;scm-app-utils;scm-gnome-utils" FALSE) set_local_dist(guile_DIST_local diff --git a/bindings/guile/price-quotes.scm b/bindings/guile/price-quotes.scm index 37b7292bcf..678c0abbf7 100644 --- a/bindings/guile/price-quotes.scm +++ b/bindings/guile/price-quotes.scm @@ -26,14 +26,12 @@ (export gnc:price-quotes-install-sources) (use-modules (gnucash engine)) -(use-modules (gnucash utilities)) -(use-modules (gnucash gnc-module)) +(use-modules (gnucash utilities)) (use-modules (gnucash core-utils)) +(use-modules (gnucash gnome-utils)) (use-modules (srfi srfi-11) (srfi srfi-1)) -(gnc:module-load "gnucash/gnome-utils" 0) ;; for gnucash-ui-is-running - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define gnc:*finance-quote-check* diff --git a/gnucash/gnome-utils/gnome-utils.scm b/gnucash/gnome-utils/gnome-utils.scm index b8fbad381b..25b945a714 100644 --- a/gnucash/gnome-utils/gnome-utils.scm +++ b/gnucash/gnome-utils/gnome-utils.scm @@ -27,6 +27,10 @@ (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")) (use-modules (sw_gnome_utils)) +; Export the swig-wrapped symbols in the public interface of this module +(let ((i (module-public-interface (current-module)))) + (module-use! i (resolve-interface '(sw_gnome_utils)))) + ;; from gnc-menu-extensions.scm (export gnc:extension-type) (export gnc:extension-name) diff --git a/gnucash/gnome/report-menus.scm b/gnucash/gnome/report-menus.scm index 50f52aa2d2..c2670d7f3b 100644 --- a/gnucash/gnome/report-menus.scm +++ b/gnucash/gnome/report-menus.scm @@ -28,7 +28,6 @@ (use-modules (gnucash core-utils)) (use-modules (gnucash engine)) (use-modules (gnucash utilities)) -(use-modules (gnucash gnc-module)) (use-modules (gnucash gnome-utils)) (use-modules (gnucash reports standard dashboard)) @@ -36,7 +35,7 @@ (load-extension "libgnc-gnome" "scm_init_sw_gnome_module")) (use-modules (sw_gnome)) -(gnc:module-load "gnucash/gnome-utils" 0) +(use-modules (gnucash gnc-module)) (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0)) (export gnc:report-menu-setup) diff --git a/gnucash/import-export/qif-imp/qif-import.scm b/gnucash/import-export/qif-imp/qif-import.scm index e70a4195de..e1f206a1d6 100644 --- a/gnucash/import-export/qif-imp/qif-import.scm +++ b/gnucash/import-export/qif-imp/qif-import.scm @@ -28,6 +28,7 @@ (use-modules (gnucash utilities)) (use-modules (gnucash engine)) (use-modules (gnucash app-utils)) +(use-modules (gnucash gnome-utils)) ;; We do this initialization here because src/gnome isn't a real module. ;; Note: Guile 2 needs to find the symbols from the extension at compile time already @@ -41,9 +42,6 @@ (debug-enable 'backtrace) -(use-modules (gnucash gnc-module)) -(gnc:module-load "gnucash/gnome-utils" 0) - (load-from-path "gnucash/qif-import/qif-objects") ;; class definitions (load-from-path "gnucash/qif-import/qif-parse") ;; string-to-value (load-from-path "gnucash/qif-import/qif-utils") diff --git a/gnucash/report/report.scm b/gnucash/report/report.scm index 0d26414275..2107fd03d8 100644 --- a/gnucash/report/report.scm +++ b/gnucash/report/report.scm @@ -32,10 +32,10 @@ (use-modules (gnucash core-utils)) (use-modules (gnucash engine)) (use-modules (gnucash app-utils)) +(use-modules (gnucash gnome-utils)) (use-modules (gnucash gnc-module)) (gnc:module-load "gnucash/html" 0) -(gnc:module-load "gnucash/gnome-utils" 0) ;; commodity-utilities.scm (export gnc:get-match-commodity-splits) diff --git a/gnucash/report/reports/aging.scm b/gnucash/report/reports/aging.scm index 1104312e29..7c05468df9 100644 --- a/gnucash/report/reports/aging.scm +++ b/gnucash/report/reports/aging.scm @@ -30,9 +30,7 @@ (use-modules (gnucash utilities)) (use-modules (gnucash gnc-module)) (use-modules (gnucash core-utils)) -(eval-when (compile load eval expand) - (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")) -(use-modules (sw_gnome_utils)) +(use-modules (gnucash gnome-utils)) (gnc:module-load "gnucash/report" 0) diff --git a/gnucash/report/reports/example/sample-graphs.scm b/gnucash/report/reports/example/sample-graphs.scm index f168adcab0..c3e754cff6 100644 --- a/gnucash/report/reports/example/sample-graphs.scm +++ b/gnucash/report/reports/example/sample-graphs.scm @@ -25,16 +25,16 @@ (define-module (gnucash reports example sample-graphs)) (use-modules (gnucash engine)) -(use-modules (gnucash utilities)) -(use-modules (gnucash gnc-module)) +(use-modules (gnucash utilities)) +(use-modules (gnucash gnome-utils)) ;for gnc-build-url ;; Add this module to enable translatable strings ;; Use (N_ string) to mark string for translation (it won't be translated on the spot) ;; Use (_ string) to use a translation of this string if it exists. (use-modules (gnucash core-utils)) +(use-modules (gnucash gnc-module)) (gnc:module-load "gnucash/report" 0) -(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url ;; It's common to define frequently used strings once ;; This also helps getting more consistent messages which simplifies diff --git a/gnucash/report/reports/locale-specific/us/taxtxf.scm b/gnucash/report/reports/locale-specific/us/taxtxf.scm index 682e0f27f0..0b2459f319 100644 --- a/gnucash/report/reports/locale-specific/us/taxtxf.scm +++ b/gnucash/report/reports/locale-specific/us/taxtxf.scm @@ -102,16 +102,12 @@ (use-modules (gnucash engine)) (use-modules (gnucash utilities)) (use-modules (srfi srfi-1)) -(use-modules (gnucash gnc-module)) (use-modules (gnucash core-utils)) ; for gnc:version and (_ ...) (use-modules (gnucash locale us tax)) - -(eval-when - (compile load eval expand) - (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")) -(use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog +(use-modules (gnucash gnome-utils)) +(use-modules (gnucash gnc-module)) (gnc:module-load "gnucash/html" 0) (gnc:module-load "gnucash/report" 0) diff --git a/gnucash/report/reports/standard/budget-flow.scm b/gnucash/report/reports/standard/budget-flow.scm index 0e68ed35ef..fd47125691 100644 --- a/gnucash/report/reports/standard/budget-flow.scm +++ b/gnucash/report/reports/standard/budget-flow.scm @@ -28,11 +28,11 @@ (define-module (gnucash reports standard budget-flow)) (use-modules (gnucash engine)) (use-modules (gnucash utilities)) -(use-modules (gnucash gnc-module)) (use-modules (gnucash core-utils)) +(use-modules (gnucash gnome-utils)) ;for gnc-build-url +(use-modules (gnucash gnc-module)) (gnc:module-load "gnucash/report" 0) -(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url (define reportname (N_ "Budget Flow")) diff --git a/gnucash/report/reports/standard/budget.scm b/gnucash/report/reports/standard/budget.scm index 1dac3a0bea..80d9ec56ac 100644 --- a/gnucash/report/reports/standard/budget.scm +++ b/gnucash/report/reports/standard/budget.scm @@ -29,14 +29,14 @@ (use-modules (gnucash engine)) (use-modules (gnucash utilities)) -(use-modules (gnucash gnc-module)) (use-modules (gnucash core-utils)) +(use-modules (gnucash gnome-utils)) ;for gnc-build-url (use-modules (srfi srfi-1)) (use-modules (ice-9 match)) +(use-modules (gnucash gnc-module)) (gnc:module-load "gnucash/report" 0) -(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url (define reportname (N_ "Budget Report")) diff --git a/gnucash/report/reports/standard/cash-flow.scm b/gnucash/report/reports/standard/cash-flow.scm index d35c6ad750..59d947cce1 100644 --- a/gnucash/report/reports/standard/cash-flow.scm +++ b/gnucash/report/reports/standard/cash-flow.scm @@ -30,11 +30,11 @@ (define-module (gnucash reports standard cash-flow)) (use-modules (gnucash engine)) (use-modules (gnucash utilities)) -(use-modules (gnucash gnc-module)) (use-modules (gnucash core-utils)) +(use-modules (gnucash gnome-utils)) ;for gnc-build-url +(use-modules (gnucash gnc-module)) (gnc:module-load "gnucash/report" 0) -(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url (export cash-flow-calc-money-in-out)