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

2001-04-15 Christian Stimming <stimming@tuhh.de>

Browse Source 
* src/scm/report.scm: Defined global identifiers for some option
	names.

	* src/scm/report/category-barchart.scm: Added menu tips, menu
	names. Use Reportname option for report title. Added an
	explanatory text (only for devel info, will be removed again in
	some weeks).

	* src/scm/html-barchart.scm: Fix bug.

	* src/gnome/gnc-html-guppi.c (guppi_bar_1_callback): Fix bug.

And updated de.po.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3971 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-04-15 08:34:08 +00:00
parent cacc719f15
commit ee54839e07
7 changed files with 2439 additions and 1762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2001-04-15 Christian Stimming <stimming@tuhh.de>
* src/scm/report.scm: Defined global identifiers for some option
names.
* src/scm/report/category-barchart.scm: Added menu tips, menu
names. Use Reportname option for report title. Added an
explanatory text (only for devel info, will be removed again in
some weeks).
* src/scm/html-barchart.scm: Fix bug.
* src/gnome/gnc-html-guppi.c (guppi_bar_1_callback): Fix bug.
2001-04-14 Dave Peticolas <dave@krondo.com>
* src/scm/path.scm: version the .gnucash/config* files.

3972
po/de.po
View File

File diff suppressed because it is too large Load Diff

10
src/gnome/gnc-html-guppi.c
View File

@ -295,7 +295,9 @@ guppi_bar_1_callback(gint row, gint col, gpointer user_data) {
struct guppi_chart_data * chart = user_data;
guppi_generic_callback(chart->parent,
chart->data_1_callbacks,
(col*row) + col);
/* (chart->cols * row)+ FIXME: would require
to store col number.*/
col);
}
static void
@ -303,7 +305,8 @@ guppi_bar_2_callback(gint row, gint col, gpointer user_data) {
struct guppi_chart_data * chart = user_data;
guppi_generic_callback(chart->parent,
chart->data_1_callbacks,
(col*row) + col);
/* (chart->cols * row)+ FIXME: see above*/
col);
}
static void
@ -311,7 +314,8 @@ guppi_bar_3_callback(gint row, gint col, gpointer user_data) {
struct guppi_chart_data * chart = user_data;
guppi_generic_callback(chart->parent,
chart->data_1_callbacks,
(col*row) + col);
/* (chart->cols * row)+ FIXME: see above*/
col);
}
static GPtrArray *

8
src/scm/html-barchart.scm
View File

