IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

* src/report/report-system/report.scm: don't use gw-gnc

Browse Source 
* src/report/report-system/report-system.scm: don't use gw-gnc


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6326 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-12-11 10:50:10 +00:00
parent cb98780999
commit bc959f071b
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/report/report-system/report-system.scm
View File

@ -6,7 +6,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report report-system)) (define-module (gnucash report report-system))
(use-modules (gnucash main) (g-wrapped gw-gnc)) ;; FIXME: delete after we finish modularizing. (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib)) (use-modules (ice-9 slib))
(use-modules (ice-9 regex)) (use-modules (ice-9 regex))
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
@ -116,6 +116,7 @@
(export gnc:report-template-menu-path) (export gnc:report-template-menu-path)
(export gnc:report-template-menu-name) (export gnc:report-template-menu-name)
(export gnc:report-template-menu-tip) (export gnc:report-template-menu-tip)
(export gnc:report-template-export-types)
(export gnc:report-template-export-thunk) (export gnc:report-template-export-thunk)
(export gnc:report-type) (export gnc:report-type)
(export gnc:report-set-type!) (export gnc:report-set-type!)
@ -134,6 +135,7 @@
(export gnc:make-report) (export gnc:make-report)
(export gnc:restore-report) (export gnc:restore-report)
(export gnc:make-report-options) (export gnc:make-report-options)
(export gnc:report-export-types)
(export gnc:report-export-thunk) (export gnc:report-export-thunk)
(export gnc:report-menu-name) (export gnc:report-menu-name)
(export gnc:report-name) (export gnc:report-name)

21
src/report/report-system/report.scm
View File

@ -54,7 +54,7 @@
'(version name options-generator '(version name options-generator
options-cleanup-cb options-changed-cb options-cleanup-cb options-changed-cb
renderer in-menu? menu-path menu-name renderer in-menu? menu-path menu-name
menu-tip export-thunk))) menu-tip export-types export-thunk)))
(define (gnc:define-report . args) (define (gnc:define-report . args)
;; For now the version is ignored, but in the future it'll let us ;; For now the version is ignored, but in the future it'll let us
@ -76,6 +76,7 @@
#f ;; menu-path #f ;; menu-path
#f ;; menu-name #f ;; menu-name
#f ;; menu-tip #f ;; menu-tip
#f ;; export-types
#f ;; export-thunk #f ;; export-thunk
)) ))
@ -118,6 +119,8 @@
(record-accessor <report-template> 'menu-name)) (record-accessor <report-template> 'menu-name))
(define gnc:report-template-menu-tip (define gnc:report-template-menu-tip
(record-accessor <report-template> 'menu-tip)) (record-accessor <report-template> 'menu-tip))
(define gnc:report-template-export-types
(record-accessor <report-template> 'export-types))
(define gnc:report-template-export-thunk (define gnc:report-template-export-thunk
(record-accessor <report-template> 'export-thunk)) (record-accessor <report-template> 'export-thunk))
@ -264,17 +267,23 @@
(gnc:report-template-new-options template) (gnc:report-template-new-options template)
#f))) #f)))
(define (gnc:report-export-types report)
(let ((template (hash-ref *gnc:_report-templates_*
(gnc:report-type report))))
(if template
(gnc:report-template-export-types template)
#f)))
(define (gnc:report-export-thunk report) (define (gnc:report-export-thunk report)
(let ((template (let ((template (hash-ref *gnc:_report-templates_*
(hash-ref *gnc:_report-templates_* (gnc:report-type report))))
(gnc:report-type report))))
(if template (if template
(gnc:report-template-export-thunk template) (gnc:report-template-export-thunk template)
#f))) #f)))
(define (gnc:report-menu-name report) (define (gnc:report-menu-name report)
(let ((template (hash-ref *gnc:_report-templates_* (let ((template (hash-ref *gnc:_report-templates_*
(gnc:report-type report)))) (gnc:report-type report))))
(if template (if template
(or (gnc:report-template-menu-name template) (or (gnc:report-template-menu-name template)
(gnc:report-name report)) (gnc:report-name report))