[Gnucash-changes] r13044 - gnucash/trunk - Dave Herman's patch to suppresses extraneous entries table entries in

[David Hampton]

Author: hampton
Date: 2006-01-29 20:56:13 -0500 (Sun, 29 Jan 2006)
New Revision: 13044
Trac: http://svn.gnucash.org/trac/changeset/13044

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/report/stylesheets/stylesheet-fancy.scm
Log:
Dave Herman's patch to suppresses extraneous entries table entries in
reports when there are no files specified for the "logo pix" file or
the "header pix" file.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-30 01:49:35 UTC (rev 13043)
+++ gnucash/trunk/ChangeLog	2006-01-30 01:56:13 UTC (rev 13044)
@@ -1,5 +1,10 @@
 2006-01-29  David Hampton  <hampton at employees.org>
 
+	* src/report/stylesheets/stylesheet-fancy.scm : Dave Herman's
+	patch to suppresses extraneous entries table entries in reports
+	when there are no files specified for the "logo pix" file or the
+	"header pix" file.
+
 	* src/gnome-utils/gnc-main-window.c: Eskil Bylund's patch from
 	Epiphany to enable cut/paste.  Extended to support GtkTextView
 	widgets as well as GtkEditable widgets.

Modified: gnucash/trunk/src/report/stylesheets/stylesheet-fancy.scm
===================================================================
--- gnucash/trunk/src/report/stylesheets/stylesheet-fancy.scm	2006-01-30 01:49:35 UTC (rev 13043)
+++ gnucash/trunk/src/report/stylesheets/stylesheet-fancy.scm	2006-01-30 01:56:13 UTC (rev 13044)
@@ -289,16 +289,22 @@
 	    (gnc:html-markup-b 
 	     (gnc:html-document-title doc)))))
       
-      (gnc:html-table-set-cell!
-       t 0 0
-       (gnc:make-html-text
-	(gnc:html-markup-img logopixmap)))
-      
-      (gnc:html-table-set-cell!
-       t 0 1
-       (gnc:make-html-text
-	(gnc:html-markup-img headpixmap)))
-      
+      (if (and logopixmap
+	       (not (string=? logopixmap "")))
+	  ;; check for logo image file name non blank
+	  (gnc:html-table-set-cell!
+	   t 0 0
+           (gnc:make-html-text
+	    (gnc:html-markup-img logopixmap))) )
+
+      (if (and headpixmap
+	       (not (string=? headpixmap "")))
+	  ;; check for header image file name nonblank
+	  (gnc:html-table-set-cell!
+	   t 0 1
+	   (gnc:make-html-text
+	    (gnc:html-markup-img headpixmap))) )
+
       (apply 
        gnc:html-table-set-cell! 
        t 2 1
@@ -308,7 +314,7 @@
     ssdoc))
 
 (gnc:define-html-style-sheet 
- 'version 1
+ 'version 1.01
  'name (N_ "Fancy")
  'renderer fancy-renderer
  'options-generator fancy-options)