@ -136,6 +136,10 @@
(define gnc:html-barchart-set-subtitle!
(record-modifier <html-barchart> 'subtitle))
;; Note: ATM you can specify one url per column, but this url will be
;; used for all of the rows. Otherwise we could have cols*rows urls
;; (quite a lot), but this first requires fixing
;; guppi_bar_1_callback() in gnome/gnc-html-guppi.c .
(define gnc:html-barchart-button-1-bar-urls
(record-accessor <html-barchart> 'button-1-bar-urls))
@ -335,12 +339,12 @@
(if url-2
(begin
(push " <param name=\"bar_urls_2\" value=\"")
(push url-1)
(push url-2)
(push "\">\n")))
(if url-3
(begin
(push " <param name=\"bar_urls_3\" value=\"")
(push url-1)
(push url-3)
(push "\">\n")))
(if legend-1
(begin

18
src/scm/report.scm
View File

@ -38,12 +38,16 @@
(define *gnc:_reports_* (make-hash-table 23))
(define *gnc:_report-next-serial_* 0)
;; Define those strings here to make changes easier and avoid typos.
(define gnc:menuname-asset-liability
(N_ "_Assets & Liabilities"))
(define gnc:menuname-income-expense
(N_ "_Income & Expense"))
(define gnc:menuname-taxes
(N_ "_Taxes"))
(define gnc:menuname-taxes (N_ "_Taxes"))
(define gnc:pagename-general (N_ "General"))
(define gnc:optname-reportname (N_ "Report name"))
(define (gnc:report-menu-setup)
;; since this menu gets added to every child window, we say it
@ -190,12 +194,12 @@
(let ((generator (gnc:report-template-options-generator report-template))
(namer
(gnc:make-string-option
(N_ "General") (N_ "Report name") "0a"
gnc:pagename-general gnc:optname-reportname "0a"
(N_ "Enter a descriptive name for this report")
(_ (gnc:report-template-name report-template))))
(stylesheet
(gnc:make-multichoice-option
(N_ "General") (N_ "Stylesheet") "0b"
gnc:pagename-general (N_ "Stylesheet") "0b"
(N_ "Select a stylesheet for the report.")
(string->symbol (N_ "Default"))
(map
@ -363,21 +367,21 @@
(define (gnc:report-name report)
(gnc:option-value
(gnc:lookup-option (gnc:report-options report)
(N_ "General") (N_ "Report name"))))
gnc:pagename-general gnc:optname-reportname)))
(define (gnc:report-stylesheet report)
(gnc:html-style-sheet-find
(symbol->string (gnc:option-value
(gnc:lookup-option
(gnc:report-options report)
(N_ "General")
gnc:pagename-general
(N_ "Stylesheet"))))))
(define (gnc:report-set-stylesheet! report stylesheet)
(gnc:option-set-value
(gnc:lookup-option
(gnc:report-options report)
(N_ "General")
gnc:pagename-general
(N_ "Stylesheet"))
(string->symbol
(gnc:html-style-sheet-name stylesheet))))

25
src/scm/report/account-piecharts.scm
View File

@ -52,14 +52,10 @@ balance at a given time"))
(reportname-assets (N_ "Assets"))
(reportname-liabilities (N_ "Liabilities/Equity"))
(pagename-general (N_ "General"))
(optname-from-date (N_ "From"))
(optname-to-date (N_ "To"))
(optname-report-currency (N_ "Report's currency"))
;; defined in report.scm
(optname-reportname "Report name")
(pagename-accounts (N_ "Accounts"))
(optname-accounts (N_ "Accounts"))
(optname-levels (N_ "Show Accounts until level"))
@ -82,14 +78,14 @@ balance at a given time"))
(if do-intervals?
(gnc:options-add-date-interval!
options pagename-general
options gnc:pagename-general
optname-from-date optname-to-date "a")
(gnc:options-add-report-date!
options pagename-general
options gnc:pagename-general
optname-to-date "a"))
(gnc:options-add-currency!
options pagename-general optname-report-currency "b")
options gnc:pagename-general optname-report-currency "b")
(add-option
(gnc:make-account-list-option
@ -132,7 +128,7 @@ balance at a given time"))
options pagename-display
optname-plot-width optname-plot-height "d" 500 250)
(gnc:options-set-default-section options pagename-general)
(gnc:options-set-default-section options gnc:pagename-general)
options))
@ -153,17 +149,19 @@ balance at a given time"))
;; Get all options
(let ((to-date-tp (gnc:timepair-end-day-time
(gnc:date-option-absolute-time
(op-value pagename-general optname-to-date))))
(op-value gnc:pagename-general optname-to-date))))
(from-date-tp (if do-intervals?
(gnc:timepair-start-day-time
(gnc:date-option-absolute-time
(op-value pagename-general optname-from-date)))
(op-value gnc:pagename-general
optname-from-date)))
'()))
(accounts (op-value pagename-accounts optname-accounts))
(account-levels (op-value pagename-accounts optname-levels))
(report-currency (op-value pagename-general
(report-currency (op-value gnc:pagename-general
optname-report-currency))
(report-title (op-value pagename-general optname-reportname))
(report-title (op-value gnc:pagename-general
gnc:optname-reportname))
(show-fullname? (op-value pagename-display optname-fullname))
(show-total? (op-value pagename-display optname-show-total))
@ -311,7 +309,8 @@ balance at a given time"))
(cons acct subaccts))
(list pagename-accounts optname-levels
(+ 1 tree-depth))
(list pagename-general optname-reportname
(list gnc:pagename-general
gnc:optname-reportname
((if show-fullname?
gnc:account-get-full-name
gnc:account-get-name) acct))))))))

152
src/scm/report/category-barchart.scm
View File

@ -30,20 +30,34 @@
;; spelling errors. The *reportnames* are defined here (and not only
;; once at the very end) because I need them to define the "other"
;; report, thus needing them twice.
(let ((reportname-income (N_ "Income Barchart"))
(reportname-expense (N_ "Expense Barchart"))
(reportname-assets (N_ "Asset Barchart"))
(reportname-liabilities (N_ "Liability Barchart"))
;; The names are used in the menu, as labels and as identifiers.
(let ((menuname-income (N_ "Income Barchart"))
(menuname-expense (N_ "Expense Barchart"))
(menuname-assets (N_ "Asset Barchart"))
(menuname-liabilities (N_ "Liability Barchart"))
;; The names are used in the menu
;; The titels here are only printed as titles of the report.
(reporttitle-income (_ "Income Accounts"))
(reporttitle-expense (_ "Expense Accounts"))
(reporttitle-assets (_ "Asset Accounts"))
(reporttitle-liabilities (_ "Liability/Equity Accounts"))
;; The menu statusbar tips.
(menutip-income
(N_ "Shows a barchart with the Income per interval \
developing over time"))
(menutip-expense
(N_ "Shows a barchart with the Expenses per interval \
developing over time"))
(menutip-assets
(N_ "Shows a barchart with the Assets developing over time"))
(menutip-liabilities
(N_ "Shows a barchart with the Liability and Equity balance \
developing over time"))
;; The names here are used 1. for internal identification, 2. as
;; tab labels, 3. as default for the 'Report name' option which
;; in turn is used for the printed report title.
(reportname-income (N_ "Income Over Time"))
(reportname-expense (N_ "Expense Over Time"))
(reportname-assets (N_ "Assets Over Time"))
(reportname-liabilities (N_ "Liabilities/Equity Over Time"))
;; Option names
(pagename-general (N_ "General"))
(optname-from-date (N_ "From"))
(optname-to-date (N_ "To"))
(optname-stepsize (N_ "Step Size"))
@ -68,14 +82,14 @@
;; General tab
(gnc:options-add-date-interval!
options pagename-general
options gnc:pagename-general
optname-from-date optname-to-date "a")
(gnc:options-add-interval-choice!
options pagename-general optname-stepsize "b" 'MonthDelta)
options gnc:pagename-general optname-stepsize "b" 'MonthDelta)
(gnc:options-add-currency!
options pagename-general optname-report-currency "c")
options gnc:pagename-general optname-report-currency "c")
;; Accounts tab
(add-option
@ -120,7 +134,7 @@
options pagename-display
optname-plot-width optname-plot-height "c" 400 400)
(gnc:options-set-default-section options pagename-general)
(gnc:options-set-default-section options gnc:pagename-general)
options))
@ -137,7 +151,7 @@
;; *really* complicated.
(define (category-barchart-renderer report-obj reportname
account-types report-title do-intervals?)
account-types do-intervals?)
;; A helper functions for looking up option values.
(define (get-option section name)
(gnc:option-value
@ -146,13 +160,17 @@
(let ((to-date-tp (gnc:timepair-end-day-time
(gnc:date-option-absolute-time
(get-option pagename-general optname-to-date))))
(get-option gnc:pagename-general
optname-to-date))))
(from-date-tp (gnc:timepair-start-day-time
(gnc:date-option-absolute-time
(get-option pagename-general optname-from-date))))
(interval (get-option pagename-general optname-stepsize))
(report-currency (get-option pagename-general
(get-option gnc:pagename-general
optname-from-date))))
(interval (get-option gnc:pagename-general optname-stepsize))
(report-currency (get-option gnc:pagename-general
optname-report-currency))
(report-title (get-option gnc:pagename-general
gnc:optname-reportname))
(accounts (get-option pagename-accounts optname-accounts))
(account-levels (get-option pagename-accounts optname-levels))
@ -363,15 +381,69 @@
chart
(gnc:assign-colors (length all-data)))
(let ((urls (map (lambda (pair)
(if (string? (car pair))
other-anchor
(gnc:account-anchor-text (car pair))))
all-data)))
(gnc:html-barchart-set-button-1-bar-urls! chart urls)
(gnc:html-barchart-set-button-1-legend-urls! chart urls))
;; set the URLs; the slices are links to other reports
(let ((urls
(map
(lambda (pair)
(if (string? (car pair))
other-anchor
(let* ((acct (car pair))
(subaccts
(gnc:account-get-immediate-subaccounts acct)))
(if (null? subaccts)
;; if leaf-account, make this an anchor
;; to the register.
(gnc:account-anchor-text acct)
;; if non-leaf account, make this a link
;; to another report which is run on the
;; immediate subaccounts of this account
;; (and including this account).
(gnc:make-report-anchor
reportname
(gnc:report-options report-obj)
(list
(list pagename-accounts optname-accounts
(cons acct subaccts))
(list pagename-accounts optname-levels
(+ 1 tree-depth))
(list gnc:pagename-general
gnc:optname-reportname
((if show-fullname?
gnc:account-get-full-name
gnc:account-get-name) acct))))))))
all-data)))
(gnc:html-barchart-set-button-1-bar-urls! chart (append urls urls)))
;; The legend urls always point to the registers.
(gnc:html-barchart-set-button-1-legend-urls!
chart (map
(lambda (pair)
(if (string? (car pair))
other-anchor
(gnc:account-anchor-text (car pair))))
all-data))
(gnc:html-document-add-object! document chart)
(if (gnc:option-value
(gnc:lookup-global-option "General"
"Display \"Tip of the Day\""))
(gnc:html-document-add-object!
document
(gnc:make-html-text
(gnc:html-markup-p
"If you don't see a stacked barchart i.e. you only see \
lots of thin bars next to each other for each date, then you \
should upgrade Guppi to version 0.35.4 or, \
if that isn't out yet, use the Guppi CVS version.")
(gnc:html-markup-p
"Double-click on any legend box opens the register \
to that account. Double-click on a bar opens either the \
register or, if the account has subaccounts, opens \
another barchart report with precisely those subaccounts.")
(gnc:html-markup-p "Remove this text by disabling \
the global Preference \"Display Tip of the Day\"."))))
document)))
(for-each
@ -379,24 +451,26 @@
(gnc:define-report
'version 1
'name (car l)
'menu-path (if (cadddr l)
(list gnc:menuname-income-expense)
(list gnc:menuname-asset-liability))
'menu-path (if (caddr l)
(list gnc:menuname-income-expense)
(list gnc:menuname-asset-liability))
'menu-name (cadddr l)
'menu-tip (car (cddddr l))
'options-generator (lambda () (options-generator (cadr l)))
'renderer (lambda (report-obj)
(category-barchart-renderer report-obj
(car l)
(cadr l)
(caddr l)
(cadddr l)))))
(car l)
(cadr l)
(caddr l)))))
(list
;; reportname, account-types, reporttitle, do-intervals?
(list reportname-income '(income) reporttitle-income #t)
(list reportname-expense '(expense) reporttitle-expense #t)
;; reportname, account-types, do-intervals?,
;; menu-reportname, menu-tip
(list reportname-income '(income) #t menuname-income menutip-income)
(list reportname-expense '(expense) #t menuname-expense menutip-expense)
(list reportname-assets
'(asset bank cash checking savings money-market
stock mutual-fund currency)
reporttitle-assets #f)
#f menuname-assets menutip-assets)
(list reportname-liabilities
'(liability credit credit-line equity)
reporttitle-liabilities #f))))
#f menuname-liabilities menutip-liabilities))))