hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:238571e2a33b
+:ebb32d3a997e
 code readStream fileIn.
 ].
 UserPreferences current systemBrowserClass openInClass:cls selector:aspect
 !
+doBrowseAspectClass:aspectSelector
+"browse the class as entered in the field (can be called by buttons in a subspec)"
+self doBrowseAspectClassAndSelector:{ aspectSelector . nil }
+!
+doBrowseAspectClassAndSelector:classAndSelectorPair
+"browse the class as entered in the field (can be called by buttons in a subspec)"
+|spec classAspect selectorAspect className selector class |
+classAspect := classAndSelectorPair first.
+selectorAspect := classAndSelectorPair second.
+"/ wrong: the code below uses the spec's aspect values;
+"/ but the spec is only valid after accepting.
+"/    spec := painter specForSelection.
+"/    spec isNil ifTrue:[^ self].
+"/    className := spec perform:classAspect.
+"/
+"/    selectorAspect notNil ifTrue:[
+"/        selector := spec perform:selectorAspect.
+"/    ].
+"/ we have to take the current value from the widget's value,
+"/ which is in the listOfAspects!!
+className := (specTool aspectFor:classAspect) value.
+selector := (specTool aspectFor:selectorAspect) value.
+(className isEmptyOrNil or:[(selectorAspect notNil and:[selector isEmptyOrNil])]) ifTrue:[
+Dialog information:(resources
+string:'Class and/or selector missing (for "%1 / %2")'
+with:classAspect with:selectorAspect).
+^ self
+].
+class := Smalltalk classNamed:className.
+class isBehavior ifFalse:[
+Dialog information:(resources
+string:'"%1" does not refer to a valid class (in "%2")'
+with:className with:classAspect).
+^ self
+].
+UserPreferences current systemBrowserClass openInClass:class selector:selector
+!
 doBrowseAspectMethod:aspectSelector
 "browse or create the aspect method as entered in the field (button beside input fieled pressed)"
 self isModified ifTrue:[ self accept ].
 "/ self acceptOrIgnoreSectionModification.
 "Created: / 16-01-2008 / 17:49:20 / cg"
 ! !
 !UIPainter::TreeView class methodsFor:'documentation'!
-documentation
+erarchy"
-"
-selection in tree view; only used by the UIPainter
+treeView doStepOver:-1
+! !
-[see also:]
-SelectionInTreeView
+!UIPainter::TreeView methodsFor:'accessing'!
-SelectionInTree
-TreeItem
+ditToolbar
+self editToolBarVisibleHolder value:false
+!
+BarVisibleHolder value:false
+!
+Spec newSpec|
+(aSpecOrWidgetClass isSubclassOf:UISpecification) ifTrue:[
+newSpecClass := aSpecOrWidgetClass.
+] ifFalse:[
+(aSpecOrWidgetClass isSubclassOf:View) ifTrue:[
+newSpecClass := aSpecOrWidgetClass basicNew specClass.
+] ifFalse:[
+newSpecClass := nil
+].
+].
+newSpecClass isNil ifTrue:[
+Dialog warn:'Invalid Spec- or View-Class: ' , aSpecOrWidgetClass name.
+^ self.
+].
+treeView isCanvasSelected ifTrue:[
+^ self
+].
+oldSpec := self selectedSpec.
+newSpec := newSpecClass cloneFrom:oldSpec.
+self painter replaceSelectionBy:newSpec.
+"Modified: / 05-09-2012 / 19:24:40 / cg"
+!
+og warn:'Invalid Spec- or View-Class: ' , aSpecOrWidgetClass name.
+^ self.
+].
+treeView isCanvasSelected ifTrue:[
+^ self
+].
+oldSpec := self selectedSpec.
+newSpec := newSpecClass cloneFrom:oldSpec.
+self painter replaceSelectionBy:newSpec.
+"Modified: / 05-09-2012 / 19:24:40 / cg"
+!
+TreeItem
 UIPainter
 [author:]
 Claus Atzkern
 "
-! !
+!
-!UIPainter::TreeView methodsFor:'accessing'!
+ew)"
-canvas
-"returns the canvas (UIPainterView)"
-^ model root contents view
-!
-canvas:aCanvas
-"install canvas (UIPainterView)"
 self canvas:aCanvas specName:nil
 !
