Bug 773198 - Move several reports to Example directory/menu

Gnucash · Jun 12, 2019 · 3069647 · 3069647
1 parent 3d150de
commit 3069647
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 37 deletions.
diff --git a/gnucash/gnome/report-menus.scm b/gnucash/gnome/report-menus.scm
@@ -25,6 +25,7 @@
 
 
 (define-module (gnucash report-menus))
+(use-modules (gnucash core-utils))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gnome-utils))
@@ -76,8 +77,8 @@
     (gnc:make-menu gnc:menuname-income-expense (list gnc:menuname-reports)))
   (define budget-menu
     (gnc:make-menu gnc:menuname-budget (list gnc:menuname-reports)))
-  (define utility-menu
-    (gnc:make-menu gnc:menuname-utility (list gnc:menuname-reports)))
+  (define example-menu
+    (gnc:make-menu gnc:menuname-example (list gnc:menuname-reports)))
   (define experimental-menu
     (gnc:make-menu gnc:menuname-experimental (list gnc:menuname-reports)))
   (define multicolumn-menu
@@ -101,7 +102,7 @@
   (gnc-add-scm-extension income-expense-menu)
   (gnc-add-scm-extension asset-liability-menu)
   (gnc-add-scm-extension budget-menu)
-  (gnc-add-scm-extension utility-menu)
+  (gnc-add-scm-extension example-menu)
   (gnc-add-scm-extension experimental-menu)
   (gnc-add-scm-extension multicolumn-menu)
   (gnc-add-scm-extension business-menu)

diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
@@ -136,7 +136,7 @@
 (export gnc:menuname-income-expense)
 (export gnc:menuname-budget)
 (export gnc:menuname-taxes)
-(export gnc:menuname-utility)
+(export gnc:menuname-example)
 (export gnc:menuname-multicolumn)
 (export gnc:menuname-experimental)
 (export gnc:menuname-custom)

diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm
@@ -62,7 +62,7 @@
 (define gnc:menuname-income-expense (N_ "_Income & Expense"))
 (define gnc:menuname-budget (N_ "B_udget"))
 (define gnc:menuname-taxes (N_ "_Taxes"))
-(define gnc:menuname-utility (N_ "_Sample & Custom"))
+(define gnc:menuname-example (N_ "E_xamples"))
 (define gnc:menuname-experimental (N_ "_Experimental"))
 (define gnc:menuname-multicolumn (N_ "_Multicolumn"))
 (define gnc:menuname-custom (N_ "_Custom"))

diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
@@ -14,7 +14,6 @@ set (reports_standard_SCHEME
     standard/account-piecharts.scm
     standard/account-summary.scm
     standard/advanced-portfolio.scm
-    standard/average-balance.scm
     standard/balance-sheet.scm
     standard/balance-forecast.scm
     standard/balsheet-pnl.scm
@@ -26,7 +25,6 @@ set (reports_standard_SCHEME
     standard/cash-flow.scm
     standard/cashflow-barchart.scm
     standard/category-barchart.scm
-    standard/daily-reports.scm
     standard/dashboard.scm
     standard/equity-statement.scm
     standard/general-journal.scm
@@ -53,9 +51,11 @@ set (reports_standard_SCHEME
     standard/balsheet-eg.scm
     )
 
-set(reports_sample_SCHEME
-  sample/hello-world.scm
-  sample/welcome-to-gnucash.scm
+set(reports_example_SCHEME
+  example/average-balance.scm
+  example/daily-reports.scm
+  example/hello-world.scm
+  example/welcome-to-gnucash.scm
 )
 
 
@@ -69,14 +69,14 @@ set(scm_rpts_GUILE_DEPENDS
   scm-report-system
   )
 
-set(scm_rpt_sample_GUILE_DEPENDS
+set(scm_rpt_example_GUILE_DEPENDS
   gncmod-html
   scm-app-utils
   scm-core-utils
   scm-gettext
   scm-gnc-module
   scm-scm
-  scm-reports-sample-links
+  scm-reports-example-links
   scm-gnome-utils
   scm-report-system
   )
@@ -111,14 +111,14 @@ gnc_add_scheme_targets(scm-reports-standard
 )
 
 
-gnc_add_scheme_targets(scm-reports-sample
-  "${reports_sample_SCHEME}"
-  "gnucash/report/reports/sample"
-  "${scm_rpt_sample_GUILE_DEPENDS}"
+gnc_add_scheme_targets(scm-reports-example
+  "${reports_example_SCHEME}"
+  "gnucash/report/reports/example"
+  "${scm_rpt_example_GUILE_DEPENDS}"
   TRUE
 )
 
-add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-sample scm-reports-common scm-rpt-reports)
+add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-example scm-reports-common scm-rpt-reports)
 
-set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME} ${reports_sample_SCHEME})
+set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME} ${reports_example_SCHEME})
 set(reports_DIST ${reports_DIST_local} ${reports_support_DIST} ${test_reports_standard_DIST} PARENT_SCOPE)
