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-05-01 Dave Peticolas <dave@krondo.com>

Browse Source 
* src/scm/report/stylesheet-plain.scm: fix i18n bugs

	* src/scm/report/stylesheet-fancy.scm: work on colors,
	fix i18n bugs

	* src/gnome/dialog-style-sheet.c: fix i18n bugs


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4097 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-05-01 10:15:58 +00:00
parent efb07a072a
commit 73277fb3df
4 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2001-05-01 Dave Peticolas <dave@krondo.com> 2001-05-01 Dave Peticolas <dave@krondo.com>
* src/scm/report/stylesheet-plain.scm: fix i18n bugs
* src/scm/report/stylesheet-fancy.scm: work on colors,
fix i18n bugs
* src/gnome/dialog-style-sheet.c: fix i18n bugs
* src/gnome/window-acct-tree.c: add popup menu to account tree * src/gnome/window-acct-tree.c: add popup menu to account tree
* src/gnome/mainwindow-account-tree.c * src/gnome/mainwindow-account-tree.c

19
src/gnome/dialog-style-sheet.c
View File

@ -21,11 +21,14 @@
* Boston, MA 02111-1307, USA gnu@gnu.org * * Boston, MA 02111-1307, USA gnu@gnu.org *
********************************************************************/ ********************************************************************/
#include "config.h"
#include <gnome.h> #include <gnome.h>
#include "dialog-style-sheet.h" #include "dialog-style-sheet.h"
#include "dialog-options.h" #include "dialog-options.h"
#include "glade-gnc-dialogs.h" #include "glade-gnc-dialogs.h"
#include "messages.h"
StyleSheetDialog * gnc_style_sheet_dialog = NULL; StyleSheetDialog * gnc_style_sheet_dialog = NULL;
@ -102,8 +105,8 @@ gnc_style_sheet_dialog_fill(StyleSheetDialog * ss, SCM selected) {
SCM scm_options = gh_call1(get_options, gh_car(stylesheets)); SCM scm_options = gh_call1(get_options, gh_car(stylesheets));
struct ss_info * ssinfo = g_new0(struct ss_info, 1); struct ss_info * ssinfo = g_new0(struct ss_info, 1);
int this_row; int this_row;
char * c_names[1]; char * c_names[1];
char * c_name;
/* make the options DB and dialog, but don't parent it yet */ /* make the options DB and dialog, but don't parent it yet */
ssinfo->odialog = gnc_options_dialog_new(FALSE); ssinfo->odialog = gnc_options_dialog_new(FALSE);
@ -121,10 +124,16 @@ gnc_style_sheet_dialog_fill(StyleSheetDialog * ss, SCM selected) {
gnc_options_dialog_set_close_cb(ssinfo->odialog, gnc_options_dialog_set_close_cb(ssinfo->odialog,
gnc_style_sheet_options_close_cb, gnc_style_sheet_options_close_cb,
ss); ss);
/* add the column name */ /* add the column name */
c_names[0] = gh_scm2newstr(scm_name, NULL); c_name = gh_scm2newstr(scm_name, NULL);
if (!c_name)
continue;
c_names[0] = _(c_name);
this_row = gtk_clist_append(GTK_CLIST(ss->list), c_names); this_row = gtk_clist_append(GTK_CLIST(ss->list), c_names);
free (c_name);
gtk_clist_set_row_data_full(GTK_CLIST(ss->list), this_row, gtk_clist_set_row_data_full(GTK_CLIST(ss->list), this_row,
(gpointer)ssinfo, (gpointer)ssinfo,
row_data_destroy_cb); row_data_destroy_cb);
@ -132,7 +141,7 @@ gnc_style_sheet_dialog_fill(StyleSheetDialog * ss, SCM selected) {
sel_row = this_row; sel_row = this_row;
} }
} }
gtk_clist_select_row(GTK_CLIST(ss->list), sel_row, 0); gtk_clist_select_row(GTK_CLIST(ss->list), sel_row, 0);
} }

61
src/scm/report/stylesheet-fancy.scm
View File

