hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:23712b1d3f3d
+:1ecabfd468dc
 hereby transferred.
 "
 ApplicationModel subclass:#UIPainter
-	instanceVariableNames:'activeHelpTool layoutTool specTool treeView selectionPanel
+	instanceVariableNames:'treeView selectionPanel tabSelection specClass specSelector
-		tabSelection specClass specSelector specSuperclass aspects'
+		specSuperclass aspects layoutCanvas helpCanvas specCanvas'
 	classVariableNames:'IconStepUp IconStepOut IconStepIn IconStepDown'
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 "return a dictionary filled with helpKey -> helptext associations.
 These are used by the activeHelp tool.
 "
 ^ super helpSpec addPairsFrom:#(
-#alignSelectionCenterVer
+#moveSelectionLeft
-'align selected widgets vertical'
+'move selected widgets left while pressing the button'
-#alignSelectionLeft
+#setToDefaultWidth
-'align selected widgets to the left edge of the dominant widget ( underlined )'
+'set selected widgets to their default width'
-#alignSelectionRight
+#pasteBuffer
-'align selected widgets to the right edge of the dominant widget ( underlined )'
+'paste widgets at current mouse position'
-#alignSelectionLeftAndRight
+#galleryShown
-'align selected widgets to the right and left edge of the dominant widget ( underlined )'
+'show or hide gallery view'
-#alignSelectionTop
+#moveSelectionDown
-'align selected widgets to the top edge of the dominant widget ( underlined )'
+'move selected widgets down while pressing the button'
-#alignSelectionBottom
+#moveSelectionUp
-'align selected widgets to the bottom edge of the dominant widget ( underlined )'
+'move selected widgets up while pressing the button'
-#alignSelectionTopAndBottom
-'align selected widgets to the top and bottom edge of the dominant widget ( underlined )'
-#alignSelectionCenterVer
-'align selected widgets horizontal to the center of the dominant widget ( underlined )'
-#alignSelectionCenterHor
-'align selected widgets vertical to the center of the dominant widget ( underlined )'
 #spreadSelectionVer
 'vertical spacing between selected widgets is made the same'
+#menuChangeHierarchy
+'change hierarchy of the selected widget'
+#copyExtent
+'copy extent of the selected widget'
+#moveSelectionRight
+'move selected widgets right while pressing the button'
+#cancel
+'reread specification and layout'
+#pasteWithLayout
+'paste widgets without changing their layouts'
+#alignSelectionRight
+'align selected widgets to the right edge of the dominant widget'
+#alignSelectionLeftAndRight
+'align selected widgets to the right and left edge of the dominant widget'
+#pasteWidth
+'change width of all selected widgets to the last copied extent width'
+#alignSelectionTopAndBottom
+'align selected widgets to the top and bottom edge of the dominant widget'
+#copyLayout
+'copy layout of the selected widget'
+#painterShown
+'show or hide painter view'
+#pasteExtent
+'change extent of all selected widgets to the last copied extent'
+#pasteHeight
+'change height of all selected widgets to the last copied extent height'
+#accept
+'write back changes'
+#centerSelectionVer
+'center vertical horizontal in contained view'
+#centerSelectionHor
+'center widgets horizontal to their top widget'
+#menuAlignment
+'provides a set of alignment operation on the current selected widgets'
+#alignSelectionCenterVer
+'align selected widgets horizontal to the center of the dominant widget'
+#pasteLayout
+'change layout of all selected widgets to the last copied layout'
+#alignSelectionLeft
+'align selected widgets to the left edge of the dominant widget'
 #spreadSelectionHor
 'horizontal spacing between selected widgets is made the same'
-#centerSelectionHor
+#alignSelectionBottom
-'center widgets horizontal to their top widget'
+'align selected widgets to the bottom edge of the dominant widget'
-#centerSelectionVer
-'center vertical horizontal in contained view'
 #setToDefaultExtent
 'set selected widgets to their default extent'
-#setToDefaultWidth
+#alignSelectionCenterHor
-'set selected widgets to their default width'
+'align selected widgets vertical to the center of the dominant widget'
+#alignSelectionTop
+'align selected widgets to the top edge of the dominant widget'
 #setToDefaultHeight
 'set selected widgets to their default height'
