hg/stx-libwidg2: comparison DSVColumnView.st

equal deleted inserted replaced

-:a8add4698dea
+:103067a67ff9
 		checkToggleActiveImage checkTogglePassiveImage checkToggleLevel
 		comboButtonExtent comboButtonForm comboButtonLevel dropTarget
 		dropSource columnAdaptor tabAtEndAction tabAtStartAction
 		modifiedChannel autoScroll autoScrollBlock needFitColumns
 		scrollWhenUpdating selectionForegroundColor
-		selectionBackgroundColor previousExtent'
+		selectionBackgroundColor previousExtent selectConditionBlock'
 	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor
 		DefaultHilightForegroundColor DefaultHilightBackgroundColor
 		ButtonLightColor ButtonShadowColor CheckToggleActiveImage
 		CheckTogglePassiveImage ButtonHalfLightColor
 		ButtonHalfShadowColor ButtonEdgeStyle CheckToggleForm
 block returns the row which is put to the list
 "
 rowIfAbsentBlock := aOneArgAction
+!
+selectConditionBlock
+"get the select-conditionBlock; this block is evaluated before
+any selection change is performed (passing the to-be-changed row number
+index as arg).
+The change will not be done, if the block returns false.
+"
+^ selectConditionBlock
+!
+selectConditionBlock:aOneArgBlockOrNil
+"set the select-conditionBlock; this block is evaluated before
+any selection change is performed (passing the to-be-changed row number
+index as arg).
+The change will not be done, if the block returns false.
+"
+selectConditionBlock := aOneArgBlockOrNil.
 !
 tabAtEndAction:aNoneArgAction
 "set the action, called without any argument at end of the list entering
 tab next.
 ) ifFalse:[
 super buttonPress:button x:x y:y.
 ^ self
 ].
