hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:04e802a6a920
+:cfbbec0a33c6
 !
 documentation
 "
-GUI-Builder:
+The GUI Painter allows the user to build its own applications providing a graphical
-this class allows the user to build its own applications providing a graphical
+user interface to building components and to define the behavior of the components
-user interface to buildin components and to define the behavior of the components
 during runtime. The resulting specifications can be installed as methods on
 classes, typically subclasses of an ApplicationModel. These specifications
 are used by the UIBuilder to generate the application window and its component
 structues when open the application.
 'Sets the width of the selected widgets to the width of the last copied layout/extent.'
 #editInspectSpec
 'Opens an inspector on the spec of the selected widget.'
+#editInspectView
+'Opens an inspector on the view of the selected widget.'
 #editOpenSpecDocumentation
 'Opens the documentation of the selected widget.'
 #fileBrowseAspectMethods
 'Opens a System Browser to browse the aspect methods.'
 #generateAspectMethods
 'Generates aspect methods for defined aspect selectors of the widgets.'
 #generateHookMethods
 'Generates startup/release methods. (#closeRequest, #postBuildWith:, #postOpenWith:)'
+#helpExamples
+'Opens a HTML-Browser on the documentation file with some examples of the GUI Painter.'
+#helpFunctions
+'Opens a HTML-Browser on the documentation file with the functions of the GUI Painter.'
+#helpLayoutTool
+'Opens a HTML-Browser on the documentation file of the Layout Tool.'
+#helpSelectedWidget
+'Opens a HTML-Browser on the documentation file of the selected widget.'
 #moveWidgetDown
 'Moves the selected widget one step down.'
 #moveWidgetInto
 )
 #(#CheckBoxSpec
 #name: 'AlignCheckBox'
 #layout: #(#Point 23 52)
 #model: #alignToGrid
-#label: 'Align to Grid'
+#label: 'Align To Grid'
 )
 #(#LabelSpec
 #name: 'HorizontalPixelsLabel'
 #layout: #(#AlignmentOrigin 148 0 99 0 1 0.5)
 #label: 'Horizontal Pixels:'
 #(#FullSpec
 #window:
 #(#WindowSpec
 #name: 'GUI Painter'
-#layout: #(#LayoutFrame 50 0 310 0 579 0 796 0)
+#layout: #(#LayoutFrame 123 0 269 0 662 0 743 0)
 #label: 'GUI Painter'
-#min: #(#Point 10 10)
+#min: #(#Point 540 490)
 #max: #(#Point 1160 870)
-#bounds: #(#Rectangle 50 310 580 797)
+#bounds: #(#Rectangle 123 269 663 744)
 #menu: #menu
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #verticalLayout: #fit
 #horizontalSpace: 0
 #verticalSpace: 0
 )
 #(#ActionButtonSpec
-#name: 'openSpecDocumentationButton'
+#name: 'openWidgetDocumentationButton'
 #layout: #(#LayoutFrame -32 1 -1 0 0 1 31 0)
 #activeHelpKey: #editOpenSpecDocumentation
 #hasCharacterOrientedLabel: false
 #label: 'helpIcon'
-#model: #openSpecDocumentation
+#model: #openWidgetDocumentation
 )
 #(#ActionButtonSpec
 #name: 'cancelButton'
 #layout: #(#LayoutFrame 2 0 -26 1 -1 0.5 -2 1)
-#activeHelpKey: #cancel
+#activeHelpKey: #commitCancel
 #label: 'Cancel'
 #tabable: true
 #model: #cancel
 #enableChannel: #modifiedChannel
 )
 #(#ActionButtonSpec
 #name: 'acceptButton'
 #layout: #(#LayoutFrame 1 0.5 -26 1 -2 1 -2 1)
-#activeHelpKey: #accept
+#activeHelpKey: #commitOK
 #label: 'OK'
 #tabable: true
 #model: #accept
 #enableChannel: #modifiedChannel
 )
 windowSpecWithTranscriptHelp
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
-"Do not manually edit this. If it is corrupted,
+"Do not manually edit this!! If it is corrupted,
 the UIPainter may not be able to read the specification."
 "
 UIPainter new openOnClass:UIPainter andSelector:#windowSpecWithTranscriptHelp
 UIPainter new openInterface:#windowSpecWithTranscriptHelp
 #(#FullSpec
 #window:
 #(#WindowSpec
 #name: 'GUI Painter'
