[q-lang-cvs] qcalc qcalc.q,1.193,1.194

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

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

Modified Files:
	qcalc.q 
Log Message:
bugfix: merge/dissociate cells sometimes looses the cell widget

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** qcalc.q	28 Nov 2007 06:11:55 -0000	1.193
--- qcalc.q	28 Nov 2007 06:34:22 -0000	1.194
***************
*** 1584,1590 ****
  
  merge_cells _ _ _
! 		= EDITED := true || update_title || save_undo (I,J;N,M)
! 		    where (I,J) = real_index (I,J), (N,M) = cell_span (I,J)
! 		    where IT:QtObject = set_current_cell (I,J) ||
  		      spanned_table_item (I,J) (N,M)
  		    if not null SEL and then all is_empty SEL
--- 1584,1592 ----
  
  merge_cells _ _ _
! 		= EDITED := true || update_title || save_undo (I,J;N,M) ||
! 		  if is_qt_object X then post CBQ '(check_last_gui (I,J,X))
! 		    where (I,J) = (I1,J1), (N,M) = cell_span (I,J)
! 		    where (I1,J1) = real_index (I,J), X = gui_elem (I1,J1),
! 		      IT:QtObject = set_current_cell (I,J) ||
  		      spanned_table_item (I,J) (N,M)
  		    if not null SEL and then all is_empty SEL
***************
*** 1601,1606 ****
  dissociate_cell (I,J)
  		= set_current_cell (I,J) || qt IT "setSpan" (1,1) ||
! 		  EDITED := true || update_title || save_undo (I,J;1,1)
! 		    where IT = get_table_item (I,J);
  
  get_spans SEL	= sort indexcmp SEL
--- 1603,1610 ----
  dissociate_cell (I,J)
  		= set_current_cell (I,J) || qt IT "setSpan" (1,1) ||
! 		  EDITED := true || update_title || save_undo (I,J;1,1) ||
! 		  if is_qt_object X then post CBQ '(check_last_gui (I1,J1,X))
! 		    where IT = get_table_item (I,J),
! 		      (I1,J1) = real_index (I,J), X = gui_elem (I1,J1);
  
  get_spans SEL	= sort indexcmp SEL
***************
*** 3199,3207 ****
  		  set_current_cell (I,J) || spanned_table_item (I,J) (N1,M1) ||
  		  UNDO_LIST := UL || REDO_LIST := [(I,J;N,M)|get REDO_LIST] ||
! 		  EDITED := (#UL<>get LAST_SAVE) || update_title
  		    where [(I,J;N,M)|UL] = get UNDO_LIST,
  		      SP = foldl insert (get SPANS) $
  		      filter istuple $ reverse UL,
! 		      (N1,M1) = undo_span SP (I,J);
  
  redo		= //printf "*** redo: %s\n" (str W) ||
--- 3203,3213 ----
  		  set_current_cell (I,J) || spanned_table_item (I,J) (N1,M1) ||
  		  UNDO_LIST := UL || REDO_LIST := [(I,J;N,M)|get REDO_LIST] ||
! 		  EDITED := (#UL<>get LAST_SAVE) || update_title ||
! 		  if is_qt_object X then post CBQ '(check_last_gui (I1,J1,X))
  		    where [(I,J;N,M)|UL] = get UNDO_LIST,
  		      SP = foldl insert (get SPANS) $
  		      filter istuple $ reverse UL,
! 		      (N1,M1) = undo_span SP (I,J),
! 		      (I1,J1) = real_index (I,J), X = gui_elem (I1,J1);
  
  redo		= //printf "*** redo: %s\n" (str W) ||
***************
*** 3240,3245 ****
  		  set_current_cell (I,J) || spanned_table_item (I,J) (N,M) ||
  		  UNDO_LIST := [(I,J;N,M)|UL] || REDO_LIST := RL ||
! 		  EDITED := (#UL+1<>get LAST_SAVE) || update_title
! 		    where [(I,J;N,M)|RL] = get REDO_LIST, UL = get UNDO_LIST;
  
  /* Syntax highlighting. ****************************************************/
--- 3246,3253 ----
  		  set_current_cell (I,J) || spanned_table_item (I,J) (N,M) ||
  		  UNDO_LIST := [(I,J;N,M)|UL] || REDO_LIST := RL ||
! 		  EDITED := (#UL+1<>get LAST_SAVE) || update_title ||
! 		  if is_qt_object X then post CBQ '(check_last_gui (I1,J1,X))
! 		    where [(I,J;N,M)|RL] = get REDO_LIST, UL = get UNDO_LIST,
! 		      (I1,J1) = real_index (I,J), X = gui_elem (I1,J1);
  
  /* Syntax highlighting. ****************************************************/