hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:bafed0c2436d
+:b200d2d9bf5e
 !
 openEditMenu
 "opens a Menu Editor on current widget"
-|cls selectorOrMenu editor selectedSpec|
+|cls selectorOrMenu editor selectedSpec spec|
 (cls := self resolveName:specClass) isNil ifTrue:[
 self askForSaving ifFalse: [^self]
 ].
 cls notNil ifTrue:[
-(selectorOrMenu := self specTool specification menuSelector) notNil ifTrue:[
+spec := self specTool specification.
+(selectorOrMenu := spec menuSelector) notNil ifTrue:[
 selectorOrMenu := selectorOrMenu asSymbol
 ] ifFalse:[
 "/ cg: q&d hack ...
 (selectedSpec := treeView propertySelected) notNil ifTrue:[
 ifFalse: [editor openModalOnMenu:selectorOrMenu].
 self helpTool updateList.
 editor specSelector ~= selectorOrMenu ifTrue:[
 editor hasSaved ifTrue:[
-self specTool specification menuSelector:editor specSelector.
+spec menuSelector:editor specSelector.
 self modifiedChannel value:true.
 self accept
 ]
 ].
 ]
-"Modified: 31.7.1997 / 14:26:13 / cg"
+"Modified: / 16.7.1998 / 18:16:42 / cg"
 !
 openHierarchicalListEditor
 "opens a Hierarchical List Editor on current widget"
-|selector editor|
+|selector editor spec|
 (self resolveName:specClass) isNil ifTrue:[
 self askForSaving ifFalse: [^self]
 ].
-(selector := self specTool specification hierarchicalList) notNil ifTrue:[
+spec := self specTool specification.
+(selector := spec hierarchicalList) notNil ifTrue:[
 selector := selector asSymbol
 ].
 editor := HierarchicalListEditor new.
 editor masterApplication:self.
 editor openModalOnClass:specClass andSelector:selector.
 editor specSelector ~= selector ifTrue:[
 editor hasSaved ifTrue:[
-self specTool specification hierarchicalList:editor specSelector.
+spec hierarchicalList:editor specSelector.
 self modifiedChannel value:true.
 self accept
 ]
 ]
+"Modified: / 16.7.1998 / 18:15:46 / cg"
 !
 openSubSpecGUIPainter
 "opens a GUI Painter on the current subspecification"
 !
 openTabListEditor
 "opens a Tab List Editor on current widget"
-|selector editor|
+|selector editor spec|
 (self resolveName:specClass) isNil ifTrue:[
 self askForSaving ifFalse: [^self]
 ].
-(selector := self specTool specification listSelector) isArray
+spec := self specTool specification.
+(selector := spec listSelector) isArray
 ifTrue: [^self warn: 'Cannot open the Tab List Editor on an array!!'].
 editor := TabListEditor new.
 editor masterApplication:self.
 editor openModalOnClass:specClass andSelector:selector.
 editor specSelector ~= selector ifTrue:[
 editor hasSaved ifTrue:[
-self specTool specification listSelector:editor specSelector.
+spec listSelector:editor specSelector.
 self modifiedChannel value:true.
 self accept.
 ]
 ]
+"Modified: / 16.7.1998 / 18:15:14 / cg"
 ! !
 !UIPainter methodsFor:'change & update'!
 layoutChanged
 !
 update:something with:aParameter from:someObject
 "catches change notifications"
+|window|
 someObject == treeView model ifTrue:[
 (something == #selection
 or:[something == #selectionIndex]) ifTrue:[self treeSelection].
 ^ self
 ].
-self galleryShown == someObject ifTrue:[
+someObject == self galleryShown ifTrue:[
-(self galleryShown value) ifTrue:[
+"/ galleryShown toggle changed
-self raiseUIView:(selectionPanel window)
+window := selectionPanel window.
+(someObject value) ifTrue:[
+self raiseUIView:window
 ] ifFalse:[
-self hideUIView:(selectionPanel window)
+self hideUIView:window
 ].
 ^ self
 ].
-self painterShown == someObject ifTrue:[
+someObject == self painterShown ifTrue:[
-(self painterShown value) ifTrue:[
+"/ canvasShown toggle changed
-self raiseUIView:(self painter topView)
+window := self painter topView.
+(someObject value) ifTrue:[
+self raiseUIView:window
 ] ifFalse:[
-self hideUIView:(self painter topView)
+self hideUIView:window
 ].
 ^ self
 ].
-"Modified: / 29.10.1997 / 17:48:19 / cg"
+"Modified: / 16.7.1998 / 19:09:57 / cg"
 !
 updateChannels
 "updates the channels"
-|canCutOrCopy canPaste clipboard sel|
+|canCutOrCopy canPaste clipboard sel treeSelection|
 self canMoveOrAlignSelection        value:(treeView canMoveOrAlignSelection).
 self canChangeOrderInContainer      value:(treeView canChangeOrderInContainer).
 self canMoveSelectionIntoContainer  value:(treeView canMoveSelectionIntoContainer).
 self canMoveSelectionOutOfContainer value:(treeView canMoveSelectionOutOfContainer).
 self hasOneSelectionOtherThanCanvas value:(treeView hasOneSelectionOtherThanCanvas).
 treeView notNil
 ifTrue:
 [
-canCutOrCopy := treeView selection size >= 1 and:[treeView selection first ~~ 1].
+treeSelection := treeView selection.
+"/ the top-node cannot be cut, copied or pasted.
+canCutOrCopy := treeSelection size >= 1 and:[treeSelection first ~~ 1].
 clipboard := self getSelection.
 clipboard isCollection ifTrue:[clipboard notEmpty ifTrue:[sel := clipboard first]]
 ifFalse:[sel := clipboard].
 canPaste := (sel isKindOf:UISpecification) and:
-[treeView selection size  = 1
+[treeSelection size  = 1
-and:[treeView selection first == 1
+and:[treeSelection first == 1
 or: [self canPasteInto: treeView selectedNode contents view]]]
 ].
 self valueOfCanCut value: canCutOrCopy.
 self valueOfCanCopy value: canCutOrCopy.
 self valueOfCanPaste value: canPaste.
 self valueOfCanPasteWithKeepingLayout value: (canPaste "&  self canKeepLayoutInSelection").
+"Modified: / 16.7.1998 / 19:13:30 / cg"
 ! !
 !UIPainter methodsFor:'event handling'!
 doesNotUnderstand:aMessage
 !
 doDefineClassAndSelector
 "launches a dialog for defining class, superclass, and selector of the application"
-|again tmp helpDict helpKey|
+|again tmp helpDict helpKey helpTool|
 [
 again := false.
 (tmp := specClass) isNil ifTrue:[tmp := 'NewApplication'].
 ] doWhile:[again].
 specClass := specClass isBehavior ifTrue:[specClass name]
 ifFalse:[specClass].
-helpDict := self helpTool dictionary.
+helpTool := self helpTool.
-helpKey  := self helpTool helpKey.
+helpDict := helpTool dictionary.
-self helpTool buildFromClass:specClass.
+helpKey  := helpTool helpKey.
-self helpTool dictionary declareAllFrom: helpDict.
+helpTool buildFromClass:specClass.
-self helpTool updateList.
+helpTool dictionary declareAllFrom: helpDict.
-self helpTool helpKey: helpKey.
+helpTool updateList.
+helpTool helpKey: helpKey.
 self modifiedChannel value: false.
-self helpTool modified: true.
+helpTool modified: true.
 self updateInfoLabel
+"Modified: / 16.7.1998 / 18:26:33 / cg"
 !
 doDefineGrid
 "opens a dialog for the grid parameters"

changeset 892	b200d2d9bf5e
parent 890	dac91d5af289
child 913	12e73e6c57b4