-#layout: #(#LayoutFrame 575 0 296 0 1127 0 833 0)
+#layout: #(#LayoutFrame 177 0 249 0 716 0 723 0)
 #label: 'GUI Painter'
 #min: #(#Point 10 10)
 #max: #(#Point 1160 870)
-#bounds: #(#Rectangle 575 296 1128 834)
+#bounds: #(#Rectangle 177 249 717 724)
 #menu: #menu
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #activeHelpKey: #cancel
 #label: 'Cancel'
 #tabable: true
 #model: #cancel
 #enableChannel: #modifiedChannel
-#extent: #(#Point 183 24)
+#extent: #(#Point 178 24)
 )
 #(#ActionButtonSpec
 #name: 'acceptButton'
 #activeHelpKey: #accept
 #label: 'OK'
 #tabable: true
 #model: #accept
 #enableChannel: #modifiedChannel
-#extent: #(#Point 183 24)
+#extent: #(#Point 179 24)
 )
 )
 )
 #horizontalLayout: #fitSpace
 #verticalLayout: #fitSpace
 #value: #doSaveAs
 #activeHelpKey: #fileSaveAs
 )
 #(#MenuItem
 #label: 'Define Class And Selector...'
-#value: #defineClassAndSelector
+#value: #doDefineClassAndSelector
 #activeHelpKey: #fileSaveAs
 )
 #(#MenuItem
 #label: '-'
 )
 )
 #(#MenuItem
 #label: 'Undo Manager...'
 #value: #openUndoMenu
 #activeHelpKey: #settingsUndoManager
+#enabled: #hasUndoHistory
 )
 #(#MenuItem
 #label: 'Grid Manager...'
-#value: #gridMenu
+#value: #doDefineGrid
 #activeHelpKey: #settingsGridManager
 )
 ) nil
 nil
 )
 #(#Menu
 #(
 #(#MenuItem
 #label: 'Tutorial'
-#translateLabel: true
 #value: #openHTMLDocument:
 #activeHelpKey: #helpTutorial
 #argument: 'tools/uipainter/TOP.html'
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 #label: 'Functions'
-#translateLabel: true
 #value: #openHTMLDocument:
-#activeHelpKey: #helpTutorial
+#activeHelpKey: #helpFunctions
 #argument: 'tools/uipainter/Functions.html'
 )
 #(#MenuItem
 #label: 'Examples'
-#translateLabel: true
 #value: #openHTMLDocument:
-#activeHelpKey: #helpTutorial
+#activeHelpKey: #helpExamples
 #argument: 'tools/uipainter/Examples.html'
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
+#label: 'Help Tool'
+#value: #openHTMLDocument:
+#activeHelpKey: #helpHelpTool
+#argument: 'tools/uipainter/HelpTool.html'
+)
+#(#MenuItem
+#label: 'Layout Tool'
+#value: #openHTMLDocument:
+#activeHelpKey: #helpLayoutTool
+#argument: 'tools/uipainter/Layout.html'
+)
+#(#MenuItem
+#label: '-'
+)
+#(#MenuItem
+#label: 'Selected Widget'
+#value: #openWidgetDocumentation
+#activeHelpKey: #helpSelectedWidget
+#enabled: #hasOneSelectionOtherThanCanvas
+)
+#(#MenuItem
+#label: '-'
+)
+#(#MenuItem
 #label: 'Show Help Texts'
-#translateLabel: true
 #activeHelpKey: #helpShowHelp
 #indication: #showHelp:
 )
 ) nil
 nil
 menuEdit
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
-"Do not manually edit this. If it is corrupted,
+"Do not manually edit this!! If it is corrupted,
 the MenuEditor may not be able to read the specification."
 "
 MenuEditor new openOnClass:UIPainter andSelector:#menuEdit
 (Menu new fromLiteralArrayEncoding:(UIPainter menuEdit)) startUp
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 #label: 'Move'
+#enabled: #canMoveSelection
 #submenuChannel: #menuMove
 )
 #(#MenuItem
 #label: 'Dimension'
 #enabled: #hasSelection
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
-#label: 'Open Spec Documentation'
+#label: 'Open Widget Documentation'
-#value: #openSpecDocumentation
+#value: #openWidgetDocumentation
 #activeHelpKey: #editOpenSpecDocumentation