-canvas:aCanvas specName:nameOfSpec
+props := UIPainterView::ViewProperty new.
-"install canvas (UIPainterView)"
-|props|
-props := UIPainterView::ViewProperty new.
 props view:aCanvas.
 model root:(TreeItem
 name:(nameOfSpec ? painter defaultNameOfCanvas) asBoldText
 contents:props).
 model root expand.
 self enableChannel:(aCanvas enableChannel).
 !
-canvasSpec
+model root expand.
+self enableChannel:(aCanvas enableChannel).
+!
+pec
 "returns spec assigned to canvas"
 |spec list cls canvas|
 spec := self windowSpecClass new.
 thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
 ].
 ^ spec
 !
-canvasSpec:aSpec
+igned to canvas"
-"update canvas from spec"
+|spec list cls canvas|
-|spec|
+spec := self windowSpecClass new.
-self setAttributesFromWindowSpec:aSpec.
+canvas := self canvas.
-spec := aSpec copy.
-spec  menu:nil.
+spec fromView:(canvas topView) callBack:nil.
-spec flags:nil.
+windowSpec notNil ifTrue:[
-spec setAttributesIn:(self canvas "topView") with:(UIBuilder new isEditing:true).
+spec copyValuesFromSpec:windowSpec.
-!
+].
-exportedAspects
+spec exportedAspects isNil ifTrue:[
-"returns spec assigned to canvas"
+(     (cls  := canvas className) notNil
+and:[(cls  := canvas resolveName:cls) notNil]
-windowSpec isNil ifTrue:[^ #()].
+) ifTrue:[
-^ windowSpec exportedAspects ? #()
+list := cls perform:#aspectSelectors ifNotUnderstood:nil.
+].
-!
+spec setExportedAspectsFrom:list.
+windowSpec notNil ifTrue:[
-itemOfView:aView
+windowSpec exportedAspects:(spec exportedAspects).
-"returns item assigned to view or nil"
+]
+].
-aView notNil ifTrue:[
+self propertiesDo:[:aProp|
+|propsSpec|
+spec exportedAspectsAddKey:(aProp model) type:nil.
+propsSpec := aProp spec.
+propsSpec aspectSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
+propsSpec actionSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+!
+spec := self windowSpecClass new.
+canvas := self canvas.
+spec fromView:(canvas topView) callBack:nil.
+windowSpec notNil ifTrue:[
+spec copyValuesFromSpec:windowSpec.
+].
+spec exportedAspects isNil ifTrue:[
+(     (cls  := canvas className) notNil
+and:[(cls  := canvas resolveName:cls) notNil]
+) ifTrue:[
+list := cls perform:#aspectSelectors ifNotUnderstood:nil.
+].
+spec setExportedAspectsFrom:list.
+windowSpec notNil ifTrue:[
+windowSpec exportedAspects:(spec exportedAspects).
+]
+].
+self propertiesDo:[:aProp|
+|propsSpec|
+spec exportedAspectsAddKey:(aProp model) type:nil.
+propsSpec := aProp spec.
+propsSpec aspectSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
+propsSpec actionSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+!
+l.
+windowSpec notNil ifTrue:[
+spec copyValuesFromSpec:windowSpec.
+].
+spec exportedAspects isNil ifTrue:[
+(     (cls  := canvas className) notNil
+and:[(cls  := canvas resolveName:cls) notNil]
+) ifTrue:[
+list := cls perform:#aspectSelectors ifNotUnderstood:nil.
+].
+spec setExportedAspectsFrom:list.
+windowSpec notNil ifTrue:[
+windowSpec exportedAspects:(spec exportedAspects).
+]
+].
+self propertiesDo:[:aProp|
+|propsSpec|
+spec exportedAspectsAddKey:(aProp model) type:nil.
+propsSpec := aProp spec.
+propsSpec aspectSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
+propsSpec actionSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+! !
+!UIPainter::TreeView methodsFor:'accessing-property'!
+as className) notNil
+and:[(cls  := canvas resolveName:cls) notNil]
+) ifTrue:[
+list := cls perform:#aspectSelectors ifNotUnderstood:nil.
+].
+spec setExportedAspectsFrom:list.
+windowSpec notNil ifTrue:[
+windowSpec exportedAspects:(spec exportedAspects).
+]
+].
+self propertiesDo:[:aProp|
+|propsSpec|
+spec exportedAspectsAddKey:(aProp model) type:nil.
+propsSpec := aProp spec.
+propsSpec aspectSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
+propsSpec actionSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+!
+stood:nil.
+].
+spec setExportedAspectsFrom:list.
+windowSpec notNil ifTrue:[
+windowSpec exportedAspects:(spec exportedAspects).
+]
+].
+self propertiesDo:[:aProp|
+|propsSpec|
+spec exportedAspectsAddKey:(aProp model) type:nil.
+propsSpec := aProp spec.
+propsSpec aspectSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
+propsSpec actionSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+!
+esDo:[:aProp|
+|propsSpec|
+spec exportedAspectsAddKey:(aProp model) type:nil.
+propsSpec := aProp spec.
+propsSpec aspectSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
+propsSpec actionSelectors
+select:[:a | a isString or:[a isSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+! !
+!UIPainter::TreeView methodsFor:'adding & removing'!
+sSymbol]]
+thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
+].
+^ spec
+!
+spec
+!
+aView notNil ifTrue:[
 self allItemsDo:[:anItem|
 (anItem contents view == aView) ifTrue:[^ anItem]
 ]
 ].
 ^ nil
 !
-lastDrawnMaster
+ass
-"returns the lastDrawnMaster"
-^ lastDrawnMaster
-!
-painter
-^ painter
-!
-painter:something
-painter := something.
-!
-windowSpecClass
-"returns the default  windowSpecClass (WindowSpec)"
-^ windowSpecClass ? WindowSpec
-!
-windowSpecClass:aClass
 "set the default windowSpecClass"
 ^ windowSpecClass := aClass
 ! !
-!UIPainter::TreeView methodsFor:'accessing-property'!
+!UIPainter::TreeView methodsFor:'building'!
-propertiesDo:aOneArgBlock
+yDetect:aOneArgBlock
-"evaluates the argument a block on each property"
-self allItemsDo:[:anItem| aOneArgBlock value:(anItem contents)]
-!
-propertyDetect:aOneArgBlock
 "evaluates the block on each property"
 self allItemsDo:[:anItem|
 (aOneArgBlock value:(anItem contents)) ifTrue:[^ anItem contents]
 ].
 ^ nil
 !
-propertySelected
+y beforeIndex:anIndex
-"returns current selected property or nil in case of multi selection
-or empty selection "
-|idx|
-selection size == 1 ifTrue:[
-(idx := selection first) ~~ 1 ifTrue:[          "canvas: not yet supported"
-^ (listOfNodes at:idx) contents
-]
-].
-^ nil
-! !
-!UIPainter::TreeView methodsFor:'adding & removing'!
-addProperty:aProperty
-"adds a new item"
-^ self addProperty:aProperty beforeIndex:nil.
-!
-addProperty:aProperty beforeIndex:anIndex
 "adds a new item"
 |parent treeItem index|
 parent := self detectItemCorespondingToView:(aProperty view superView).
 (anIndex notNil and:[anIndex > 0]) ifTrue:[
 index := anIndex min:index.
 ].
 model add:treeItem beforeIndex:index below:parent.
 ^ treeItem
-!
+! !
-removeAll
+!UIPainter::TreeView methodsFor:'canvas selection'!
-"removes all items other than canvas"
+copy do:[:aView|
-lastDrawnMaster := nil.
-windowSpec := nil.
-self canvas components copy do:[:aView|
 aView destroy
 ].
 self canvas subViews copy do:[:aView|
 "/ care to not destroy the transparent input view
 (aView isInputOnly) ifFalse:[aView destroy]
 ].
 model root name: painter defaultNameOfCanvas asBoldText.
 model removeAllOtherThanRoot.
 !
-removeView:aView
+orComponents:aSpecArray named:specNameSymbol
-"removes a view"
-|item prnt|
-((item := self itemOfView:aView) notNil and:[(prnt := item parent) notNil]) ifTrue:[
-aView destroy.
-prnt contents view sizeChanged:nil.
-model remove:item
-]
-! !
-!UIPainter::TreeView methodsFor:'building'!
-generateFullSpecForComponents:aSpecArray named:specNameSymbol
 "generates a full spec from aSpecArray"
 |fullSpec winSpec|
 fullSpec := FullSpec new.
 ].
 winSpec name: winSpec label.
 ^ fullSpec.
 !
-setAttributesFromWindowSpec:aWindowSpec
+wSpec (which should not)
-"sets a window spec from aWindowSpec and applies some attributes
+self canvas gridShown ifTrue:[
-to the canvas."
+fullSpec window backgroundColor:nil.
+].
-|name canvasView builder|
+] ifFalse:[
+winSpec copyValuesFromSpec:windowSpec.
+].
+winSpec name: winSpec label.
+^ fullSpec.
+!
+|name canvasView builder|
 windowSpec := (self windowSpecClass) new copyValuesFromSpec:aWindowSpec.
 canvasView := self canvas.
 builder := UIBuilder new isEditing:true.
 canvasView topView name:name.
 self canvasNameChanged:name.
 self application treeSelectionChanged.
 ! !
-!UIPainter::TreeView methodsFor:'canvas selection'!
+!UIPainter::TreeView methodsFor:'change & update'!
-canvasSelection:aSelection
+:= aWindowSpec label.
-"canvas changed its selection
+canvasView topView name:name.
-"
+self canvasNameChanged:name.
-|sel list size|
+self application treeSelectionChanged.
+!
-((sel := aSelection) isNil or:[sel isCollection]) ifFalse:[
-sel := Array with:sel
+True:[
-].
-(size := sel size) ~~ 0 ifTrue:[
 list := OrderedCollection new:size.
 sel do:[:aView|
 |item|
 sel := list collect:[:anItem| self indexOfNode:anItem ].
 ].
 self canvasEventsDisabledDo:[ self selection:sel ].
 !
-canvasSelectionAdd:aView
+]
-"canvas adds a view to current selection
+].
-"
+sel := list collect:[:anItem| self indexOfNode:anItem ].
-|item index oldSel|
+].
+self canvasEventsDisabledDo:[ self selection:sel ].
-item := self itemOfView:aView.
+! !
-item notNil ifTrue:[
+!UIPainter::TreeView methodsFor:'drag & drop'!
-model doMakeVisible:item.
+election
-(index := self indexOfNode:item) ~~ 0 ifTrue:[
-oldSel := selection copy.
-self addToSelection:index.
-self selectionChangedFrom:oldSel
-]
-]
-!
-canvasSelectionRemove:aView
-"canvas removes a view from current selection
-"
-|item index oldSel|
-(     (item := self itemOfView:aView) notNil
-and:[(index := self indexOfNode:item) ~~ 0
-and:[self isInSelection:index]]
-) ifTrue:[
-oldSel := selection copy.
-self removeFromSelection:index.
-self selectionChangedFrom:oldSel.
-].
-!
-selectedViews
-^ self selection
 collect:[:index |
 |node view|
 node := listOfNodes at:index.
 view := node contents view.
 view
 ]
