[q-lang-cvs] qcalc calclib.q,1.46,1.47 qcalc.q,1.195,1.196

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	calclib.q qcalc.q 
Log Message:
add alignment support for label and pixmap cells

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.195
retrieving revision 1.196
diff -C2 -d -r1.195 -r1.196
*** qcalc.q	28 Nov 2007 07:14:22 -0000	1.195
--- qcalc.q	28 Nov 2007 08:18:37 -0000	1.196
***************
*** 2774,2779 ****
  		  qt X "setPageStep" STEP || qt X "setValue" INIT;
  
! label_gui (I,J) () S:String
  		= qt X "setBackgroundMode" (qt_val "Qt" "PaletteBase") ||
  		  qt TABLE "setCellWidget" (I,J,X) || IT
  		    if not is_nil IT and then not is_nil X
--- 2774,2780 ----
  		  qt X "setPageStep" STEP || qt X "setValue" INIT;
  
! label_gui (I,J) () (S,A)
  		= qt X "setBackgroundMode" (qt_val "Qt" "PaletteBase") ||
+ 		  qt X "setAlignment" (alignment A) ||
  		  qt TABLE "setCellWidget" (I,J,X) || IT
  		    if not is_nil IT and then not is_nil X
***************
*** 2783,2792 ****
  		      (qt_val "QTableItem" "Never");
  
! label_gui (I,J) X:QtObject S:String
! 		= qt X "setText" S;
  
! pixmap_gui (I,J) () (S,B)
  		= qt X "setBackgroundMode" (qt_val "Qt" "PaletteBase") ||
  		  qt X SET PM ||
  		  qt X "setScaledContents" (B=1) ||
  		  qt TABLE "setCellWidget" (I,J,X) || IT
--- 2784,2830 ----
  		      (qt_val "QTableItem" "Never");
  
! def ALIGN = dict
!   ["a",		qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignVCenter";
!    "c",		qt_val "Qt" "AlignCenter";
!    "l",		qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignVCenter";
!    "r",		qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignVCenter";
!    "t",		qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignTop";
!    "b",		qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignBottom";
!    "ac",	qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignVCenter";
!    "cc",	qt_val "Qt" "AlignCenter";
!    "lc",	qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignVCenter";
!    "rc",	qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignVCenter";
!    "at",	qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignTop";
!    "ct",	qt_val "Qt" "AlignHCenter" or qt_val "Qt" "AlignTop";
!    "lt",	qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignTop";
!    "rt",	qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignTop";
!    "ab",	qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignBottom";
!    "cb",	qt_val "Qt" "AlignHCenter" or qt_val "Qt" "AlignBottom";
!    "lb",	qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignBottom";
!    "rb",	qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignBottom";
!    "ca",	qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignVCenter";
!    "cl",	qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignVCenter";
!    "cr",	qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignVCenter";
!    "ta",	qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignTop";
!    "tc",	qt_val "Qt" "AlignHCenter" or qt_val "Qt" "AlignTop";
!    "tl",	qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignTop";
!    "tr",	qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignTop";
!    "ba",	qt_val "Qt" "AlignAuto" or qt_val "Qt" "AlignBottom";
!    "bc",	qt_val "Qt" "AlignHCenter" or qt_val "Qt" "AlignBottom";
!    "bl",	qt_val "Qt" "AlignLeft" or qt_val "Qt" "AlignBottom";
!    "br",	qt_val "Qt" "AlignRight" or qt_val "Qt" "AlignBottom"];
!    
! alignment A:String
! 		= N where N:Int = ALIGN!A;
! alignment _	= ALIGN!"a" otherwise;
  
! label_gui (I,J) X:QtObject (S,A)
! 		= qt X "setAlignment" (alignment A) ||
! 		  qt X "setText" S;
! 
! pixmap_gui (I,J) () (S,A,B)
  		= qt X "setBackgroundMode" (qt_val "Qt" "PaletteBase") ||
  		  qt X SET PM ||