+)
+#(#MenuItem
+#label: '-'
+)
+#(#MenuItem
+#label: 'Inspect View'
+#value: #inspectView
+#activeHelpKey: #editInspectView
+#enabled: #hasOneSelectionOtherThanCanvas
 )
 #(#MenuItem
 #label: 'Inspect Spec'
 #value: #inspectSpec
 #activeHelpKey: #editInspectSpec
 menuMove
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
-"Do not manually edit this. If it is corrupted,
+"Do not manually edit this!! If it is corrupted,
 the MenuEditor may not be able to read the specification."
 "
 MenuEditor new openOnClass:UIPainter andSelector:#menuMove
 (Menu new fromLiteralArrayEncoding:(UIPainter menuMove)) startUp
 #(
 #(#MenuItem
 #label: 'Up'
 #value: #doStepUp
 #activeHelpKey: #moveWidgetUp
-#enabled: #canMoveOrAlignSelection
+#enabled: #canChangeOrderInContainer
 #labelImage: #(#ResourceRetriever #ToolApplicationModel #upIcon 'Up')
 )
 #(#MenuItem
 #label: 'Down'
 #value: #doStepDown
 #activeHelpKey: #moveWidgetDown
-#enabled: #canMoveOrAlignSelection
+#enabled: #canChangeOrderInContainer
 #labelImage: #(#ResourceRetriever #ToolApplicationModel #downIcon 'Down')
 )
 #(#MenuItem
 #label: 'Into'
 #value: #doStepIn
 !
 transcriptHelp
-"get whether the help transcript is turned on/off
+"answer whether the help transcript is turned on/off
 "
