hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:fd4d8522f02c
+:6241ec9e6a6f
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 SelectionInTreeView subclass:#TreeView
-	instanceVariableNames:'lastDrawnMaster canvasEventsDisabled windowSpec windowSpecClass'
+	instanceVariableNames:'lastDrawnMaster canvasEventsDisabled windowSpec windowSpecClass
+		painter'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:UIPainter
 !
 ^ false
 ! !
-!UIPainter class methodsFor:'accessing'!
+!UIPainter class methodsFor:'defaults'!
+defaultEditToolbarVisible
+^ DefaultEditToolBarVisible ? true
+!
 defaultNameOfCanvas
 "returns the default name of the application"
 ^ 'NewApplication'
+!
+defaultToolbarVisible
+^ DefaultToolBarVisible ? true
 !
 selectionPanelClass
 ^ SelectionPanelClass
 SelectionPanelClass := something.
 "
 UIPainter selectionPanelClass:UISelectionPanel
 "
-! !
-!UIPainter class methodsFor:'defaults'!
-defaultEditToolbarVisible
-^ DefaultEditToolBarVisible ? true
-!
-defaultToolbarVisible
-^ DefaultToolBarVisible ? true
 ! !
 !UIPainter class methodsFor:'help specs'!
 flyByHelpSpec
 ^ Image fromFile:'bitmaps/xpmBitmaps/misc_tools/setup_windows.xpm'
 "Created: / 13.8.1998 / 20:33:05 / cg"
 !
+defaultNameOfCanvas
+^ self class defaultNameOfCanvas
+!
 defaultWindowSpecClass
 ^ WindowSpec
 ! !
 !UIPainter methodsFor:'event handling'!
 aspects at:#classNameChannel put:'NewApplication' asValue.
 aspects at:#superclassNameChannel put:'ApplicationModel' asValue.
 aspects at:#methodNameChannel put:'windowSpec' asValue.
 treeView := TreeView new.
+treeView painter:self.
 treeView windowSpecClass:(self defaultWindowSpecClass).
-treeView
+treeView selectConditionBlock:[:newSelection | self selectionChangeAllowed:newSelection ].
-selectConditionBlock:[:newSelection | self selectionChangeAllowed:newSelection ].
 painterView := StandardSystemView new.
-name := name ? UIPainter defaultNameOfCanvas.
+name := name ? self defaultNameOfCanvas.
 painterView beToolWindow.
 painterView name:name.
 painterView label:name.
 painterView extent:(treeView windowSpecClass defaultExtentInUIPainter).
 viewScroller scrolledView:painter.
 ] ifFalse:[
 painter := UIPainterView in:painterView.
 painter layout:(0.0 @ 0.0 corner:1.0 @ 1.0) asLayout.
 ].
 treeView := treeView canvas:painter specName:name.
 painter treeView:treeView.
 treeView model addDependent:self.
 painter enableChannel:(self enableChannel).
 specClassName  := readFromModelKeyed value:#classNameChannel.
 specSelector   := readFromModelKeyed value:#methodNameChannel.
 specSuperclassName := readFromModelKeyed value:#superclassNameChannel.
 (again := self checkClassAndSelector not) ifFalse:[
-self painter className:specClassName
+self painter
-superclassName:specSuperclassName
+className:specClassName
-selector:specSelector.
+superclassName:specSuperclassName
+selector:specSelector.
 ].
 again ifFalse:[
 ((Smalltalk at:specClassName asSymbol) notNil
 and:[ (Smalltalk at:specClassName asSymbol) class includesSelector:specSelector ])
 ^nil
 ]
 ] doWhile:[again].
-specClassName := specClassName isBehavior ifTrue:[specClassName name]
+specClassName := specClassName isBehavior
-ifFalse:[specClassName].
+ifTrue:[specClassName name]
+ifFalse:[specClassName].
 self clearModifiedFlag.
 self helpTool buildAndMergeFromClass:specClassName.
 self updateInfoLabel
 "removes all widgets, specClass, and specSelector"
 self askForModification ifFalse: [^nil].
 specClass := specClassName := specSelector := nil.
 self painter removeAll.
+self halt.
 treeView canvas topView
-name:  UIPainter defaultNameOfCanvas;
+name:  self defaultNameOfCanvas;
-label: UIPainter defaultNameOfCanvas.
+label: self defaultNameOfCanvas.
 self helpTool doNew.
 self treeSelectionChanged.
 treeView selectedNode changed.
 self tabModel value: self tabList value first.
 self updateInfoLabel.
 |props|
 props := UIPainterView::ViewProperty new.
 props view:aCanvas.
-model root:(TreeItem name:(nameOfSpec ? UIPainter defaultNameOfCanvas) asBoldText contents:props).
+model root:(TreeItem
+name:(nameOfSpec ? painter defaultNameOfCanvas) asBoldText
+contents:props).
 model root expand.
 self enableChannel:(aCanvas enableChannel).
 !
 canvasSpec
 ^ lastDrawnMaster
 !
+painter
+^ painter
+!
+painter:something
+painter := something.
+!
 windowSpecClass
 "returns the default  windowSpecClass (WindowSpec)"
 ^ windowSpecClass ? WindowSpec
 !
 ].
 self canvas subViews copy do:[:aView|
 "/ care to not destroy the transparent input view
 (aView isInputOnly) ifFalse:[aView destroy]
 ].
-model root name: UIPainter defaultNameOfCanvas asBoldText.
+model root name: painter defaultNameOfCanvas asBoldText.
 model removeAllOtherThanRoot.
 !
 removeView:aView
 "removes a view"

changeset 2541	6241ec9e6a6f
parent 2540	fd4d8522f02c
child 2544	62e390e651a3