-! !
+!
-!UIPainter::TreeView methodsFor:'change & update'!
+view
+]
-canvasNameChanged:aName
+!
-"called if identification name assigned to window (canvas) changed
-"
+fNodes at:1.
-|name node|
-node := listOfNodes at:1.
 (    aName size ~~ 0
 and:[(name := aName string withoutSeparators) size ~~ 0
 and:[(self propertyDetect:[:p| p name = name]) isNil
 and:[node name ~= name]]]
 node name: name asBoldText.
 node changed.
 ].
 !
-layoutChanged
+]]
-"layout of any component changed; in case of single selection, the
+) ifTrue:[
-application will be informed to update its layout
+node name: name asBoldText.
+node changed.
+].
+!
+d to update its layout
 "
 selection size == 1 ifTrue:[
 self application layoutChanged
 ]
 !
-propertyChanged:aProperty
+perty changed
-"property of view derived from argument a property changed
 "
 |item idx end|
 item := self itemOfView:(aProperty view).
 self application propertyChanged
 ]
 ].
+!
+ame = aProperty name ifFalse:[
+idx := self firstLineShown.
+(end := self lastLineShown) > listOfNodes size ifTrue:[
+end := listOfNodes size
+].
+item changed.
+[idx <= end] whileTrue:[
+(listOfNodes at:idx) == item ifTrue:[
+self redrawLine:idx.                "/ is visible; redraw line
+end := 0
+] ifFalse:[
+idx := idx + 1
+]
+]
+].
+self selectedNode == item ifTrue:[              "/ inform application
+self application propertyChanged
+]
+].
+!
+].
+item changed.
+[idx <= end] whileTrue:[
+(listOfNodes at:idx) == item ifTrue:[
+self redrawLine:idx.                "/ is visible; redraw line
+end := 0
+] ifFalse:[
+idx := idx + 1
+]
+]
+].
+self selectedNode == item ifTrue:[              "/ inform application
+self application propertyChanged
+]
+].
 ! !
