hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:7f58dd5fc836
+:fb4359c9bdc4
 		aspectSelectorHolder aspectChannel nameChannel fgChannel
 		bgChannel applyAction leftFractionHolder leftOffsetHolder
 		rightFractionHolder rightOffsetHolder topFractionHolder
 		topOffsetHolder bottomFractionHolder bottomOffsetHolder specClass
 		specSelector leftAlignmentFractionHolder
-		topAlignmentFractionHolder propertyShown specShown'
+		topAlignmentFractionHolder classNameHolder methodNameHolder
+		aspectHolders propertyShown specShown'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 #(#WindowSpec
 #'label:' 'unnamed'
 #'bounds:' #(#Rectangle 0 0 255 292)
 )
 )
+!
+nameAndSelectorSpec
+"this window spec was automatically generated by the ST/X UIPainter"
+"do not manually edit this - the painter/builder may not be able to
+handle the specification if its corrupted."
+"UIPainter new openOnClass:NewApplication andSelector:#windowSpec"
+"NewApplication new openInterface:#windowSpec"
+"NewApplication open"
+<resource: #canvas>
+^
+#(#FullSpec
+#'window:'
+#(#WindowSpec
+#'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#'label:' 'unnamed'
+#'bounds:' #(#Rectangle 0 0 300 300)
+)
+#'component:'
+#(#SpecCollection
+#'collection:'
+#(
+#(#LabelSpec
+#'name:' 'label1'
+#'layout:' #(#LayoutFrame 10 0 50 0 110 0 70 0)
+#'label:' 'class:'
+#'adjust:' #right
+)
+#(#LabelSpec
+#'name:' 'label2'
+#'layout:' #(#LayoutFrame 10 0 90 0 110 0 110 0)
+#'label:' 'superclass:'
+#'adjust:' #right
+)
+#(#LabelSpec
+#'name:' 'label3'
+#'layout:' #(#LayoutFrame 10 0 130 0 110 0 150 0)
+#'label:' 'selector:'
+#'adjust:' #right
+)
+#(#InputFieldSpec
+#'name:' 'classNameField'
+#'layout:' #(#LayoutFrame 120 0 50 0 289 0 69 0)
+#'model:' #classNameChannel
+#'immediateAccept:' false
+#'acceptOnLeave:' true
+#'acceptOnReturn:' true
+#'acceptOnTab:' true
+)
+#(#InputFieldSpec
+#'name:' 'superclassNameField'
+#'layout:' #(#LayoutFrame 120 0 90 0 289 0 109 0)
+#'model:' #superclassNameChannel
+#'immediateAccept:' false
+#'acceptOnLeave:' true
+#'acceptOnReturn:' true
+#'acceptOnTab:' true
+)
+#(#InputFieldSpec
+#'name:' 'methodNameField'
+#'layout:' #(#LayoutFrame 120 0 130 0 289 0 149 0)
+#'model:' #methodNameChannel
+#'immediateAccept:' false
+#'acceptOnLeave:' true
+#'acceptOnReturn:' true
+#'acceptOnTab:' true
+)
+#(#ActionButtonSpec
+#'name:' 'button1'
+#'layout:' #(#LayoutFrame 30 0 250 0 129 0 279 0)
+#'label:' 'cancel'
+#'model:' #cancelClicked
+)
+#(#ActionButtonSpec
+#'name:' 'button2'
+#'layout:' #(#LayoutFrame 160 0 250 0 259 0 279 0)
+#'label:' 'ok'
+#'model:' #okClicked
+)
+)
+)
+)
 ! !
 !UIPainter methodsFor:'BuilderView interface'!
 setUndoLabel:aString
 ].
 ! !
 !UIPainter methodsFor:'aspects'!
-aspectChannel
+aspectFor:aKey
-^ aspectChannel
+^ aspectHolders at:aKey ifAbsent:[super aspectFor:aKey]
-"Modified: 6.9.1995 / 01:00:30 / claus"
 !
 backgroundChannel
 ^ bgChannel
 !
 !
 bottomOffsetChannel
 ^ bottomOffsetHolder
