[q-lang-cvs] qcalc qcalc.q,1.200,1.201

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28473

Modified Files:
	qcalc.q 
Log Message:
render pixmap elements in printout

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** qcalc.q	29 Nov 2007 01:15:50 -0000	1.200
--- qcalc.q	29 Nov 2007 02:02:22 -0000	1.201
***************
*** 2848,2852 ****
  		      X:QtObject = qt_object "QLabel" TABLE
  		      "MyPixmap" (I,J) [] [] [],
! 		      IT:QtObject = make_table_item (I,J,X)
  		      (qt_val "QTableItem" "Never");
  
--- 2848,2852 ----
  		      X:QtObject = qt_object "QLabel" TABLE
  		      "MyPixmap" (I,J) [] [] [],
! 		      IT:QtObject = make_table_item (I,J,X,ref S)
  		      (qt_val "QTableItem" "Never");
  
***************
*** 2856,2863 ****
  		= qt X "setPixmap" NULLPM ||
  		  qt X "setMovie" NULLMOV ||
! 		  qt X SET PM ||
  		  qt X "setAlignment" (alignment A) ||
  		  qt X "setScaledContents" (B=1)
! 		    where (CLS,SET) =
  		      if B=2 then ("QMovie","setMovie")
  		      else ("QPixmap","setPixmap"),
--- 2856,2864 ----
  		= qt X "setPixmap" NULLPM ||
  		  qt X "setMovie" NULLMOV ||
! 		  R := S || qt X SET PM ||
  		  qt X "setAlignment" (alignment A) ||
  		  qt X "setScaledContents" (B=1)
! 		    where (R:Ref|_) = gui_data (I,J),
! 		      (CLS,SET) =
  		      if B=2 then ("QMovie","setMovie")
  		      else ("QPixmap","setPixmap"),
***************
*** 3011,3015 ****
  
  gui_getc_pixmap X
! 		= htmlquote "<<pixmap>>";
  
  /* Set the value of a GUI element from a string. */
--- 3012,3019 ----
  
  gui_getc_pixmap X
! 		= sprintf "<img src=%s/>" (str S)
! 		    where (I,J) = qt_data X, (R:Ref|_) = gui_data (I,J),
! 		      S:String = get R;
! 		= htmlquote "<<pixmap>>" otherwise;
  
  /* Set the value of a GUI element from a string. */
***************
*** 3079,3086 ****
  
  gui_set_pixmap X S
! 		= qt X "setPixmap" PM
! 		    where PM =
! 		      if null Y then NULLPM
! 		      else qt_new "QPixmap" Y
  		    if checkstr 'Y where 'Y = valq S;
  
--- 3083,3090 ----
  
  gui_set_pixmap X S
! 		= R := S || qt X "setPixmap" PM
! 		    where S = Y,
! 		      (I,J) = qt_data X, (R:Ref|_) = gui_data (I,J),
! 		      PM = if null S then NULLPM else qt_new "QPixmap" S
  		    if checkstr 'Y where 'Y = valq S;