# HG changeset patch # User Claus Gittinger # Date 1242801165 -7200 # Node ID 6241ec9e6a6f7b95c50e6f386213451d822621f3 # Parent fd4d8522f02c27b04d4a724e92207d2cadc80e03 default name of top-level spec diff -r fd4d8522f02c -r 6241ec9e6a6f UIPainter.st --- a/UIPainter.st Tue May 19 18:23:30 2009 +0200 +++ b/UIPainter.st Wed May 20 08:32:45 2009 +0200 @@ -21,7 +21,8 @@ ! SelectionInTreeView subclass:#TreeView - instanceVariableNames:'lastDrawnMaster canvasEventsDisabled windowSpec windowSpecClass' + instanceVariableNames:'lastDrawnMaster canvasEventsDisabled windowSpec windowSpecClass + painter' classVariableNames:'' poolDictionaries:'' privateIn:UIPainter @@ -101,7 +102,11 @@ ! ! -!UIPainter class methodsFor:'accessing'! +!UIPainter class methodsFor:'defaults'! + +defaultEditToolbarVisible + ^ DefaultEditToolBarVisible ? true +! defaultNameOfCanvas "returns the default name of the application" @@ -109,6 +114,10 @@ ^ 'NewApplication' ! +defaultToolbarVisible + ^ DefaultToolBarVisible ? true +! + selectionPanelClass ^ SelectionPanelClass @@ -129,16 +138,6 @@ " ! ! -!UIPainter class methodsFor:'defaults'! - -defaultEditToolbarVisible - ^ DefaultEditToolBarVisible ? true -! - -defaultToolbarVisible - ^ DefaultToolBarVisible ? true -! ! - !UIPainter class methodsFor:'help specs'! flyByHelpSpec @@ -3532,6 +3531,10 @@ "Created: / 13.8.1998 / 20:33:05 / cg" ! +defaultNameOfCanvas + ^ self class defaultNameOfCanvas +! + defaultWindowSpecClass ^ WindowSpec ! ! @@ -3644,12 +3647,12 @@ aspects at:#methodNameChannel put:'windowSpec' asValue. treeView := TreeView new. + treeView painter:self. treeView windowSpecClass:(self defaultWindowSpecClass). - treeView - selectConditionBlock:[:newSelection | self selectionChangeAllowed:newSelection ]. + treeView selectConditionBlock:[:newSelection | self selectionChangeAllowed:newSelection ]. painterView := StandardSystemView new. - name := name ? UIPainter defaultNameOfCanvas. + name := name ? self defaultNameOfCanvas. painterView beToolWindow. painterView name:name. painterView label:name. @@ -3670,6 +3673,7 @@ 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. @@ -5031,9 +5035,10 @@ specSuperclassName := readFromModelKeyed value:#superclassNameChannel. (again := self checkClassAndSelector not) ifFalse:[ - self painter className:specClassName - superclassName:specSuperclassName - selector:specSelector. + self painter + className:specClassName + superclassName:specSuperclassName + selector:specSelector. ]. again ifFalse:[ @@ -5052,8 +5057,9 @@ ] doWhile:[again]. - specClassName := specClassName isBehavior ifTrue:[specClassName name] - ifFalse:[specClassName]. + specClassName := specClassName isBehavior + ifTrue:[specClassName name] + ifFalse:[specClassName]. self clearModifiedFlag. self helpTool buildAndMergeFromClass:specClassName. @@ -5391,9 +5397,10 @@ self askForModification ifFalse: [^nil]. specClass := specClassName := specSelector := nil. self painter removeAll. +self halt. treeView canvas topView - name: UIPainter defaultNameOfCanvas; - label: UIPainter defaultNameOfCanvas. + name: self defaultNameOfCanvas; + label: self defaultNameOfCanvas. self helpTool doNew. self treeSelectionChanged. treeView selectedNode changed. @@ -5752,7 +5759,11 @@ 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). ! @@ -5840,6 +5851,14 @@ ! +painter + ^ painter +! + +painter:something + painter := something. +! + windowSpecClass "returns the default windowSpecClass (WindowSpec)" @@ -5926,7 +5945,7 @@ "/ 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. !