hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:f7df2a53d042
+:cd5699643975
 hereby transferred.
 "
 ApplicationModel subclass:#UIPainter
-	instanceVariableNames:'activeHelpTool layoutTool objectList selectionPanel tabSelection
+	instanceVariableNames:'activeHelpTool layoutTool specTool objectList selectionPanel
-		lastSlice specView fileName specClass specSelector specSuperclass
+		tabSelection specClass specSelector specSuperclass aspects'
-		aspects'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 preferenceFor:aSymbol
 ^ false
+! !
+!UIPainter class methodsFor:'help specs'!
+helpSpec
+"return a dictionary filled with helpKey -> helptext associations.
+These are used by the activeHelp tool."
+|dict|
+dict := super helpSpec.
+dict at:#maxChars put:'set the maximum number of
+characters that are allowed
+in the editfield.'.
+dict at:#id put:'enter the name of the field
+here. This ID can be used
+by the applicationModel
+to access components,
+using #componentAt:<key>'.
+^ dict
 ! !
 !UIPainter class methodsFor:'icons'!
 iconAlignB
 !UIPainter methodsFor:'actions'!
 accept
 |layout|
-tabSelection = layoutTool label ifTrue:[
+objectList removeDependent:self.
+self isLayoutToolSelected ifTrue:[
 (layout := layoutTool layout) notNil ifTrue:[
 layoutTool layoutType == #Extent ifTrue:[
 self painter setExtent:layout
 ] ifFalse:[
 self painter setLayout:layout
 ]
 ]
 ] ifFalse:[
-tabSelection = 'Help' ifTrue:[
+self isHelpToolSelected ifTrue:[
 activeHelpTool accept
 ].
-self painter updateFromSpec:(specView specEdited)
+self painter updateFromSpec:(specTool specEdited).
 ].
-self cancel
+self modifiedChannel value:false.
+objectList addDependent:self.
-"Modified: 17.6.1997 / 12:50:59 / cg"
 !
 cancel
 "cancel all changes and read back attributes from current view
 "
-specView specEdited:(self painter specForSelection).
+self modifiedChannel value ifTrue:[
-layoutTool update.
+specTool specEdited:(self painter specForSelection).
-self modifiedChannel value:false.
+layoutTool layoutView:(layoutTool layoutView).
+self modifiedChannel value:false.
+]
 !
 doubleClick
 objectList selectGroup
 ! !
 specClass isBehavior ifFalse:[
 cls := Smalltalk at:specClass asSymbol
 ] ifTrue:[
 cls := specClass
 ].
+(cls isSubclassOf:UISpecification) ifTrue:[
-(cls respondsTo:#helpSpec) ifTrue:[
+cls := self class
-activeHelpTool dictionary:(cls helpSpec).
+].
-]
+activeHelpTool dictionary:(cls helpSpec).
 ].
 ].
 ^ activeHelpTool
 "Modified: 17.6.1997 / 12:51:15 / cg"
 !
 noteBookView
 "automatically generated by UIPainter ..."
-|noteBook channel|
+|noteBook channel n1 n2|
 (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
-noteBook   := View origin:0.0 @0.0 corner:1.0@1.0.
+noteBook   := View new.
-layoutTool := UIPropertyView for:#Dimension     in:noteBook.
+layoutTool := UILayoutTool new.
-specView   := UIPropertyView for:#Specification in:noteBook.
+specTool   := UISpecificationTool new.
 channel    := self modifiedChannel.
 layoutTool masterApplication:self.
-specView   masterApplication:self.
+specTool   masterApplication:self.
+n1 := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+n2 := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+n1 client:layoutTool.
+specTool builder:(n2 client:specTool).
+layoutTool masterApplication:self.
+specTool   masterApplication:self.
 layoutTool modifiedHolder:channel.
-specView   modifiedHolder:channel.
+specTool   modifiedHolder:channel.
 builder aspectAt:#noteBookView put:noteBook.
 ].
 ^ noteBook
 !
 "automatically generated by UIPainter ..."
 |holder|
 (holder := builder bindingAt:#tabModel) isNil ifTrue:[
-lastSlice := 'Basics'.
 holder := AspectAdaptor new subject:self; forAspect:#tabSelection.
 builder aspectAt:#tabModel put:holder.
 ].
 ^ holder
 ! !
 (someObject == objectList and:[something ~~ #list]) ifTrue:[
 something ~~ #layout ifTrue:[
 self objectListChanged
 ] ifFalse:[
-(self modifiedChannel value) ifFalse:[
+self modifiedChannel value ifTrue:[
-layoutTool update
+^ self
-]
+].
-]
+layoutTool update
+].
+self modifiedChannel value:false
 ]
 ! !
 !UIPainter methodsFor:'event handling'!
 !
 objectListChanged
 "something changed in the painter view
 "
-|setSel view slices list spec props size same|
+|oldSelection view slices list spec props size|
 props := objectList selectedProperty.
