diff --git a/ChangeLog b/ChangeLog index 39b2ef6459..13909b63b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-05-01 Dave Peticolas + * 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/mainwindow-account-tree.c diff --git a/src/gnome/dialog-style-sheet.c b/src/gnome/dialog-style-sheet.c index aa1d226700..7f3cec7abd 100644 --- a/src/gnome/dialog-style-sheet.c +++ b/src/gnome/dialog-style-sheet.c @@ -21,11 +21,14 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ +#include "config.h" + #include #include "dialog-style-sheet.h" #include "dialog-options.h" #include "glade-gnc-dialogs.h" +#include "messages.h" 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)); struct ss_info * ssinfo = g_new0(struct ss_info, 1); 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 */ 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_style_sheet_options_close_cb, ss); - + /* 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); + free (c_name); + gtk_clist_set_row_data_full(GTK_CLIST(ss->list), this_row, (gpointer)ssinfo, row_data_destroy_cb); @@ -132,7 +141,7 @@ gnc_style_sheet_dialog_fill(StyleSheetDialog * ss, SCM selected) { sel_row = this_row; } } - + gtk_clist_select_row(GTK_CLIST(ss->list), sel_row, 0); } diff --git a/src/scm/report/stylesheet-fancy.scm b/src/scm/report/stylesheet-fancy.scm index 8aa721620f..dd93788224 100644 --- a/src/scm/report/stylesheet-fancy.scm +++ b/src/scm/report/stylesheet-fancy.scm @@ -79,7 +79,7 @@ (gnc:make-color-option (N_ "Colors") (N_ "Background Color") "a" (N_ "General background color for report.") - (list #xff #x88 #xff 0) + (list #xff #xff #xff 0) 255 #f)) (opt-register @@ -93,14 +93,14 @@ (gnc:make-color-option (N_ "Colors") (N_ "Link Color") "c" (N_ "Link text color.") - (list #x00 #xff #xff 0) + (list #xb2 #x22 #x22 0) 255 #f)) - + (opt-register (gnc:make-color-option (N_ "Colors") (N_ "Table Cell Color") "c" (N_ "Default background for table cells.") - (list #xff #x00 #xff 0) + (list #xff #xff #xff 0) 255 #f)) (opt-register @@ -108,7 +108,7 @@ (N_ "Colors") (N_ "Alternate Table Cell Color") "d" (N_ "Default alternate background for table cells.") - (list #x00 #x00 #x00 0) + (list #xff #xff #xff 0) 255 #f)) (opt-register @@ -116,7 +116,7 @@ (N_ "Colors") (N_ "Subheading/Subtotal Cell Color") "e" (N_ "Default color for subtotal rows.") - (list #x00 #x00 #x00 0) + (list #xee #xe8 #xaa 0) 255 #f)) (opt-register @@ -124,7 +124,7 @@ (N_ "Colors") (N_ "Sub-subheading/total Cell Color") "f" (N_ "Color for subsubtotals") - (list #x00 #x00 #x00 0) + (list #xfa #xfa #xd2 0) 255 #f)) (opt-register @@ -132,20 +132,21 @@ (N_ "Colors") (N_ "Grand Total Cell Color") "g" (N_ "Color for grand totals") - (list #x00 #x00 #x00 0) + (list #xff #xff #x00 0) 255 #f)) - - + (opt-register (gnc:make-number-range-option (N_ "Tables") (N_ "Table cell spacing") "a" (N_ "Space between table cells") 1 0 20 0 1)) + (opt-register (gnc:make-number-range-option (N_ "Tables") (N_ "Table cell padding") "b" (N_ "Space between table cells") 1 0 20 0 1)) + (opt-register (gnc:make-number-range-option (N_ "Tables") @@ -171,10 +172,14 @@ (textcolor (color-val (N_ "Colors") (N_ "Text Color"))) (linkcolor (color-val (N_ "Colors") (N_ "Link Color"))) (normal-row-color (color-val (N_ "Colors") (N_ "Table Cell Color"))) - (alternate-row-color (color-val (N_ "Colors") (N_ "Alternate Table Cell Color"))) - (primary-subheading-color (color-val (N_ "Colors") (N_ "Subheading/Subtotal Cell Color"))) - (secondary-subheading-color (color-val (N_ "Colors") - (N_ "Sub-subheading/total Cell Color"))) + (alternate-row-color (color-val (N_ "Colors") + (N_ "Alternate Table Cell Color"))) + (primary-subheading-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") (N_ "Grand Total Cell Color"))) (bgpixmap (opt-val (N_ "Images") (N_ "Background Tile"))) @@ -183,13 +188,13 @@ (spacing (opt-val (N_ "Tables") (N_ "Table cell spacing"))) (padding (opt-val (N_ "Tables") (N_ "Table cell padding"))) (border (opt-val (N_ "Tables") (N_ "Table border width")))) - + (gnc:html-document-set-style! ssdoc "body" 'attribute (list "bgcolor" bgcolor) 'attribute (list "text" textcolor) 'attribute (list "link" linkcolor)) - + (gnc:html-document-set-style! ssdoc "number-cell" 'tag "td" @@ -227,14 +232,12 @@ ssdoc "grand-total" 'attribute (list "bgcolor" grand-total-color) 'tag "tr") - + (gnc:html-document-set-style! ssdoc "text-cell" 'tag "td" 'attribute (list "align" "left")) - - (gnc:html-document-set-style! ssdoc "total-number-cell" 'tag '("td" "b") @@ -245,7 +248,6 @@ 'tag '("td" "b") 'attribute (list "align" "left")) - ;; don't surround marked-up links with (if (not links?) (gnc:html-document-set-style! @@ -258,7 +260,7 @@ t "table" 'attribute (list "border" 0) 'inheritable? #f) - + (gnc:html-table-set-cell! t 1 1 (if show-preparer? @@ -267,13 +269,13 @@ (gnc:html-markup-b (gnc:html-document-title doc)) (gnc:html-markup-br) - "Prepared by: " + (_ "Prepared by: ") (gnc:html-markup-b preparer) (gnc:html-markup-br) - "Prepared for: " + (_ "Prepared for: ") (gnc:html-markup-b prepared-for) (gnc:html-markup-br) - "Date: " + (_ "Date: ") (gnc:timepair-to-datestring (cons (current-time) 0))) @@ -294,17 +296,18 @@ (apply gnc:html-table-set-cell! - t 2 1 + t 2 1 (gnc:html-document-objects doc)) (gnc:html-document-add-object! ssdoc t)) ssdoc)) - + (gnc:define-html-style-sheet 'version 1 - 'name "Fancy" + 'name (N_ "Fancy") 'renderer fancy-renderer 'options-generator fancy-options) - + #t) -(gnc:make-html-style-sheet "Fancy" "Technicolor") \ No newline at end of file + +(gnc:make-html-style-sheet "Fancy" (N_ "Technicolor")) diff --git a/src/scm/report/stylesheet-plain.scm b/src/scm/report/stylesheet-plain.scm index e598874628..ef444e17e9 100644 --- a/src/scm/report/stylesheet-plain.scm +++ b/src/scm/report/stylesheet-plain.scm @@ -166,9 +166,9 @@ (gnc:define-html-style-sheet 'version 1 - 'name "Plain" + 'name (N_ "Plain") 'renderer plain-renderer 'options-generator plain-options)) ;; instantiate a default style sheet -(gnc:make-html-style-sheet "Plain" "Default") +(gnc:make-html-style-sheet "Plain" (N_ "Default"))