diff --git a/...port/reports/standard/average-balance.scm → ...eport/reports/example/average-balance.scm b/...port/reports/standard/average-balance.scm → ...eport/reports/example/average-balance.scm
@@ -26,7 +26,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report reports standard average-balance))
+(define-module (gnucash report reports example average-balance))
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
@@ -474,6 +474,6 @@
  'version 1
  'name reportname
  'report-guid "d5adcc61c62e4b8684dd8907448d7900"
- 'menu-path (list gnc:menuname-asset-liability)
+ 'menu-path (list gnc:menuname-example)
  'options-generator options-generator
  'renderer renderer)
diff --git a/...report/reports/standard/daily-reports.scm → .../report/reports/example/daily-reports.scm b/...report/reports/standard/daily-reports.scm → .../report/reports/example/daily-reports.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard daily-reports))
+(define-module (gnucash report reports example daily-reports))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
@@ -339,7 +339,7 @@
     'version 1
     'name (car l)
     'report-guid (car (reverse l))
-    'menu-path (list gnc:menuname-income-expense)
+    'menu-path (list gnc:menuname-example)
     'menu-name (caddr l)
     'menu-tip (car (cdddr l))
     'options-generator (lambda () (options-generator (cadr l)))

diff --git a/...ash/report/reports/sample/hello-world.scm → ...sh/report/reports/example/hello-world.scm b/...ash/report/reports/sample/hello-world.scm → ...sh/report/reports/example/hello-world.scm
@@ -23,7 +23,7 @@
 ;; It illustrates the basic techniques used to create
 ;; new reports for GnuCash.
 
-(define-module (gnucash report reports sample hello-world))
+(define-module (gnucash report reports example hello-world))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
@@ -507,7 +507,7 @@ new, totally cool report, consult the mailing list ~a.")
 
  ;; A path describing where to put the report in the menu system.
  ;; In this case, it's going under the utility menu.
- 'menu-path (list gnc:menuname-utility)
+ 'menu-path (list gnc:menuname-example)
 
  ;; The options generator function defined above.
  'options-generator options-generator

diff --git a/...h/report/reports/sample/test-graphing.scm → .../report/reports/example/test-graphing.scm b/...h/report/reports/sample/test-graphing.scm → .../report/reports/example/test-graphing.scm
@@ -23,7 +23,7 @@
 ;; It illustrates the basic techniques used to create
 ;; new reports for GnuCash.
 
-(define-module (gnucash report reports sample test-graphing))
+(define-module (gnucash report reports example test-graphing))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 
@@ -162,7 +162,7 @@
 
  ;; A path describing where to put the report in the menu system.
  ;; In this case, it's going under the utility menu.
- 'menu-path (list gnc:menuname-utility)
+ 'menu-path (list gnc:menuname-example)
 
  ;; The options generator function defined above.
  'options-generator options-generator