+oldSelection := tabSelection.
 tabSelection := nil.
 props isNil ifFalse:[
 view := props view.
 spec := props spec copy.
-layoutTool forView == view ifFalse:[
+layoutTool layoutView == view ifFalse:[
 slices := spec class slices.
 size   := slices size + 1.
 list   := Array new:size.
 slices keysAndValuesDo:[:i :s|list at:i put:(s first asString)].
-list at:size put:(layoutTool label).
+list at:size put:(layoutTool class label).
 (self tabList) value:list.
 ] ifTrue:[
 list := self tabList value
 ].
-(list findFirst:[:aName| aName = lastSlice]) ~~ 0 ifTrue:[
+(list findFirst:[:n| n = oldSelection ]) ~~ 0 ifTrue:[
-setSel := lastSlice
+tabSelection := oldSelection
+] ifFalse:[
+tabSelection := list first
 ]
 ].
-layoutTool forView:view.
+layoutTool layoutView:view.
-specView specEdited:spec.
+specTool   specEdited:spec.
-self tabModel value:setSel.
-! !
+tabSelection notNil ifTrue:[
+self isLayoutToolSelected ifTrue:[
-!UIPainter methodsFor:'file access'!
+(self noteBookView subViews at:1) raise
+] ifFalse:[
-openFile:aFileName
+specTool selection:tabSelection.
-|aStream |
+(self noteBookView subViews at:2) raise
+]
-aStream := FileStream readonlyFileNamed:aFileName.
+].
-aStream notNil ifTrue:[
+(builder componentAt:#noteBook) selection:tabSelection.
-self painter fileInContentsFrom:aStream.
+self modifiedChannel value:false.
-aStream close.
-fileName := aFileName
-]
-!
-saveAs:aFileName
-|aStream|
-aStream := FileStream newFileNamed:aFileName.
-aStream notNil ifTrue:[
-self painter storeContentsOn:aStream.
-aStream close.
-fileName := aFileName
-].
 ! !
 !UIPainter methodsFor:'private'!
 painter
 ^ objectList painter
 ! !
+!UIPainter methodsFor:'queries'!
+isHelpToolSelected
+^ tabSelection = 'Help'
+!
+isLayoutToolSelected
+^ tabSelection = layoutTool class label
+! !
 !UIPainter methodsFor:'selection'!
 tabSelection
 ^ tabSelection
 !
 tabSelection:something
-|specEdited slices spec idx|
+|raiseViewIdx|
-something isNil ifTrue:[^ self].
+something notNil ifTrue:[
+raiseViewIdx := 1.
 tabSelection := something.
-(specEdited := specView specEdited) notNil ifTrue:[
+self isLayoutToolSelected ifFalse:[
-slices    := specEdited class slices.
+specTool selection:tabSelection.
-lastSlice := tabSelection.
+raiseViewIdx := 2
-idx:= slices findFirst:[:aSlice| aSlice first = tabSelection ].
-idx == 0 ifTrue:[
-layoutTool update.
-^ layoutTool raise.
 ].
-spec := specEdited class perform:((slices at:idx) last).
+(self noteBookView subViews at:raiseViewIdx) raise.
-].
+self cancel.
-specView raise.
-specEdited isNil ifTrue:[
-specView buildFromSpec:nil
-] ifFalse:[
-specView buildFromSpec:spec
 ]
 ! !
 !UIPainter methodsFor:'startup / release'!
 activeHelpTool isNil ifTrue:[
 ^ self information:'no help text defined'
 ].
 dict := activeHelpTool dictionary.
+(cls isSubclassOf:UISpecification) ifTrue:[
+cls := self class
+].
 src := '' writeStream.
 src nextPutAll:'helpSpec
 "return a dictionary filled with helpKey -> helptext associations.
 These are used by the activeHelp tool."
 self removeAll
 "Modified: 17.6.1997 / 12:33:31 / cg"
 !
-doOpen
-|box|
-box := FileSelectionBox new.
-box title:(resources string:'Which file ?').
-box selectingDirectory:false.
-box pattern:'*.*'.
-box action:[:aFile| self openFile:aFile ].
-box open
-!
 doPickAView
 |painter view className methodName cls sel accepted spec s|
 objectList painter isModified ifTrue:[
 (self confirm:'pick another interface without saving your modifications ?') ifFalse:[
 selectionPanel window raise
 ]
 !
-doSave
-fileName notNil ifTrue:[
-self saveAs:fileName
-] ifFalse:[
-self doSaveAs
-]
-!
-doSaveAs
-|box|
-box := FileSelectionBox new.
-box title:(resources string:'Which file ?').
-box selectingDirectory:false.
-box pattern:'*.*'.
-box action:[:aFile| self saveAs:aFile ].
-box open
-!
 doStartApplication
 |cls|
 (specClass isNil or:[specSelector isNil]) ifTrue:[
 ^ self information:'no class or selector defined'.

changeset 166	cd5699643975
parent 161	12a70f62f414
child 168	8a79add2260f