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
This commit is contained in:
Geert Janssens 2019-11-23 16:15:21 +01:00
parent ee722b85c1
commit 25cce83f29
12 changed files with 22 additions and 29 deletions

View File

@ -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

View File

@ -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*

View File

@ -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)

View File

@ -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)

View File

@ -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")

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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"))

View File

@ -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"))

View File

@ -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)