@ -79,7 +79,7 @@
(gnc:make-color-option (gnc:make-color-option
(N_ "Colors") (N_ "Colors")
(N_ "Background Color") "a" (N_ "General background color for report.") (N_ "Background Color") "a" (N_ "General background color for report.")
(list #xff #x88 #xff 0) (list #xff #xff #xff 0)
255 #f)) 255 #f))
(opt-register (opt-register
@ -93,14 +93,14 @@
(gnc:make-color-option (gnc:make-color-option
(N_ "Colors") (N_ "Colors")
(N_ "Link Color") "c" (N_ "Link text color.") (N_ "Link Color") "c" (N_ "Link text color.")
(list #x00 #xff #xff 0) (list #xb2 #x22 #x22 0)
255 #f)) 255 #f))
(opt-register (opt-register
(gnc:make-color-option (gnc:make-color-option
(N_ "Colors") (N_ "Colors")
(N_ "Table Cell Color") "c" (N_ "Default background for table cells.") (N_ "Table Cell Color") "c" (N_ "Default background for table cells.")
(list #xff #x00 #xff 0) (list #xff #xff #xff 0)
255 #f)) 255 #f))
(opt-register (opt-register
@ -108,7 +108,7 @@
(N_ "Colors") (N_ "Colors")
(N_ "Alternate Table Cell Color") "d" (N_ "Alternate Table Cell Color") "d"
(N_ "Default alternate background for table cells.") (N_ "Default alternate background for table cells.")
(list #x00 #x00 #x00 0) (list #xff #xff #xff 0)
255 #f)) 255 #f))
(opt-register (opt-register
@ -116,7 +116,7 @@
(N_ "Colors") (N_ "Colors")
(N_ "Subheading/Subtotal Cell Color") "e" (N_ "Subheading/Subtotal Cell Color") "e"
(N_ "Default color for subtotal rows.") (N_ "Default color for subtotal rows.")
(list #x00 #x00 #x00 0) (list #xee #xe8 #xaa 0)
255 #f)) 255 #f))
(opt-register (opt-register
@ -124,7 +124,7 @@
(N_ "Colors") (N_ "Colors")
(N_ "Sub-subheading/total Cell Color") "f" (N_ "Sub-subheading/total Cell Color") "f"
(N_ "Color for subsubtotals") (N_ "Color for subsubtotals")
(list #x00 #x00 #x00 0) (list #xfa #xfa #xd2 0)
255 #f)) 255 #f))
(opt-register (opt-register
@ -132,20 +132,21 @@
(N_ "Colors") (N_ "Colors")
(N_ "Grand Total Cell Color") "g" (N_ "Grand Total Cell Color") "g"
(N_ "Color for grand totals") (N_ "Color for grand totals")
(list #x00 #x00 #x00 0) (list #xff #xff #x00 0)
255 #f)) 255 #f))
(opt-register (opt-register
(gnc:make-number-range-option (gnc:make-number-range-option
(N_ "Tables") (N_ "Tables")
(N_ "Table cell spacing") "a" (N_ "Space between table cells") (N_ "Table cell spacing") "a" (N_ "Space between table cells")
1 0 20 0 1)) 1 0 20 0 1))
(opt-register (opt-register
(gnc:make-number-range-option (gnc:make-number-range-option
(N_ "Tables") (N_ "Tables")
(N_ "Table cell padding") "b" (N_ "Space between table cells") (N_ "Table cell padding") "b" (N_ "Space between table cells")
1 0 20 0 1)) 1 0 20 0 1))
(opt-register (opt-register
(gnc:make-number-range-option (gnc:make-number-range-option
(N_ "Tables") (N_ "Tables")
@ -171,10 +172,14 @@
(textcolor (color-val (N_ "Colors") (N_ "Text Color"))) (textcolor (color-val (N_ "Colors") (N_ "Text Color")))
(linkcolor (color-val (N_ "Colors") (N_ "Link Color"))) (linkcolor (color-val (N_ "Colors") (N_ "Link Color")))
(normal-row-color (color-val (N_ "Colors") (N_ "Table Cell Color"))) (normal-row-color (color-val (N_ "Colors") (N_ "Table Cell Color")))
(alternate-row-color (color-val (N_ "Colors") (N_ "Alternate Table Cell Color"))) (alternate-row-color (color-val (N_ "Colors")
(primary-subheading-color (color-val (N_ "Colors") (N_ "Subheading/Subtotal Cell Color"))) (N_ "Alternate Table Cell Color")))
(secondary-subheading-color (color-val (N_ "Colors") (primary-subheading-color
(N_ "Sub-subheading/total Cell Color"))) (color-val (N_ "Colors")
(N_ "Subheading/Subtotal Cell Color")))
(secondary-subheading-color
(color-val (N_ "Colors")
(N_ "Sub-subheading/total Cell Color")))
(grand-total-color (color-val (N_ "Colors") (grand-total-color (color-val (N_ "Colors")
(N_ "Grand Total Cell Color"))) (N_ "Grand Total Cell Color")))
(bgpixmap (opt-val (N_ "Images") (N_ "Background Tile"))) (bgpixmap (opt-val (N_ "Images") (N_ "Background Tile")))
@ -183,13 +188,13 @@
(spacing (opt-val (N_ "Tables") (N_ "Table cell spacing"))) (spacing (opt-val (N_ "Tables") (N_ "Table cell spacing")))
(padding (opt-val (N_ "Tables") (N_ "Table cell padding"))) (padding (opt-val (N_ "Tables") (N_ "Table cell padding")))
(border (opt-val (N_ "Tables") (N_ "Table border width")))) (border (opt-val (N_ "Tables") (N_ "Table border width"))))
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "body" ssdoc "body"
'attribute (list "bgcolor" bgcolor) 'attribute (list "bgcolor" bgcolor)
'attribute (list "text" textcolor) 'attribute (list "text" textcolor)
'attribute (list "link" linkcolor)) 'attribute (list "link" linkcolor))
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "number-cell" ssdoc "number-cell"
'tag "td" 'tag "td"
@ -227,14 +232,12 @@
ssdoc "grand-total" ssdoc "grand-total"
'attribute (list "bgcolor" grand-total-color) 'attribute (list "bgcolor" grand-total-color)
'tag "tr") 'tag "tr")
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "text-cell" ssdoc "text-cell"
'tag "td" 'tag "td"
'attribute (list "align" "left")) 'attribute (list "align" "left"))
(gnc:html-document-set-style! (gnc:html-document-set-style!
ssdoc "total-number-cell" ssdoc "total-number-cell"
'tag '("td" "b") 'tag '("td" "b")
@ -245,7 +248,6 @@
'tag '("td" "b") 'tag '("td" "b")
'attribute (list "align" "left")) 'attribute (list "align" "left"))
;; don't surround marked-up links with <a> </a> ;; don't surround marked-up links with <a> </a>
(if (not links?) (if (not links?)
(gnc:html-document-set-style! (gnc:html-document-set-style!
@ -258,7 +260,7 @@
t "table" t "table"
'attribute (list "border" 0) 'attribute (list "border" 0)
'inheritable? #f) 'inheritable? #f)
(gnc:html-table-set-cell! (gnc:html-table-set-cell!
t 1 1 t 1 1
(if show-preparer? (if show-preparer?
@ -267,13 +269,13 @@
(gnc:html-markup-b (gnc:html-markup-b
(gnc:html-document-title doc)) (gnc:html-document-title doc))
(gnc:html-markup-br) (gnc:html-markup-br)
"Prepared by: " (_ "Prepared by: ")
(gnc:html-markup-b preparer) (gnc:html-markup-b preparer)
(gnc:html-markup-br) (gnc:html-markup-br)
"Prepared for: " (_ "Prepared for: ")
(gnc:html-markup-b prepared-for) (gnc:html-markup-b prepared-for)
(gnc:html-markup-br) (gnc:html-markup-br)
"Date: " (_ "Date: ")
(gnc:timepair-to-datestring (gnc:timepair-to-datestring
(cons (current-time) 0))) (cons (current-time) 0)))
@ -294,17 +296,18 @@
(apply (apply
gnc:html-table-set-cell! gnc:html-table-set-cell!
t 2 1 t 2 1
(gnc:html-document-objects doc)) (gnc:html-document-objects doc))
(gnc:html-document-add-object! ssdoc t)) (gnc:html-document-add-object! ssdoc t))
ssdoc)) ssdoc))
(gnc:define-html-style-sheet (gnc:define-html-style-sheet
'version 1 'version 1
'name "Fancy" 'name (N_ "Fancy")
'renderer fancy-renderer 'renderer fancy-renderer
'options-generator fancy-options) 'options-generator fancy-options)
#t) #t)
(gnc:make-html-style-sheet "Fancy" "Technicolor")
(gnc:make-html-style-sheet "Fancy" (N_ "Technicolor"))

4
src/scm/report/stylesheet-plain.scm
View File

@ -166,9 +166,9 @@
(gnc:define-html-style-sheet (gnc:define-html-style-sheet
'version 1 'version 1
'name "Plain" 'name (N_ "Plain")
'renderer plain-renderer 'renderer plain-renderer
'options-generator plain-options)) 'options-generator plain-options))
;; instantiate a default style sheet ;; instantiate a default style sheet
(gnc:make-html-style-sheet "Plain" "Default") (gnc:make-html-style-sheet "Plain" (N_ "Default"))