-!
-changeChannel
-^ changeChannel
-"Modified: 6.9.1995 / 01:00:33 / claus"
 !
 foregroundChannel
 ^ fgChannel
 !
 "Modified: 5.9.1995 / 23:52:57 / claus"
 !
 initChannels
+aspectHolders := IdentityDictionary new.
+aspectHolders at:#classNameChannel put:((specClass notNil ifTrue:[specClass name] ifFalse:['NewApplication']) asValue).
+aspectHolders at:#superclassNameChannel put:((specClass notNil ifTrue:[specClass superclass] ifFalse:[ApplicationModel]) name asValue).
+aspectHolders at:#methodNameChannel put:(specSelector asValue).
+aspectHolders at:#aspectChannel put:(ValueHolder new).
+aspectHolders at:#changeChannel put:(ValueHolder new).
+aspectHolders at:#foregroundChannel put:(ValueHolder new).
+aspectHolders at:#backgroundChannel put:(ValueHolder new).
 bottomFractionHolder        := nil asValue.
 bottomOffsetHolder          := nil asValue.
 leftFractionHolder          := nil asValue.
 leftOffsetHolder            := nil asValue.
 rightOffsetHolder           := nil asValue.
 topFractionHolder           := nil asValue.
 topOffsetHolder             := nil asValue.
 leftAlignmentFractionHolder := nil asValue.
 topAlignmentFractionHolder  := nil asValue.
-fgChannel := nil asValue.
-bgChannel := nil asValue.
-aspectChannel := nil asValue.
-changeChannel := nil asValue.
 !
 initPullDownMenu
 menu labels:(resources  array:#(
 )
 receiver:workView.
 menu at:#code
 putLabels:(resources  array:#(
-'class'
+'class & method'
-'method'
-"/                        'variables'
 ) )
 selectors:#(
-changeClass
+defineClassAndSelector
-changeMethod
-"/                        changeVariables
 )
 receiver:self.
 menu at:#debugging
 putLabels:(resources array:#(
 |specArray|
 specClass := aClass.
 specSelector :=  aSelector.
 self openInterface.
 workView className:aClass name.
 workView methodName:aSelector.
 workView setupFromSpec:(aClass perform:aSelector).
 !
 !
 fetchModelAspectsFrom:aView
-aspectChannel value:(workView aspectSelectorForView:aView).
+(self aspectFor:#aspectChannel) value:(workView aspectSelectorForView:aView).
-changeChannel value:(workView changeSelectorForView:aView).
+(self aspectFor:#changeChannel) value:(workView changeSelectorForView:aView).
 ! !
 !UIPainter methodsFor:'setup choices'!
 ! !
 !UIPainter methodsFor:'user interaction'!
 closeRequest
-workView  notNil ifTrue:[workView  release].
+workView  notNil ifTrue:[workView  release. workView := nil].
-fileBox   notNil ifTrue:[fileBox   destroy].
-stringBox notNil ifTrue:[stringBox destroy].
-actionBox notNil ifTrue:[actionBox destroy].
-listBox   notNil ifTrue:[listBox   destroy].
 super closeRequest
 !
 doCompile
 |code|
 setModelAspects
 "sent when apply is pressen in the model-sub view"
 |aspectSymbol|
-aspectSymbol := aspectChannel value.
+aspectSymbol := (self aspectFor:#aspectChannel) value.
 (aspectSymbol notNil and:[aspectSymbol notEmpty]) ifTrue:[
 aspectSymbol := aspectSymbol asSymbol.
 workView singleSelectionDo:[:selectedView |
 selectedView ~~ workView ifTrue:[
 workView setAspectSelector:aspectSymbol forView:selectedView
 m labelAt:#toggleTest put:(resources string:'test on')
 ].
 workView testMode:t
 ! !
+!UIPainter methodsFor:'user interaction - dialogs'!
+defineClassAndSelector
+"launch a dialog to define class, superclass and method"
+|dialog|
+self openDialogInterface:#nameAndSelectorSpec.
+! !
 !UIPainter class methodsFor:'documentation'!
 version
 ^ '$Header$'
 ! !

changeset 50	fb4359c9bdc4
parent 46	8301d6b9e67c
child 54	d0b5a33e6df0