-!UIPainter::TreeView methodsFor:'drag & drop'!
+!UIPainter::TreeView methodsFor:'enumerating'!
-canDrop:aDropContext
+end := 0
-"can drop ? -> delegate to canvas"
+] ifFalse:[
+idx := idx + 1
-^ self canvas canDrop:aDropContext
+]
+]
-"Modified: / 13-10-2006 / 16:08:43 / cg"
+].
-!
+self selectedNode == item ifTrue:[              "/ inform application
-canDrop:aDropContext at:aPoint
+self application propertyChanged
+]
+].
+! !
+!UIPainter::TreeView methodsFor:'event handling'!
+rm application
+self application propertyChanged
+]
+].
+!
+ntext at:aPoint
 "can drop ? -> delegate to canvas"
 ^ self canvas canDrop:aDropContext at:aPoint
 "Created: / 13-10-2006 / 12:35:53 / cg"
 "Modified: / 13-10-2006 / 16:08:46 / cg"
 !
-canDropObjects:aCollectionOfDropObjects
+/ cg"
-"can drop ? -> delegate to canvas"
+"Modified: / 13-10-2006 / 16:08:46 / cg"
+! !
-^ self canvas canDropObjects:aCollectionOfDropObjects
+!UIPainter::TreeView methodsFor:'initialization'!
-"Created: / 13-10-2006 / 16:08:31 / cg"
-!
+cg"
-canDropObjects:aCollectionOfDropObjects at:aPoint
-"can drop ? -> delegate to canvas"
-^ self canvas canDropObjects:aCollectionOfDropObjects at:aPoint
-"Created: / 13-10-2006 / 16:08:35 / cg"
-!
-drop:aDropContext
-"drop objects -> delegate to canvas"
-self canvas drop:aDropContext
-"Created: / 13-10-2006 / 12:35:59 / cg"
 "Modified: / 13-10-2006 / 16:09:04 / cg"
 !