+(self isRowSelectable:rowNr) ifFalse:[^ self ].
 sensor ctrlDown ifTrue:[
 self buttonControlPressAtRowNr:rowNr.
 ^ self
 ].
 (aKey == #CursorUp
 or:[aKey == #CursorDown
 or:[rawKey == #Home
 or:[rawKey == #End]
 ]]) ifTrue:[
-(hasSelectables or:[selectRowOnDefault]) ifTrue:[
+(hasSelectables or:[selectRowOnDefault]) ifTrue:[ |step start|
 minSelRowNr := self minIndexSelected.
 maxSelRowNr := self maxIndexSelected.
 selColNr := hasSelectables ifFalse:[0]
 ifTrue:[selectedColIndex].
 aKey == #CursorUp ifTrue:[
 selRowNr := minSelRowNr > 1 ifTrue:[minSelRowNr - 1] ifFalse:[listSize].
+step := -1.
 ] ifFalse:[
 aKey == #CursorDown ifTrue:[
 selRowNr := maxSelRowNr < listSize ifTrue:[maxSelRowNr + 1] ifFalse:[1].
+step := 1.
 ] ifFalse:[
 aKey == #BeginOfLine ifTrue:[
 selRowNr := 1.
+step := 1.
 ] ifFalse:[
 selRowNr := listSize.
+step := -1.
 ]
 ]
 ].
+start := selRowNr.
+[ self isRowSelectable:selRowNr ] whileFalse:[
+selRowNr := selRowNr + step.
+selRowNr == 0 ifTrue:[
+selRowNr := listSize.
+] ifFalse:[
+selRowNr > listSize ifTrue:[
+selRowNr := 1.
+].
+].
+selRowNr == start ifTrue:[^ self ].
+].
 ((aKey == #CursorUp) or:[aKey == #CursorDown]) ifTrue:[
 (multipleSelectOk and:[self sensor shiftDown]) ifTrue:[
 self addRowToSelection:selRowNr.
 aKey == #CursorDown ifTrue:[
 selRowNr == 0 ifTrue:[selRowNr := listSize].
 selColNr == 0 ifTrue:[selColNr := maxColNr + 1].
 [true] whileTrue:[
 (selColNr := selColNr - 1) == 0 ifTrue:[
-(selRowNr := selRowNr - 1) == 0 ifTrue:[
+[   selRowNr := selRowNr - 1.
+selRowNr == 0 ifTrue:[
+isTab ifTrue:[
+tabAtStartAction notNil ifTrue:[
+tabAtStartAction value
+] ifFalse:[
+self deselect.
+self windowGroup focusPreviousFrom:self
+]
+].
+^ self
+].
+(self isRowSelectable:selRowNr)
+] whileFalse.
+selColNr := maxColNr
+].
+column := self columnAt:selColNr.
+(column rendererType ~~ #rowSelector and:[column canSelect:selRowNr]) ifTrue:[
+^ self selectColIndex:selColNr rowIndex:selRowNr.
+]
+]
+].
+selRowNr := firstSelRowNr.
+selRowNr == 0 ifTrue:[selRowNr := 1].
+[true] whileTrue:[
+(selColNr := selColNr + 1) > maxColNr ifTrue:[
+[   selRowNr := selRowNr + 1.
+selRowNr > listSize ifTrue:[
 isTab ifTrue:[
-tabAtStartAction notNil ifTrue:[
+tabAtEndAction notNil ifTrue:[
-tabAtStartAction value
+tabAtEndAction value
 ] ifFalse:[
 self deselect.
-self windowGroup focusPreviousFrom:self
+self windowGroup focusNextFrom:self
 ]
 ].
 ^ self
 ].
-selColNr := maxColNr
+(self isRowSelectable:selRowNr)
-].
+] whileFalse.
-column := self columnAt:selColNr.
-(column rendererType ~~ #rowSelector and:[column canSelect:selRowNr]) ifTrue:[
-^ self selectColIndex:selColNr rowIndex:selRowNr.
-]
-]
-].
-selRowNr := firstSelRowNr.
-selRowNr == 0 ifTrue:[selRowNr := 1].
-[true] whileTrue:[
-(selColNr := selColNr + 1) > maxColNr ifTrue:[
-(selRowNr := selRowNr + 1) > listSize ifTrue:[
-isTab ifTrue:[
-tabAtEndAction notNil ifTrue:[
-tabAtEndAction value
-] ifFalse:[
-self deselect.
-self windowGroup focusNextFrom:self
-]
-].
-^ self
-].
 selColNr := 1
 ].
 column := self columnAt:selColNr.
 (column rendererType ~~ #rowSelector and:[column canSelect:selRowNr]) ifTrue:[
 isEnabled
 ^ enableChannel value ~~ false
 !
+isRowSelectable:aRowNumber
+"returne true if a row number is selectable
+"
+(aRowNumber notNil and:[aRowNumber ~~ 0]) ifTrue:[
+selectConditionBlock isNil ifTrue:[^ true].
+^ (selectConditionBlock value:aRowNumber)
+].
+^ false
+!
 numberOfColumns
 "returns number of columns
 "
 ^ columnDescriptors size
 "add a row to the selection
 if a column is selected, the column will be closed
 "
 |newSelection|
+(self isRowSelectable:aRowNr) ifFalse:[
+^ self
+].
 self numberOfSelections == 0 ifTrue:[
 self selectColIndex:0 rowIndex:aRowNr.
 ^ self
 ].
 (self isInSelection:aRowNr) ifTrue:[^ self].
 !
 selectAllRows
 "select all
 "
-selectedRowIndex isNil ifTrue:[selectedRowIndex := OrderedCollection new].
+multipleSelectOk ifFalse:[^ self].
-1 to:list size do:[:eachRowNr |
-selectedRowIndex add:eachRowNr.
+selectedRowIndex := (1 to:list size) select:[:idx| self isRowSelectable:idx ].
-self invalidateRowAt:eachRowNr.
-].
 self selectionChanged.
+self invalidate.
 !
 selectColIndex:aColNr rowIndex:aRowNr
 "change selection with notification
 "
 ^ self
 ].
 step := (start <= stop) ifTrue:1 ifFalse:-1.
-newSelection := (start to:stop by:step) asOrderedCollection.
+newSelection := (start to:stop by:step) select:[:idx| self isRowSelectable: idx ].
 selectedColIndex ~~ 0 ifTrue:[
 self selectColIndex:0 rowIndex:newSelection.
 ^ self
 ].
 (list size == 0 or:[newSel isNil or:[newSel == 0]]) ifTrue:[
 ^ multipleSelectOk ifFalse:[0] ifTrue:[nil]
 ].
-newSel isNumber ifTrue:[
-^ multipleSelectOk ifFalse:[newSel] ifTrue:[OrderedCollection with:newSel]
-].
 multipleSelectOk ifFalse:[
-newSel := self identityIndexOfRow:aSelection
+newSel isNumber ifFalse:[
-] ifTrue:[
+newSel := self identityIndexOfRow:aSelection.
-newSel := nil.
+].
+^ (self isRowSelectable:newSel) ifTrue:[newSel] ifFalse:[0].
-aSelection size ~~ 0 ifTrue:[
+].
-aSelection first isNumber ifTrue:[
-newSel := aSelection
+"multiple selection
-] ifFalse:[
+"
-newSel := aSelection
+aSelection size ~~ 0 ifTrue:[
-collect:[:el | self identityIndexOfRow:el ]
+aSelection first isNumber ifTrue:[
-thenSelect:[:idx | idx ~~ 0].
+newSel := aSelection select:[:idx| self isRowSelectable:idx ].
-newSel isEmpty ifTrue:[ newSel := nil ].
+] ifFalse:[
-]
+newSel := aSelection
-]
+collect:[:el| self identityIndexOfRow:el ]
-].
+thenSelect:[:idx| self isRowSelectable:idx ].
-^ newSel
+].
+newSel notEmpty ifTrue:[
+^ newSel
+].
+] ifFalse:[
+(newSel isNumber and:[self isRowSelectable:newSel]) ifTrue:[
+^ Array with:newSel
+].
+].
+^ nil
 ! !
 !DSVColumnView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.177 2003-12-17 12:30:08 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.178 2004-02-17 13:10:51 ca Exp $'
 ! !

changeset 2636	103067a67ff9
parent 2593	24ddc48c5ad4
child 2637	d563163414b8