diff --git a/...ort/reports/sample/welcome-to-gnucash.scm → ...rt/reports/example/welcome-to-gnucash.scm b/...ort/reports/sample/welcome-to-gnucash.scm → ...rt/reports/example/welcome-to-gnucash.scm
@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports sample welcome-to-gnucash))
+(define-module (gnucash report reports example welcome-to-gnucash))
 
 (use-modules (gnucash utilities))
 (use-modules (gnucash core-utils)) ; for gnc:version
@@ -54,7 +54,6 @@
  'name (N_ "Welcome to GnuCash")
  'version 1
  'report-guid "65135608f2014c6ca8412793a8cdf169"
- 'in-menu? #f
- 'menu-path (list gnc:menuname-utility)
+ 'menu-path (list gnc:menuname-example)
  'options-generator options
  'renderer renderer)
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
@@ -43,7 +43,7 @@
 
 (define report-dirs (list
     "standard" ; base directory for standard reports included in gnucash
-    "sample" ; base directory for experimental and sample reports included in gnucash
+    "example"  ; base directory for example reports included in gnucash
 ))
 
 ;; Returns a list of files in a directory

diff --git a/gnucash/report/reports/standard/test/test-average-balance.scm b/gnucash/report/reports/standard/test/test-average-balance.scm
@@ -2,7 +2,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard average-balance))
+(use-modules (gnucash report reports example average-balance))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report reports standard budget))
 (use-modules (tests test-report-system-extras))

diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm
@@ -5,8 +5,8 @@
 (use-modules (gnucash report reports standard net-charts))
 (use-modules (gnucash report reports standard account-piecharts))
 (use-modules (gnucash report reports standard cashflow-barchart))
-(use-modules (gnucash report reports standard daily-reports))
 (use-modules (gnucash report reports standard price-scatter))
+(use-modules (gnucash report reports example daily-reports))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
 (use-modules (tests test-report-system-extras))

diff --git a/libgnucash/core-utils/core-utils.scm b/libgnucash/core-utils/core-utils.scm
@@ -33,7 +33,6 @@
 
 (use-modules (sw_core_utils))
 
-(re-export gnc-prefs-is-debugging-enabled)
 (re-export gnc-path-get-bindir)
 (re-export gnc-path-get-scmdir)
 (re-export gnc-path-get-reportsdir)
@@ -61,5 +60,7 @@
 (re-export gnc-prefs-set-string)
 (re-export gnc-prefs-set-coords)
 (re-export gnc-prefs-get-string)
+(re-export gnc-prefs-is-extra-enabled)
+(re-export gnc-prefs-is-debugging-enabled)
 
 (define-public gnc:version (gnc-version))
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -423,13 +423,14 @@ gnucash/report/locale-specific/us/taxtxf-de_DE.scm
 gnucash/report/locale-specific/us/taxtxf.scm
 gnucash/report/locale-specific/us/us.scm
 gnucash/report/reports/aging.scm
+gnucash/report/reports/example/average-balance.scm
+gnucash/report/reports/example/daily-reports.scm
+gnucash/report/reports/example/hello-world.scm
+gnucash/report/reports/example/welcome-to-gnucash.scm
 gnucash/report/reports/reports.scm
-gnucash/report/reports/sample/hello-world.scm
-gnucash/report/reports/sample/welcome-to-gnucash.scm
 gnucash/report/reports/standard/account-piecharts.scm
 gnucash/report/reports/standard/account-summary.scm
 gnucash/report/reports/standard/advanced-portfolio.scm
-gnucash/report/reports/standard/average-balance.scm
 gnucash/report/reports/standard/balance-forecast.scm
 gnucash/report/reports/standard/balance-sheet.scm
 gnucash/report/reports/standard/balsheet-eg.scm
@@ -443,7 +444,6 @@ gnucash/report/reports/standard/cashflow-barchart.scm
 gnucash/report/reports/standard/cash-flow.scm
 gnucash/report/reports/standard/category-barchart.scm
 gnucash/report/reports/standard/customer-summary.scm
-gnucash/report/reports/standard/daily-reports.scm
 gnucash/report/reports/standard/dashboard.scm
 gnucash/report/reports/standard/equity-statement.scm
 gnucash/report/reports/standard/general-journal.scm