-drop:aDropContext at:aPoint
+"Modified: / 13-10-2006 / 16:09:07 / cg"
-"drop objects -> delegate to canvas"
+!
-self canvas drop:aDropContext at:nil
+: / 13-10-2006 / 16:08:56 / cg"
-"Modified: / 13-10-2006 / 16:09:07 / cg"
-!
-dropObjects:aCollectionOfDropObjects
-"drop objects -> delegate to canvas"
-self canvas dropObjects:aCollectionOfDropObjects
-"Created: / 13-10-2006 / 16:08:51 / cg"
-!
-dropObjects:aCollectionOfDropObjects at:aPoint
-"drop objects -> delegate to canvas"
-self canvas dropObjects:aCollectionOfDropObjects at:nil
-"Created: / 13-10-2006 / 16:08:56 / cg"
 ! !
-!UIPainter::TreeView methodsFor:'enumerating'!
+!UIPainter::TreeView methodsFor:'private'!
-allItemsDo:aOneArgBlock
+ock
-"evaluates the argument a block on each item other than the canvas"
-model root allChildrenDo:aOneArgBlock
+!
+Clicked
+]
 ! !
-!UIPainter::TreeView methodsFor:'event handling'!
+!UIPainter::TreeView methodsFor:'queries'!
-canvasEventsDisabledDo:aBlock
+[
-"evaluates the block without raising selection changed notifications to canvas"
-|restoreCanvasEvents|
-restoreCanvasEvents  := canvasEventsDisabled.
-canvasEventsDisabled := true.
-aBlock value.
-canvasEventsDisabled := restoreCanvasEvents.
-!
-doubleClicked
-"disables collapsing of the root item"
-self selectedNode == model root ifFalse:[
-super doubleClicked
-]
-!
-redrawLabelAt:x y:yTop index:anIndex
-"draws a tiny rectangle for indicating the master node (first selected node)"
-|dX|
-super redrawLabelAt:x y:yTop index:anIndex.
-((selection size > 1) and: [selection first == anIndex]) ifTrue:[
-dX := textInset - 1.
-self paint:(Color red). "/ self application painter handleMasterColor.
-self fillRectangleX:(x - dX - 2)
-y:yTop + ((fontHeight - dX) // 2)
-width:dX
-height:dX
-]
-! !
-!UIPainter::TreeView methodsFor:'initialization'!
-iconForNode:aNode
-|spec|
-spec := aNode contents spec.
-spec isNil ifTrue: [
-^ WindowSpec icon
-] ifFalse:[
-^ spec icon
-]
-!
-initialize
-"initialize the tree view; multiple select and tree item actions"
-super initialize.
-self multipleSelectOk:true.
-canvasEventsDisabled := false.
-self showDirectoryIndicator: true.
-self showDirectoryIndicatorForRoot: false.
-self model
-iconAction:[:aNode| self iconForNode:aNode];
-labelAction: [:aNode | self labelForNode:aNode].
-!
-labelForNode:aNode
-|spec|
-spec := aNode contents spec.
-spec notNil ifTrue: [
-^ self nameForSpecInList:spec
-] ifFalse:[
 ^ aNode name
 ]
-! !
+!
-!UIPainter::TreeView methodsFor:'private'!
+aspect := aSpec nameOfMainAspect.
-nameForSpecInList:aSpec
-"returns the tree item label for aSpec"
-|aspect aspectPrefix nameString viewClassString|
-nameString := aSpec name ? ''.
-viewClassString := '[',aSpec viewClass name,']' .
-aspect := aSpec nameOfMainAspect.
 aspect notNil ifTrue:[
 aspectPrefix := '(',aspect allBold ,') '
 ] ifFalse:[
 aspectPrefix := ''.
 ].
 ^ aspectPrefix, nameString, ': ', viewClassString
 "Modified: / 17-08-2011 / 09:10:31 / cg"
 !
-selectionChangedFrom:oldSelection
+m:oldSelection
 "selection has changed. update master selection and raise notification
 to canvas in case of enabled cvs events
 "
 |sel size|
 ]
 ]
 ifFalse: [
 lastDrawnMaster := nil
 ]
