[q-lang-cvs] qcalc qcalc.q,1.152,1.153

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

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

Modified Files:
	qcalc.q 
Log Message:
bugfixes

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** qcalc.q	16 Nov 2007 07:08:12 -0000	1.152
--- qcalc.q	16 Nov 2007 07:25:34 -0000	1.153
***************
*** 2449,2453 ****
  		= qt X "setFlat" true ||
  		  qt_connect X (SIGNAL "clicked()") X (SLOT "guiUpdate()") ||
- 		  gui_set_actionbutton X INIT ||
  		  qt TABLE "setCellWidget" (I,J,X) || IT
  		    if not is_nil IT and then not is_nil X
--- 2449,2452 ----
***************
*** 2465,2470 ****
  
  actionbutton_gui (I,J) X:QtObject (TEXT,ICON,INIT)
! 		= qt X "setText" TEXT || qt X "setIconSet" ICONSET ||
! 		  gui_set_actionbutton X INIT
  		    where PM =
  		      if null ICON then NULLPM
--- 2464,2468 ----
  
  actionbutton_gui (I,J) X:QtObject (TEXT,ICON,INIT)
! 		= qt X "setText" TEXT || qt X "setIconSet" ICONSET
  		    where PM =
  		      if null ICON then NULLPM
***************
*** 2603,2608 ****
     "MyTaskButton",	(taskbutton_gui,gui_get_togglebutton,
  			 gui_set_taskbutton);
!    "MyActionButton",	(actionbutton_gui,gui_get_actionbutton,
! 			 gui_set_actionbutton);];
  
  /* Get our class name for a GUI element. Note that the checkbox and combobox
--- 2601,2605 ----
     "MyTaskButton",	(taskbutton_gui,gui_get_togglebutton,
  			 gui_set_taskbutton);
!    "MyActionButton",	(actionbutton_gui,(),());];
  
  /* Get our class name for a GUI element. Note that the checkbox and combobox
***************
*** 2635,2641 ****
  		= qt X "isDown" ();
  
- gui_get_actionbutton X
- 		= cell_getval (I,J) where (I,J) = qt_data X;
- 
  gui_get_togglebutton X
  		= qt X "isOn" ();
--- 2632,2635 ----
***************
*** 2675,2682 ****
  		    otherwise;
  
- gui_set_actionbutton X S
- 		= cell_setval (I,J) S0
- 		    where (I,J) = qt_data X, (S0,S1) = unquote S;
- 
  gui_set_togglebutton X S
  		= qt X "setOn" Y
--- 2669,2672 ----
***************
*** 3352,3357 ****
  		      (reg 1,reg 2),
  		      (I1,J1) = val K1, (TEXT,ICON,INIT) = val S1,
! 		      IT:QtObject = make_gui actionbutton_gui (I1,J1,INIT)
! 		      (TEXT,ICON);
  		= results_loop (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
--- 3342,3347 ----
  		      (reg 1,reg 2),
  		      (I1,J1) = val K1, (TEXT,ICON,INIT) = val S1,
! 		      IT:QtObject = make_gui actionbutton_gui (I1,J1)
! 		      (TEXT,ICON,INIT);
  		= results_loop (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""