-^self class settings at: #transcriptHelp
+^self class settings at: #TranscriptHelp
-ifAbsent: [self class settings at: #transcriptHelp put: false]
+ifAbsent: [self class settings at: #TranscriptHelp put: false]
 !
 transcriptHelp:aBoolean
 "turn on/off the help transcript
 "
-self class settings at: #transcriptHelp put: aBoolean
+self class settings at: #TranscriptHelp put: aBoolean
 ! !
 !UIPainter methodsFor:'actions'!
 self isModified ifTrue:[
 (spec := self painter specForSelection) notNil ifTrue:[
 key := spec activeHelpKey.
 ].
 self helpTool helpKey:key.
+treeView isCanvasSelected ifTrue: [
+spec := treeView canvasSpec.
+].
 self specTool specification:spec.
 view := self layoutTool layoutView.
 self setViewInLayoutTool:view.
 spec class == DataSetSpec ifTrue:[
 inspectSpec
 "inspect the selected specification"
 |spec|
-(spec := self painter specForSelection) isNil ifTrue:[
+(spec := self specForSelection) isNil ifTrue:[
 treeView isCanvasSelected ifTrue:[
 spec := treeView canvasSpec.
 ]
 ].
 spec notNil ifTrue:[
 spec inspect
 ]
-"Created: / 10.3.1998 / 18:11:42 / stefan"
-"Modified: / 10.3.1998 / 18:19:55 / stefan"
+!
+inspectView
+"inspect the view of the selected specification"
+|selection view|
+((selection := self painter selection) isCollection and: [selection size >= 1]) ifTrue:[
+selection first inspect
+] ifFalse: [
+selection inspect
+]
 !
 moveSelectionDown
 "move selected components down
 "
 "
 self painter moveSelectionUp
 !
-openSpecDocumentation
+openWidgetDocumentation
-"open documentation for the selected specification"
+"open documentation for the selected widget"
-|spec|
+|spec document|
-(spec := self painter specForSelection) isNil ifTrue:[
+(spec := self specForSelection) isNil ifTrue:[
 treeView isCanvasSelected ifTrue:[
-spec := treeView canvasSpec.
+spec := nil
 ]
 ].
 spec notNil ifTrue:[
-HTMLDocumentView openFullOnDocumentationFile: 'tools/uipainter/', spec userFriendlyName,'.html'
+document := 'tools/uipainter/Widgets/', spec userFriendlyName,'.html'
-]
+] ifFalse: [
+document := 'tools/uipainter/TOP.html#THEWIDGETSANDHOWDOTHEYWORK'
+].
+HTMLDocumentView openFullOnDocumentationFile: document
 ! !
 !UIPainter methodsFor:'aspects'!
 aspectFor:aKey
 "returns a boolean value holder which is true in case that any selection exists
 and all widgets in the selection can change its layout through to a move or
 align operation
 "
 ^ builder booleanValueAspectFor:#canMoveOrAlignSelection
+!
+canMoveSelection
+^self canChangeOrderInContainer value |
+self canMoveSelectionOutOfContainer value |
+self canMoveSelectionOutOfContainer value
 !
 canMoveSelectionIntoContainer
 "returns a boolean value holder which is true in case that one component is selected
 and can change its container widget to the next element in the list which will have
 (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
 noteBook   := View new.
 layoutTool := UILayoutTool new.
 helpTool   := UIHelpTool   new.
-helpTool helpSpecFrom:specClass.
+helpTool buildFromClass:specClass.
 specTool   := UISpecificationTool new.
 channel    := self modifiedChannel.
 layoutTool masterApplication:self.
 specTool   masterApplication:self.
 "returns a value holder which keeps a list of labels assigned to the tabs
 "
 |holder|
 (holder := builder bindingAt:#tabList) isNil ifTrue:[
-builder aspectAt:#tabList put:(holder :=  ValueHolder new).
+builder aspectAt:#tabList put:(holder :=  #(Basics Details Layout) asValue).
-holder value:#( 'Properties' ).
 ].
 ^ holder
 !
 tabModel
 self painter resetModification
 ].
 ^true
 !
-defineClassAndSelector
-"launch a dialog to define class, superclass and method"
-|again tmp|
-[
-again := false.
-(tmp := specClass) isNil ifTrue:[tmp := 'NewApplication'].
-aspects at:#classNameChannel put:tmp asValue.
-(tmp := specSelector) isNil ifTrue:[tmp := 'windowSpec'].
-aspects at:#methodNameChannel put:tmp asValue.
-(tmp := specSuperclass) isNil ifTrue:[tmp := 'ApplicationModel'].
-aspects at:#superclassNameChannel put:tmp asValue.
-(self openDialogInterface:#dialogSpecForDefiningClassAndSelector) ifTrue:[
-specClass    := (self aspectFor:#classNameChannel) value.
-specSelector := (self aspectFor:#methodNameChannel) value.
-specSelector notNil ifTrue:[specSelector := specSelector asSymbol].
-specSuperclass := (self aspectFor:#superclassNameChannel) value.
-(again := self checkClassAndSelector not) ifFalse:[
-self painter className:specClass
-superclassName:specSuperclass
-selector:specSelector.
-]
-]
-ifFalse:
-[
-^nil
-]
-] doWhile:[again].
-self specClass:specClass.
-self helpTool modified: true
-!
-gridMenu
-"open a dialog for grip parameters configuration
-"
-|hspace vspace bindings painter gridPara|
-painter  := self painter.
-bindings := IdentityDictionary new.
-gridPara := painter gridParameters copy.
-bindings at:#showGrid    put:(painter gridShown asValue).
-bindings at:#alignToGrid put:(painter gridAlign asValue).
-bindings at:#hspace      put:((gridPara at:1) asValue).
-bindings at:#vspace      put:((gridPara at:2) asValue).
-(self openDialogInterface:#dialogSpecForDefiningGridParameters withBindings:bindings) ifFalse:[
-^ self
-].
-hspace := (bindings at:#hspace) value ? 5.
-vspace := (bindings at:#vspace) value ? 5.
-gridPara at:1 put:hspace.
-gridPara at:2 put:vspace.
-gridPara at:5 put:hspace.
-gridPara at:6 put:vspace.
-painter gridShown:false.
-painter gridAlign:false.
-painter gridParameters:gridPara.
-painter gridAlign:(bindings at:#alignToGrid) value.
-painter gridShown:(bindings at:#showGrid) value.
-painter clear.
-painter clear.
-!
 hideUIView:aView
 "hide the view which is an application or top view
 "
 aView beIndependent.
 aView unmap.
 msg := aString asCollectionOfWords.
 (msg size == 2 and:
 [(cls := self resolveName:(msg at:1)) notNil])
 ifTrue:
 [
-specClass := cls name.
+self specClass:cls.
 specSuperclass := cls superclass name.
 specSelector := (msg at: 2) asSymbol.
 ^true
 ]
 ].
 specClass:aClass
 specClass := aClass isBehavior ifTrue:[aClass name]
 ifFalse:[aClass].
-self helpTool helpSpecFrom:specClass.
+self helpTool buildFromClass:specClass.
-"Modified: / 5.2.1998 / 09:42:57 / stefan"
+self helpTool updateList.
+self modifiedChannel value: false.
 ! !
 !UIPainter methodsFor:'private tools'!
 helpTool
 self helpTool helpKey:(spec activeHelpKey).
 slices := spec class slices.
 size   := slices size.
 view notNil ifTrue:[
-list := Array new:(size + 2).
+self treeView isCanvasSelected
-list at:(size + 2) put:(UILayoutTool label).
+ifFalse:
+[
+list := Array new:(size + 2).
+list at:(size + 2) put:(UILayoutTool label).
+]
+ifTrue:
+[
+list := Array new:(size + 1).
+list at:(size + 1) put:(UILayoutTool label).
+].
 ] ifFalse:[
 list := Array new:(size + 1).
 ].
 1 to:size do:[:i| list at:i put:((slices at:i) first asString)].
-list at:(size + 1) put:(UIHelpTool   label).
+self treeView isCanvasSelected ifFalse: [list at:(size + 1) put:(UIHelpTool label)].
 self tabList value:list.
 self show:(spec class name).
 tabComponent enabled:true.
 clipboard := self getSelection.
 clipboard isCollection ifTrue:[clipboard notEmpty ifTrue:[sel := clipboard first]]
 ifFalse:[sel := clipboard].
 canPaste := (sel isKindOf:UISpecification) and:
 [treeView selection size  = 1
 and:[treeView selection 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).
 ! !
 readStream := aMessage readStream.
 (aClass := Smalltalk at: (readStream upTo: $ ) asSymbol) notNil
 ifTrue:
 [
 aSelector :=  readStream upToEnd asSymbol.
 self setClass: aClass selector: aSelector.
 (aClass respondsTo:aSelector)
 ifTrue:
 [
 self painter setupFromSpec:(aClass perform:aSelector).
 treeView selection: #(1).
 topView := self window.
 topView label:'GUI Painter'.
 painterView openInGroup:(topView windowGroup).
-painterView application:self.
 painterView open.
+painterView application:self.
 painterView application:self.
 selectionPanel := UISelectionPanel new.
 selectionPanel allButOpenInterface:#windowSpec.
 selectionPanel window openInGroup:(topView windowGroup).
 selectionPanel window bePartner.
 selectionPanel window iconLabel:'GUI Painter'.
 selectionPanel window icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
-ActiveHelp startFor:self.
 !
 openOnClass:aClass
 "open up an interface builder
 "
 "Modified: / 5.2.1998 / 09:48:15 / stefan"
 !
 postOpenWith: aBuilder
+|painter settings gridPara hspace vspace|
 super postOpenWith: aBuilder.
 treeView selection: (Array with: 1).
 self treeSelection.
-self tabSelection: 'Basics'
+painter  := self painter.
+settings := self class settings.
+gridPara := painter gridParameters copy.
+hspace   := settings at: #HGridSpace ifAbsent: [10].
+vspace   := settings at: #VGridSpace ifAbsent: [10].
+gridPara at:1 put:hspace; at:2 put:vspace; at:5 put:hspace; at:6 put:vspace.
+painter gridParameters:gridPara.
+painter gridShown: (settings at: #GridShown ifAbsent: [false]).
+painter gridAlign: (settings at: #GridAlign ifAbsent: [false]).
+painter clear.
 ! !
 !UIPainter methodsFor:'user actions'!
 treeView class defaultFont: (font on: device).
 treeView font: treeView class defaultFont
 ]
 !
+doDefineClassAndSelector
+"launch a dialog to define class, superclass, and selector"
+|again tmp helpDict helpKey|
+[
+again := false.
+(tmp := specClass) isNil ifTrue:[tmp := 'NewApplication'].
+aspects at:#classNameChannel put:tmp asValue.
+(tmp := specSelector) isNil ifTrue:[tmp := 'windowSpec'].
+aspects at:#methodNameChannel put:tmp asValue.
+(tmp := specSuperclass) isNil ifTrue:[tmp := 'ApplicationModel'].
+aspects at:#superclassNameChannel put:tmp asValue.
+(self openDialogInterface:#dialogSpecForDefiningClassAndSelector) ifTrue:[
+specClass    := (self aspectFor:#classNameChannel) value.
+specSelector := (self aspectFor:#methodNameChannel) value.
+specSelector notNil ifTrue:[specSelector := specSelector asSymbol].
+specSuperclass := (self aspectFor:#superclassNameChannel) value.
+(again := self checkClassAndSelector not) ifFalse:[
+self painter className:specClass
+superclassName:specSuperclass
+selector:specSelector.
+]
+]
+ifFalse:
+[
+^nil
+]
+] doWhile:[again].
+specClass := specClass isBehavior ifTrue:[specClass name]
+ifFalse:[specClass].
+helpDict := self helpTool dictionary.
+helpKey  := self helpTool helpKey.
+self helpTool buildFromClass:specClass.
+self helpTool dictionary declareAllFrom: helpDict.
+self helpTool updateList.
+self helpTool helpKey: helpKey.
+self modifiedChannel value: false.
+self helpTool modified: true.
+!
+doDefineGrid
+"open a dialog for grip parameters configuration
+"
+|hspace vspace bindings painter gridPara settings|
+painter  := self painter.
+bindings := IdentityDictionary new.
+gridPara := painter gridParameters copy.
+bindings at:#showGrid    put:((self class settings at: #GridShown ifAbsent: [painter gridShown]) asValue).
+bindings at:#alignToGrid put:((self class settings at: #GridAlign ifAbsent: [painter gridAlign]) asValue).
+bindings at:#hspace      put:((gridPara at:1) asValue).
+bindings at:#vspace      put:((gridPara at:2) asValue).
+(self openDialogInterface:#dialogSpecForDefiningGridParameters withBindings:bindings) ifFalse:[
+^ self
+].
+hspace := (bindings at:#hspace) value ? 5.
+vspace := (bindings at:#vspace) value ? 5.
+gridPara at:1 put:hspace.
+gridPara at:2 put:vspace.
+gridPara at:5 put:hspace.
+gridPara at:6 put:vspace.
+painter gridShown:false.
+painter gridAlign:false.
+painter gridParameters:gridPara.
+painter gridAlign:(bindings at:#alignToGrid) value.
+painter gridShown:(bindings at:#showGrid) value.
+settings := self class settings.
+settings at: #GridShown  put: (bindings at:#showGrid) value.
+settings at: #GridAlign  put: (bindings at:#alignToGrid) value.
+settings at: #HGridSpace put: hspace.
+settings at: #VGridSpace put: vspace.
+painter clear.
+!
 doGenerateAspectMethods
 "generate aspect and action methods
 "
 |code|
 self treeSelection. "accept modifications"
 self hasSpecClassAndSelector ifFalse:[
-self defineClassAndSelector
+self doDefineClassAndSelector
 ].
 self checkClassAndSelector ifFalse:[
 ^ self
 ].
 |code|
 self treeSelection. "accept modifications"
 self hasSpecClassAndSelector ifFalse:[
-self defineClassAndSelector
+self doDefineClassAndSelector
 ].
 self checkClassAndSelector ifFalse:[
 ^ self
 ].
 self askForModification ifFalse: [^nil].
 specClass := specSelector := nil.
 self painter removeAll.
 treeView canvas topView name:  UIPainter defaultNameOfCanvas.
 treeView canvas topView label: UIPainter defaultNameOfCanvas.
-self helpTool reset.
+self helpTool doNew.
 treeView selection:#(1).
 self treeSelection.
 self updateInfoLabel.
 !
 |code painter|
 self treeSelection. "ask for modification"
 self hasSpecClassAndSelector ifFalse:[
-(self defineClassAndSelector) isNil ifTrue: [^nil]
+(self doDefineClassAndSelector) isNil ifTrue: [^nil]
 ].
 (specClass notNil and: [(Smalltalk at: specClass asSymbol) isClass])
 ifFalse:
 [
 painter className:specClass
 superclassName:specSuperclass
 selector:specSelector.
 code := painter generateWindowSpecMethodSource withCRs.
-painter resetModification.
 (ReadStream on:code) fileIn.
 self helpTool installHelpSpecsOnClass:specClass.
 self updateInfoLabel.
 ]
 ].
 ^ nil
+!
+lastDrawnMaster
+"returns the lastDrawnMaster
+"
+^ lastDrawnMaster
 ! !
 !UIPainter::TreeView methodsFor:'accessing property'!
 propertiesDo:aOneArgBlock
 self showDirectoryIndicator: true.
 self showDirectoryIndicatorForRoot: false.
 self model iconAction:
 [:aNode|
 |specClass|
 (specClass := aNode contents spec) isNil
 ifTrue:
 [
 WindowSpec icon
 ]
 ]
 ifFalse:
 [
 specClass class icon
 ]
-]
+].
 ].
 self model labelAction:
 [:aNode|
 |spec|

changeset 755	cfbbec0a33c6
parent 743	d58a3e7e39d5
child 765	27936ff059d3