[q-lang-cvs] qcalc qcalc.q,1.183,1.184

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

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

Modified Files:
	qcalc.q 
Log Message:
code cleanup

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** qcalc.q	24 Nov 2007 10:22:50 -0000	1.183
--- qcalc.q	25 Nov 2007 05:35:10 -0000	1.184
***************
*** 200,205 ****
    TASKPM = [TASKB,TASKA],
    // read-only indicator in the status bar
!   ROSTAT = qt_new "QLabel" nil,
!   _ = qt ROSTAT "setPixmap" UNLOCKED || qt STATUS "addWidget" (ROSTAT,0,true),
    // dictionary of edited and computed cells
    CELLS = ref emptyhdict, EVAL = ref emptyhdict, XREF = ref emptyhdict,
--- 200,205 ----
    TASKPM = [TASKB,TASKA],
    // read-only indicator in the status bar
!   ROSTAT = qt_new "QLabel" nil, _ = qt ROSTAT "setPixmap" UNLOCKED ||
!   qt STATUS "addWidget" (ROSTAT,0,true),
    // dictionary of edited and computed cells
    CELLS = ref emptyhdict, EVAL = ref emptyhdict, XREF = ref emptyhdict,
***************
*** 598,601 ****
--- 598,606 ----
  		    where G = get GLOBAL;
  
+ /* Set or unset the "locked" indicator in the status line. */
+ 
+ mode_indicator B
+ 		= qt ROSTAT "setPixmap" (if B then LOCKED else UNLOCKED);
+ 
  /* Status updates of task buttons. Process events so that the arrow indicator
     on the task button is updated immediately. Currently we don't do anything
***************
*** 1311,1315 ****
  if qt TABW "currentPageIndex" () = 0:
  		= qt TABLE "setReadOnly" false ||
! 		  qt ROSTAT "setPixmap" UNLOCKED ||
  		  fail // falls through
  		    if qt TABLE "isReadOnly" ();
--- 1316,1320 ----
  if qt TABW "currentPageIndex" () = 0:
  		= qt TABLE "setReadOnly" false ||
! 		  mode_indicator false ||
  		  fail // falls through
  		    if qt TABLE "isReadOnly" ();
***************
*** 1330,1334 ****
  if qt TABW "currentPageIndex" () = 0:
  		= qt TABLE "setReadOnly" false ||
! 		  qt ROSTAT "setPixmap" UNLOCKED ||
  		  fail // falls through
  		    if qt TABLE "isReadOnly" ();
--- 1335,1339 ----
  if qt TABW "currentPageIndex" () = 0:
  		= qt TABLE "setReadOnly" false ||
! 		  mode_indicator false ||
  		  fail // falls through
  		    if qt TABLE "isReadOnly" ();
***************
*** 1368,1375 ****
  		    if not is_gui_elem (I,J) and then
  		      qt TABLE "isEditing" ();
! 		= qt TABLE "setReadOnly" (not RO) ||
! 		  qt ROSTAT "setPixmap" (if RO then UNLOCKED else LOCKED) ||
  		  qt TABLE "setFocus" ()
! 		    where RO = qt TABLE "isReadOnly" ()
  		    otherwise;
  
--- 1373,1380 ----
  		    if not is_gui_elem (I,J) and then
  		      qt TABLE "isEditing" ();
! 		= qt TABLE "setReadOnly" RO ||
! 		  mode_indicator RO ||
  		  qt TABLE "setFocus" ()
! 		    where RO = not qt TABLE "isReadOnly" ()
  		    otherwise;