-#copyExtent
-'copy extent of the selected widget'
-#pasteExtent
-'change extent of all selected widgets to the last copied extent'
-#pasteWidth
-'change width of all selected widgets to the last copied extent width'
-#pasteHeight
-'change height of all selected widgets to the last copied extent height'
-#copyLayout
-'copy layout of the selected widget'
-#pasteLayout
-'change layout of all selected widgets to the last copied layout'
-#pasteBuffer
-'paste widgets at current mouse position'
-#pasteWithLayout
-'paste widgets without changing their layouts'
-#accept
-'write back changes'
-#cancel
-'reread specification and layout'
-#galleryShown
-'show or hide gallery view'
-#painterShown
-'show or hide painter view'
-#moveSelectionLeft
-'move selected widgets left while pressing the button'
-#moveSelectionRight
-'move selected widgets right while pressing the button'
-#moveSelectionDown
-'move selected widgets down while pressing the button'
-#moveSelectionUp
-'move selected widgets up while pressing the button'
-#menuChangeHierarchy
-'change hierarchy of the selected widget'
-#menuAlignment
-'provides a set of alignment operation on the current selected widgets'
 )
 ! !
 !UIPainter class methodsFor:'icons'!
 iconAlignB
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'NameAndSelectorSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'Painter'
 #'bounds:' #(#Rectangle 0 0 391 170)
 )
 #'component:'
 #'name:' 'noteBook'
 #'layout:' #(#LayoutFrame 0 0.4 59 0.0 0 1.0 -55 1.0)
 #'enableChannel:' #enableChannel
 #'tabable:' true
 #'menu:' #tabList
-#'style:'
-#(#FontDescription
-#helvetica #medium
-#roman #'10'
-)
 #'model:' #tabModel
 #'tabWidget:' #Window
 #'canvas:' #noteBookView
 )
 #(#HorizontalPanelViewSpec
 #(
 #(#MenuItem
 #'label:' 'align left'
 #'value:' #alignSelectionLeft
+#'activeHelpKey:' #alignSelectionLeft
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignL
 )
 )
 accept
 "accept changes done to the specification. The component assigned to the
 specification will change immediately dependant on the attributes derived
 from the specification.
 "
-|layout|
+|layout spec prop key layoutTool|
 self isLayoutToolSelected ifTrue:[
+layoutTool := self layoutTool.
 (layout := layoutTool layout) notNil ifTrue:[
 layoutTool layoutType == #Extent ifTrue:[
 layoutTool layoutView == self painter topView ifTrue:[
 layoutTool layoutView extent:layout
 ] ifFalse:[
 ] ifFalse:[
 self painter setLayout:layout
 ]
 ]
 ] ifFalse:[
+spec := self specTool specification.
 self isHelpToolSelected ifTrue:[
-activeHelpTool accept
+self helpTool accept.
-].
+key  := self helpTool helpKey.
-self painter updateFromSpec:(specTool specification).
+prop := treeView propertySelected.
+prop notNil ifTrue:[
+prop spec activeHelpKey:key
+].
+spec activeHelpKey:key.
+] ifFalse:[
+self painter updateFromSpec:spec.
+]
 ].
 self modifiedChannel value:false.
 !
 cancel
 "cancel all changes done to the specification; reread attributes from the
 assigned component
 "
+|spec key|
 self isModified ifTrue:[
-specTool specification:(self painter specForSelection).
+(spec := self painter specForSelection) notNil ifTrue:[
-self setViewInLayoutTool:(layoutTool layoutView).
+key := spec activeHelpKey.
+].
+self helpTool helpKey:key.
+self specTool specification:spec.
+self setViewInLayoutTool:(self layoutTool layoutView).
 self modifiedChannel value:false.
 ]
 !
 moveSelectionDown
 self painter moveSelectionUp
 !
 openEditMenu
+"opens a menu editor on current widget
+"
 |cls aspect editor|
 specClass isNil ifTrue:[
 ^ self information:'no application class defined yet'.
 ].
 ^ self information:'no application class defined yet'
 ]
 ].
 cls notNil ifTrue:[
-(aspect := specTool specification menu) notNil ifTrue:[
+(aspect := self specTool specification menu) notNil ifTrue:[
 aspect := aspect asSymbol
 ] ifFalse:[
 "/ cg: q&d hack ...
 aspect := treeView propertySelected.
 aspect := nil.
 ] do:[
 aspect := aspect view asMenu.
 ]
 ].
-"/            aspect isNil ifTrue:[
-"/                self warn:'first enter (and confirm) the menus selector.'.
-"/                ^ self.
-"/            ].
 ].
 editor := MenuEditor new.
 editor masterApplication:self.