-! !
+!
-!UIPainter::TreeView methodsFor:'queries'!
+].
+size = 1 ifTrue:[
-canChangeOrderInContainer
+oldSelection size > 1 ifTrue: [
-"returns true if any selection exists and all widgets in the selection
+(listOfNodes at:lastDrawnMaster) retrieveLabel.
-can change their layout through to a move or align operation"
+self redrawLine: lastDrawnMaster.
+lastDrawnMaster := selection first
+]
+].
+size > 1 ifTrue:[
+selection first ~~ lastDrawnMaster ifTrue: [
+(listOfNodes at:selection first) retrieveLabel.
+lastDrawnMaster notNil ifTrue: [(listOfNodes at:lastDrawnMaster) retrieveLabel].
+self redrawLine: lastDrawnMaster.
+self redrawLine: (lastDrawnMaster := selection first)
+]
+]
+ifFalse: [
+lastDrawnMaster := nil
+]
+!
+er := selection first)
+]
+]
+ifFalse: [
+lastDrawnMaster := nil
+]
+!
+on"
 ^(selection size == 1)  and:
 [(selection at: 1) ~~ 1 and:
 [self selectedNode parent children size > 1]]
 !
-canExchangeSelectionLayouts
+AlignSelection
-"returns true if the selections size is exactly 2
-and all widgets in the selection
-can change their layout through to a move or align operation"
-selection size == 2 ifFalse:[
-^ false
-].
-^ self canMoveOrAlignSelection
-!
-canMoveOrAlignSelection
 "returns true if any selection exists and all widgets in the selection
 can change their layout through to a move or align operation"
 selection isEmptyOrNil ifTrue:[
 ^ false
 ]
 ].
 ^ true
 !