+ 		  qt X "setAlignment" (alignment A) ||
  		  qt X "setScaledContents" (B=1) ||
  		  qt TABLE "setCellWidget" (I,J,X) || IT
***************
*** 2803,2808 ****
  		      (qt_val "QTableItem" "Never");
  
! pixmap_gui (I,J) X:QtObject (S,B)
! 		= qt X SET PM || qt X "setScaledContents" (B=1)
  		    where (CLS,SET) =
  		      if B=2 then ("QMovie","setMovie")
--- 2841,2848 ----
  		      (qt_val "QTableItem" "Never");
  
! pixmap_gui (I,J) X:QtObject (S,A,B)
! 		= qt X SET PM ||
! 		  qt X "setAlignment" (alignment A) ||
! 		  qt X "setScaledContents" (B=1)
  		    where (CLS,SET) =
  		      if B=2 then ("QMovie","setMovie")
***************
*** 3756,3767 ****
  		      "^\\+\\+\\+ Label: (\\([0-9]+,[0-9]+\\)) (.*)$" S
  		      (reg 1,reg 2),
! 		      (I1,J1) = val K1, S1:String = val S1,
! 		      IT:QtObject = make_gui label_gui (I1,J1) S1;
  		= results_loop T0 (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Pixmap: (\\([0-9]+,[0-9]+\\)) (.*)$" S
  		      (reg 1,reg 2),
! 		      (I1,J1) = val K1, (S1,B1) = val S1,
! 		      IT:QtObject = make_gui pixmap_gui (I1,J1) (S1,B1);
  // anything else just gets passed to the digest function, and we try again
  		= local (digest S) || results_loop T0 U [(I,J)|V];
--- 3796,3807 ----
  		      "^\\+\\+\\+ Label: (\\([0-9]+,[0-9]+\\)) (.*)$" S
  		      (reg 1,reg 2),
! 		      (I1,J1) = val K1, (S1,A1) = val S1,
! 		      IT:QtObject = make_gui label_gui (I1,J1) (S1,A1);
  		= results_loop T0 (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Pixmap: (\\([0-9]+,[0-9]+\\)) (.*)$" S
  		      (reg 1,reg 2),
! 		      (I1,J1) = val K1, (S1,A1,B1) = val S1,
! 		      IT:QtObject = make_gui pixmap_gui (I1,J1) (S1,A1,B1);
  // anything else just gets passed to the digest function, and we try again
  		= local (digest S) || results_loop T0 U [(I,J)|V];

Index: calclib.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/calclib.q,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** calclib.q	28 Nov 2007 07:14:21 -0000	1.46
--- calclib.q	28 Nov 2007 08:18:37 -0000	1.47
***************
*** 174,184 ****
  /* Basic GUI elements. */
  
! label S:String	= printf "\f+++ Label: %s %s\n" (str (I,J),str S) ||
  		  flush || yyset (I,J) S || S
  		    where (I,J) = get YYKEY;
  
! pixmap S:String	= pixmap (S,0);
  pixmap (S:String,B:Int)
! 		= printf "\f+++ Pixmap: %s %s\n" (str (I,J),str (S,B)) ||
  		  flush || yyset (I,J) S || S
  		    where (I,J) = get YYKEY;
--- 174,192 ----
  /* Basic GUI elements. */
  
! label S:String	= label (S,"a");
! label (S:String,A:String)
! 		= printf "\f+++ Label: %s %s\n" (str (I,J),str (S,A)) ||
  		  flush || yyset (I,J) S || S
  		    where (I,J) = get YYKEY;
  
! pixmap S:String	= pixmap (S,"a",0);
! pixmap (S:String,A:String)
! 		= pixmap (S,A,0);
  pixmap (S:String,B:Int)
! 		= pixmap (S,"a",B);
! pixmap (S:String,B:Int,A:String)
! 		= pixmap (S,A,B);
! pixmap (S:String,A:String,B:Int)
! 		= printf "\f+++ Pixmap: %s %s\n" (str (I,J),str (S,A,B)) ||
  		  flush || yyset (I,J) S || S
  		    where (I,J) = get YYKEY;