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

Fix display of pixmaps.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8737 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton
2003-06-26 06:28:16 +00:00
parent fdca1f8ea3
commit 3c367262a5
4 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2003-06-25 David Hampton <hampton@employees.org>
* src/report/report-system/html-document.scm:
* src/report/report-system/html-text.scm: Correctly quote
attribute values. #115244
* src/gnome-utils/dialog-options.c: Display selected pixmap when
opening an options window.
* src/gnome-utils/dialog-commodity.c:
* src/gnome-utils/dialog-utils.[ch]: Consolidate a couple of
functions into the only file where they areused.
2003-06-25 Derek Atkins <derek@ihtfp.com> 2003-06-25 Derek Atkins <derek@ihtfp.com>
* src/report/standard-reports/balance-sheet.scm: Add a "retained * src/report/standard-reports/balance-sheet.scm: Add a "retained

24
src/gnome-utils/dialog-options.c
View File

@@ -1000,9 +1000,13 @@ gnc_option_set_ui_widget(GNCOption *option,
char *type; char *type;
GNCOptionDef_t *option_def; GNCOptionDef_t *option_def;
ENTER("option %p(%s), box %p, tips %p",
option, gnc_option_name(option), page_box, tooltips);
type = gnc_option_type(option); type = gnc_option_type(option);
if (type == NULL) if (type == NULL) {
LEAVE("bad type");
return; return;
}
raw_name = gnc_option_name(option); raw_name = gnc_option_name(option);
if (raw_name != NULL) if (raw_name != NULL)
@@ -1040,6 +1044,7 @@ gnc_option_set_ui_widget(GNCOption *option,
if (raw_documentation != NULL) if (raw_documentation != NULL)
free(raw_documentation); free(raw_documentation);
free(type); free(type);
LEAVE(" ");
} }
static void static void
@@ -2113,6 +2118,7 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box,
GtkWidget *label; GtkWidget *label;
gchar *colon_name; gchar *colon_name;
ENTER("option %p(%s), name %s", option, gnc_option_name(option), name);
colon_name = g_strconcat(name, ":", NULL); colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name); label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -2138,6 +2144,7 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box,
gtk_widget_show(value); gtk_widget_show(value);
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(*enclosing); gtk_widget_show(*enclosing);
LEAVE("new widget = %p", value);
return value; return value;
} }
@@ -2503,23 +2510,26 @@ static gboolean
gnc_option_set_ui_value_pixmap (GNCOption *option, gboolean use_default, gnc_option_set_ui_value_pixmap (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value) GtkWidget *widget, SCM value)
{ {
ENTER("option %p(%s)", option, gnc_option_name(option));
if (SCM_STRINGP(value)) if (SCM_STRINGP(value))
{ {
char * string = gh_scm2newstr(value, NULL); char * string = gh_scm2newstr(value, NULL);
if (string && *string) if (string && *string)
{ {
GnomeFileEntry *fentry = DEBUG("string = %s", string);
GNOME_FILE_ENTRY(gnome_pixmap_entry_gnome_file_entry GtkEntry *entry =
(GNOME_PIXMAP_ENTRY(widget))); GTK_ENTRY(gnome_pixmap_entry_gtk_entry(GNOME_PIXMAP_ENTRY(widget)));
gnome_file_entry_set_default_path(fentry, string); gtk_entry_set_text(entry, string);
} }
if(string) if(string)
free(string); free(string);
LEAVE("FALSE");
return FALSE; return FALSE;
} }
else
return TRUE; LEAVE("TRUE");
return TRUE;
} }
static gboolean static gboolean

8
src/report/report-system/html-document.scm
View File

@@ -240,9 +240,11 @@
(push (lambda (l) (set! retval (cons l retval)))) (push (lambda (l) (set! retval (cons l retval))))
(add-internal-tag (lambda (tag) (push "<") (push tag) (push ">"))) (add-internal-tag (lambda (tag) (push "<") (push tag) (push ">")))
(add-attribute (add-attribute
(lambda (key value prior) (push " ") (push key) (lambda (key value prior)
(if value (begin (push "=") (push " ") (push key)
(push value))) (if value (begin (push "=\"")
(push value)
(push "\"")))
#t)) #t))
(addextraatt (addextraatt
(lambda (attr) (lambda (attr)

6
src/report/report-system/html-text.scm
View File

@@ -191,14 +191,14 @@
"img" "img"
(with-output-to-string (with-output-to-string
(lambda () (lambda ()
(display "src=") (display src) (display "src=\"") (display src) (display"\"")
(display " ") (display " ")
(for-each (for-each
(lambda (kvp) (lambda (kvp)
(display (car kvp)) (display (car kvp))
(display "=") (display "=\"")
(display (cadr kvp)) (display (cadr kvp))
(display " ")) (display "\" "))
rest))))) rest)))))
(define (gnc:html-text-render p doc) (define (gnc:html-text-render p doc)