-canMoveSelectionIntoContainer
+tyOrNil ifTrue:[
+^ false
+].
+selection do:[:i|
+|node view|
+i == 1 ifTrue:[
+"/ the tree node for the canvas itself.
+^ false
+].
+node := listOfNodes at:i.
+view := node contents view.
+(self canvas canChangeLayoutOfView:view) ifFalse:[
+^ false
+]
+].
+^ true
+!
+^ false
+].
+node := listOfNodes at:i.
+view := node contents view.
+(self canvas canChangeLayoutOfView:view) ifFalse:[
+^ false
+]
+].
+^ true
+! !
+!UIPainter::TreeView methodsFor:'searching'!
+ectionIntoContainer
 "returns true in case that one widget is selected and can change its container
 widget to an element below"
 |item oldParentItem newParentItem idx|
 ] startingAt:idx ifNone:nil.
 ^ newParentItem notNil.
 ].
 ^ false
-!
+! !
-canMoveSelectionOutOfContainer
+!UIPainter::TreeView methodsFor:'user interaction'!
-"returns true in case that one widget is selected which is contained within
+] startingAt:idx ifNone:nil.
+^ newParentItem notNil.
+].
+^ false
+!
+rue in case that one widget is selected which is contained within
 another widget"
 |item prnt|
 (     (item := self selectedNode) isNil
 ^ false
 ].
 ^ true
 !
-canResizeSelectedWidget
+within a widget which allows to resize sub components"
-"returns true in case of one widget selected and is contained
-within a widget which allows to resize sub components"
 |selectedNode|
 (selectedNode := self selectedNode) notNil ifTrue:[
 (selectedNode := selectedNode parent) notNil ifTrue:[
 ]
 ].
 ^ false
 !
-canResizeSelection
+ctionChangeAllowed
-"returns true if all selected widgets can be resized"
-selection isEmptyOrNil ifTrue:[ ^ false ].
-^ self canvas canResize:(self selectedViews)
-!
-hasOneSelectionOtherThanCanvas
-"returns true in case that one selection exists other than the canvas"
-^ selection size == 1 and:[selection first ~~ 1]
-!
-isCanvasSelected
-"returns true in case of a single selection and the
-selection is the canvas (index 1)"
-^ selection size == 1 and:[self isInSelection:1]
-! !
-!UIPainter::TreeView methodsFor:'searching'!
-detectItemCorespondingToView:aView
-"detects the item coresponding to the view. The item of the view or the first
-subview providing the item is returned. If no property is detected nil is
-returned"
-|view item|
-(view := aView) isNil ifTrue:[ ^ nil ].
-[(item := self itemOfView:view) isNil] whileTrue:[
-(view := view superView) isNil ifTrue:[^ listOfNodes at:1]
-].
-^ item
-! !
-!UIPainter::TreeView methodsFor:'user interaction'!
-askForSelectionChangeAllowed
 selectConditionBlock notNil ifTrue:[
 ^ selectConditionBlock value:nil
 ].
 ^ true
 !
-doChangeParentOfSelectedItemTo:newParentItem
+kForSelectionChangeAllowed ifFalse:[^ self].
-|canvas|
-newParentItem isNil ifTrue:[
-^ self
-].
-self askForSelectionChangeAllowed ifFalse:[^ self].
-self setSelection:nil.
-canvas := self canvas.
-canvas deleteSelection.
-canvas setSelection:(newParentItem contents view) withRedraw:false.
-canvas pasteWithLayout.
-!
-doSortItems
-"sort items by their top-left position"
-|selectedItems parent sortedItems newChildren itemList parentView|
-self askForSelectionChangeAllowed ifFalse:[^ self].
 selectedItems := self selectedNodes.
 selectedItems size <= 1 ifTrue:[^ self].
 parent := selectedItems first parent.
 (parent isNil or:[(selectedItems conform:[:e| e parent == parent]) not]) ifTrue:[^ self].
 self canvas showSelection.
 self selectNodes:itemList asOrderedCollection.
 !