-editor activeHelpTool:(self activeHelpTool).
+editor useHelpDictionary:(self helpTool dictionary).
 editor openModalOnClass:cls andSelector:aspect.
+self helpTool updateList.
 editor selectorName ~= aspect ifTrue:[
 editor didInstall ifTrue:[
-specTool specification menu:editor selectorName asSymbol.
+self specTool specification menu:editor selectorName asSymbol.
 self modifiedChannel value:true.
 self accept
 ]
 ].
 ]
 "Modified: 31.7.1997 / 14:26:13 / cg"
 ! !
 !UIPainter methodsFor:'active help'!
-activeHelpTool
-"setup help tool
-"
-activeHelpTool isNil ifTrue:[
-activeHelpTool := UIHelpTool new.
-activeHelpTool helpSpecFrom:specClass.
-activeHelpTool masterApplication:self.
-].
-^ activeHelpTool
-!
 showHelp:aHelpText for:view
 "hook to allow an application to display active help
 texts in its own info area.
 This method may be redefined in a concrete application.
 !
 noteBookView
 "returns the notebook view; initialize components within the notebook
 "
-|noteBook channel n1 n2|
+|noteBook channel helpTool layoutTool specTool|
 (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
 noteBook   := View new.
 layoutTool := UILayoutTool new.
+helpTool   := UIHelpTool   new.
+helpTool helpSpecFrom:specClass.
 specTool   := UISpecificationTool new.
 channel    := self modifiedChannel.
 layoutTool masterApplication:self.
 specTool   masterApplication:self.
+helpTool   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.
+layoutCanvas := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+helpCanvas   := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
-n1 client:layoutTool.
+specCanvas   := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
-specTool builder:(n2 client:specTool).
+layoutCanvas client:layoutTool.
+helpCanvas   client:helpTool.
+specTool builder:(specCanvas client:specTool).
 layoutTool masterApplication:self.
 specTool   masterApplication:self.
+helpTool   masterApplication:self.
 layoutTool modifiedHolder:channel.
+helpTool   modifiedHolder:channel.
 specTool   modifiedHolder:channel.
 builder aspectAt:#noteBookView put:noteBook.
 ].
 ^ noteBook
 !
 layoutChanged
 "called by the painter/canvas whenever the layout of the current selected
 widget changed
 "
 self isModified ifFalse:[
-layoutTool update.
+self layoutTool update.
 self modifiedChannel value:false
 ]
 !
 propertyChanged
 widget changed
 "
 |p|
 (p := treeView propertySelected) notNil ifTrue:[
-specTool specification:(p spec copy).
+self specTool specification:(p spec copy).
 self setViewInLayoutTool:(p view).
 self modifiedChannel value:false
 ] ifFalse:[
-layoutTool layoutView notNil ifTrue:[
+self layoutTool layoutView notNil ifTrue:[
 self modifiedChannel value:false.
 self treeSelection
 ]
 ]
 !
 "
 aView beIndependent.
 aView unmap.
 !
-painter
+raiseTabView
-"returns the painter/canvas view
-"
+self isLayoutToolSelected ifTrue:[
-^ treeView canvas
+layoutCanvas raise
+] ifFalse:[
+self isHelpToolSelected ifTrue:[
+helpCanvas raise
+] ifFalse:[
+self specTool selection:tabSelection.
+specCanvas raise
+]
+]
 !
 raiseUIView:aView
 "raise the view which is an application or top view
 "
 self painter
 className:clsName
 superclassName:superClassName
 selector:(selector ? '').
-specClass := clsName.
+self specClass:clsName.
 specSelector := (selector ? '').
 specSuperclass := superClassName.
 "Modified: 24.6.1997 / 19:07:01 / cg"
 !
 setViewInLayoutTool:aView
 "set view for layout tool
 "
-self painter topView ~~ aView ifTrue:[
+|type|
-layoutTool layoutView:aView type:nil
-] ifFalse:[
+self painter topView == aView ifTrue:[
-layoutTool layoutView:aView type:#Extent
+type := #Extent
 ].
+self layoutTool layoutView:aView type:type
+!
+specClass:aClass
+specClass := aClass.
+self helpTool helpSpecFrom:specClass.
+! !
+!UIPainter methodsFor:'private tools'!
+helpTool
+"returns the help tool
+"
+helpCanvas isNil ifTrue:[
+self noteBookView
+].
+^ helpCanvas application
+!
+layoutTool
+"returns the layout tool
+"
+layoutCanvas isNil ifTrue:[
+self noteBookView
+].
+^ layoutCanvas application
+!
+painter
+"returns the painter/canvas view
+"
+^ treeView canvas
+!
+specTool
+"returns the spec tool
+"
+specCanvas isNil ifTrue:[
+self noteBookView
+].
+^ specCanvas application
 ! !
 !UIPainter methodsFor:'queries'!
 hasSpecClass
 isHelpToolSelected
 "returns true if current selected tab in the noteBook is assigned
 to the 'Help' tool
 "
-^ tabSelection = 'Help'
+^ tabSelection = UIHelpTool label
 !
 isLayoutToolSelected
 "returns true if current selected tab in the noteBook is assigned
 to the 'Layout' tool
 "
-^ tabSelection = layoutTool class label
+^ tabSelection = UILayoutTool label
 !
 isModified
 "returns true if current specification or layout is modified
 "
 !
 tabSelection:something
 "the tab selection of the notebook changed
 "
-|raiseViewIdx|
 (something isNil or:[tabSelection = something]) ifTrue:[
 ^ self
 ].
 self isModified ifTrue:[
 ^ self
 ].
 self accept
 ].
-raiseViewIdx := 1.
 tabSelection := something.
+self raiseTabView.
-self isLayoutToolSelected ifFalse:[
-specTool selection:tabSelection.
-raiseViewIdx := 2
-].
-(self noteBookView subViews at:raiseViewIdx) raise.
 self cancel.
 !
 treeSelection
 "called whenever the selection of the treeview changed
 spec := property spec copy.
 ]
 ].
 tabComponent := builder componentAt:#noteBook.
 self setViewInLayoutTool:view.