-doStepIn
+sNil or:[(selectedItems conform:[:e| e parent == parent]) not]) ifTrue:[^ self].
-"move the currently selected widget into the next available container below"
+sortedItems := selectedItems sort:[:a :b|
-|item oldParentItem newParentItem idx|
+a contents view origin isLeftOrAbove:(b contents view origin)].
+itemList := selectedItems asIdentitySet.
-item := self selectedNode.
-(item notNil and:[(oldParentItem := item parent) notNil]) ifTrue:[
+newChildren := parent children collect:[:eachChild|
-idx := (oldParentItem indexOfChild:item) + 1.
+(itemList includes:eachChild) ifTrue:[
-newParentItem := oldParentItem children
+sortedItems removeFirst.
-detect:[:eachChild | eachChild contents spec class supportsSubComponents]
+] ifFalse:[
-startingAt:idx
+eachChild.
-ifNone:nil.
-newParentItem notNil ifTrue:[
-self doChangeParentOfSelectedItemTo:newParentItem
 ].
-]
+].
-!
-doStepOut
-|item|
-item := self selectedNode.
-(item notNil and:[(item := item parent) notNil]) ifTrue:[
-self doChangeParentOfSelectedItemTo:(item parent)
-].
-!
-doStepOver:anIndex
-"moves child 'anIndex' forward or backward in list of children"
-|item idx size parentItem parentItemsView itemsView canvas|
-self askForSelectionChangeAllowed ifFalse:[^ self].
-(    (item := self selectedNode) isNil
-or:[(parentItem := item parent) isNil
-or:[(size := parentItem children size) < 2
-or:[(idx  := parentItem indexOfChild:item) == 0]]]
-) ifTrue:[
-^ self
-].
-idx := idx + anIndex.
-idx < 1 ifTrue:[idx := size]
-ifFalse:[idx > size ifTrue:[idx := 1]].
 self setSelection:nil.
-model remove:item.
+model remove:parent children.
-model add:item beforeIndex:idx below:parentItem.
+model add:newChildren beforeIndex:1 below:parent.
-idx := parentItem indexOfChild:item.
+parentView := parent contents view.
-itemsView := item contents view.
-parentItemsView := parentItem contents view.
+self canvas hideSelection.
+newChildren keysAndValuesDo:[:idx :eachItem|
-canvas := self canvas.
+parentView changeSequenceOrderFor:eachItem contents view to:idx.
-canvas hideSelection.
+].
+parentView specClass isLayoutContainer ifFalse:[
-itemsView isView ifFalse:[
+parentView components notEmptyOrNil ifTrue:[ self halt ].
-"/ a component - has its own collection (and therefore indexing) - sigh
+parentView subViews do:[:v| v raise ].
-idx := idx - ((1 to:idx-1) count:[:i | (parentItem children at:i) contents view isView]).
+].
-parentItemsView changeSequenceOrderFor:itemsView to:idx.
+self canvas showSelection.
-] ifTrue:[
-"/ a view - has its own collection (and therefore indexing) - sigh
+self selectNodes:itemList asOrderedCollection.
-idx := idx - ((1 to:idx-1) count:[:i | (parentItem children at:i) contents view isView not]).
-parentItemsView changeSequenceOrderFor:itemsView to:idx.
-].
-parentItemsView specClass isLayoutContainer ifFalse:[
-"/ spVw components notEmptyOrNil ifTrue:[ self halt ].
-parentItemsView subViews do:[:v| v raise ].
-].
-canvas showSelection.
-self selectNode:item.
 ! !
 !UIPainter class methodsFor:'documentation'!
 version

changeset 3051	ebb32d3a997e
parent 3032	41f4128c029c
child 3053	db8d30e7a621