-specTool specification:spec.
+self specTool specification:spec.
 spec notNil ifTrue:[
+self helpTool helpKey:(spec activeHelpKey).
 list := spec class slices collect:[:aSlice| aSlice first asString].
-view notNil ifTrue:[list add:(layoutTool class label)].
+list add:(UIHelpTool   label).
+list add:(UILayoutTool label).
 self tabList value:list.
 self showHelp:(spec class name) for:nil.
 tabComponent enabled:true.
 (tabSelection := tabComponent selection) isNil ifTrue:[
 tabComponent setSelection:(tabSelection := list first)
 ].
-self isLayoutToolSelected ifTrue:[
+self raiseTabView
-(self noteBookView subViews at:1) raise
-] ifFalse:[
-specTool selection:tabSelection.
-(self noteBookView subViews at:2) raise
-]
 ] ifFalse:[
+self helpTool helpKey:nil.
 tabComponent enabled:false.
 self showHelp:'' for:nil.
 ].
 self modifiedChannel value:false.
 ! !
 !UIPainter methodsFor:'startup / release'!
 closeRequest
 selectionPanel notNil ifTrue:[
 selectionPanel masterApplication:nil.
 selectionPanel closeRequest
 ].
 selectionPanel := nil.
-layoutTool     := nil.
 treeView       := nil.
-activeHelpTool := nil.
 super closeRequest.
 "Modified: 28.7.1997 / 18:28:37 / cg"
 !
 (tmp := specSuperclass) isNil ifTrue:[tmp := 'ApplicationModel'].
 aspects at:#superclassNameChannel put:tmp asValue.
 (self openDialogInterface:#nameAndSelectorSpec) ifTrue:[
-specClass := (self aspectFor:#classNameChannel) value.
+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:[
 superclassName:specSuperclass
 selector:specSelector.
 ]
 ]
-] doWhile:[again]
+] doWhile:[again].
-"Modified: 17.6.1997 / 14:42:02 / cg"
+self specClass:specClass.
 ! !
 !UIPainter methodsFor:'user interaction - move'!
 doStepDown
 !
 doInstallHelp
 "install help text
 "
-activeHelpTool notNil ifTrue:[
+self helpTool installHelpSpecInto:specClass
-activeHelpTool installHelpSpecInto:specClass
-] ifFalse:[
-self information:'no help text defined'
-]
 !
 doInstallSpec
 "install window specification
 "

changeset 287	1ecabfd468dc
parent 282	bb88d92ae887
child 295	114befd1c369