hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:aabb4037f6a3
+:bb88d92ae887
 	category:'Interface-UIPainter'
 !
 SelectionInTreeView subclass:#TreeView
 	instanceVariableNames:'lastDrawnMaster cvsEventsDisabled imageMasterParent
-		imageMasterChild'
+		imageEmptyParent imageMasterChild'
-	classVariableNames:'ImageMasterParent ImageMasterChild'
+	classVariableNames:'ImageMasterParent ImageMasterChild ImageEmptyParent'
 	poolDictionaries:''
 	privateIn:UIPainter
 !
 !UIPainter class methodsFor:'documentation'!
 ! !
 !UIPainter class methodsFor:'instance creation'!
-listHolder:aListHolder
-|application|
-application := self new.
-application objectList:aListHolder.
-^ application open
-!
 openOnClass:aClass andSelector:aSelector
+"open up an interface builder, fetching a spec from aClass
+via some selector
+"
 ^ self new openOnClass:aClass andSelector:aSelector
-"Created: 1.7.1997 / 19:16:59 / cg"
 !
 painter:aBuilderView
+"set the painter
+"
 |application|
 application := self new.
 application painter:aBuilderView.
 ^ application open
 ! !
 !UIPainter class methodsFor:'ST-80 queries'!
 preferenceFor:aSymbol
+"ST-80 compatible; always returns false
+"
 ^ false
 ! !
 These are used by the activeHelp tool.
 "
 ^ super helpSpec addPairsFrom:#(
 #alignSelectionCenterVer
-'align selection vertical'
+'align selected widgets vertical'
 #alignSelectionLeft
-'align selected components to the left edge of the
+'align selected widgets to the left edge of the dominant widget ( underlined )'
-dominant component ( underlined )'
 #alignSelectionRight
-'align selected components to the right edge of the
+'align selected widgets to the right edge of the dominant widget ( underlined )'
-dominant component ( underlined )'
 #alignSelectionLeftAndRight
-'align selected components to the right and left edge
+'align selected widgets to the right and left edge of the dominant widget ( underlined )'
-of the dominant component ( underlined )'
 #alignSelectionTop
-'align selected components to the top edge of the
+'align selected widgets to the top edge of the dominant widget ( underlined )'
-dominant component ( underlined )'
 #alignSelectionBottom
-'align selected components to the bottom edge of the
+'align selected widgets to the bottom edge of the dominant widget ( underlined )'
-dominant component ( underlined )'
 #alignSelectionTopAndBottom
-'align selected components to the top and bottom edge
+'align selected widgets to the top and bottom edge of the dominant widget ( underlined )'
-of the dominant component ( underlined )'
 #alignSelectionCenterVer
-'align selected components horizontal to the center of
+'align selected widgets horizontal to the center of the dominant widget ( underlined )'
-the dominant component ( underlined )'
 #alignSelectionCenterHor
-'align selected components vertical to the center of
+'align selected widgets vertical to the center of the dominant widget ( underlined )'
-the dominant component ( underlined )'
 #spreadSelectionVer
-'vertical spacing between selected components is made the same'
+'vertical spacing between selected widgets is made the same'
 #spreadSelectionHor
-'horizontal spacing between selected components is made the same'
+'horizontal spacing between selected widgets is made the same'
 #centerSelectionHor
-'center components horizontal in contained view'
+'center widgets horizontal to their top widget'
 #centerSelectionVer
 'center vertical horizontal in contained view'
 #setToDefaultExtent
-'set selected components to their default extent'
+'set selected widgets to their default extent'
 #setToDefaultWidth
-'set selected components to their default width'
+'set selected widgets to their default width'
 #setToDefaultHeight
-'set selected components to their default height'
+'set selected widgets to their default height'
 #copyExtent
-'copy extent of the selected component'
+'copy extent of the selected widget'
 #pasteExtent
-'change extent of all selected components to the
+'change extent of all selected widgets to the last copied extent'
-last copied extent'
 #pasteWidth
-'change width of all selected components to the
+'change width of all selected widgets to the last copied extent width'
-last copied extent width'
 #pasteHeight
-'change height of all selected components to the
+'change height of all selected widgets to the last copied extent height'
-last copied extent height'
 #copyLayout
-'copy layout of the selected component'
+'copy layout of the selected widget'
 #pasteLayout
-'change layout of all selected components to the
+'change layout of all selected widgets to the last copied layout'
-last copied layout'
 #pasteBuffer
-'paste components at current mouse position'
+'paste widgets at current mouse position'
 #pasteWithLayout
-'paste components without changing their layouts'
+'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
+"returns image assigned to align bottom
+"
 ^ Image fromFile:'b_alignB.xbm'
 !
 iconAlignCenterH
+"returns image assigned to center horizontal
+"
 ^ Image fromFile:'b_alignCH.xbm'
 !
 iconAlignCenterV
+"returns image assigned to center vertical
+"
 ^ Image fromFile:'b_alignCV.xbm'
 !
 iconAlignL
+"returns image assigned to align left
+"
 ^ Image fromFile:'b_alignL.xbm'
 !
 iconAlignLR
+"returns image assigned to align left and right
+"
 ^ Image fromFile:'b_alignLR.xbm'
 !
 iconAlignR
+"returns image assigned to align right
+"
 ^ Image fromFile:'b_alignR.xbm'
 !
 iconAlignT
+"returns image assigned to align top
+"
 ^ Image fromFile:'b_alignT.xbm'
 !
 iconAlignTB
+"returns image assigned to align top and bottom
+"
 ^ Image fromFile:'b_alignTB.xbm'
 !
 iconStepDown
+"returns image assigned to step down (change hierarchy).
+"
 IconStepDown isNil ifTrue:[
 IconStepDown := ((Image fromFile:'stepOver.xpm') rotated:90) flipHorizontal
 ].
 ^ IconStepDown
 "
 !
 iconStepIn
+"returns image assigned to step in (change hierarchy).
+"
 IconStepIn isNil ifTrue:[
 IconStepIn := ((Image fromFile:'stepIn.xpm') rotated:90) flipHorizontal
 ].
 ^ IconStepIn
 !
 iconStepOut
+"returns image assigned to step out (change hierarchy).
+"
 IconStepOut isNil ifTrue:[
 IconStepOut := ((Image fromFile:'stepOut.xpm') rotated:90) flipHorizontal
 ].
 ^ IconStepOut
 !
 iconStepUp
+"returns image assigned to step up (change hierarchy).
+"
 IconStepUp isNil ifTrue:[
 IconStepUp := ((Image fromFile:'stepOver.xpm') rotated:90) flipHorizontal flipVertical
 ].
 ^ IconStepUp
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'Tree-View'
-#'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#'layout:' #(#LayoutFrame 199 0 167 0 759 0 616 0)
 #'label:' 'Tree-View'
-#'bounds:' #(#Rectangle 0 0 561 450)
+#'min:' #(#Point 10 10)
+#'max:' #(#Point 1160 870)
+#'bounds:' #(#Rectangle 199 167 760 617)
 )
 #'component:'
 #(#SpecCollection
 #'collection:'
 #(
 #(#SpecCollection
 #'collection:'
 #(
 #(#ActionButtonSpec
 #'name:' 'cancelButton'
+#'activeHelpKey:' #cancel
 #'label:' 'cancel'
 #'tabable:' true
 #'model:' #cancel
 #'enableChannel:' #modifiedChannel
 #'extent:' #(#Point 164 24)
 )
 #(#ActionButtonSpec
 #'name:' 'acceptButton'
+#'activeHelpKey:' #accept
 #'label:' 'ok'
 #'tabable:' true
 #'model:' #accept
 #'enableChannel:' #modifiedChannel
 #'extent:' #(#Point 164 24)
 #'adjust:' #left
 )
 #(#ToggleSpec
 #'name:' 'galleryLabel'
 #'layout:' #(#LayoutFrame -162 1.0 1 0 -82 1.0 23 0)
+#'activeHelpKey:' #galleryShown
 #'label:' 'Gallery'
 #'model:' #galleryShown
 #'isTriggerOnDown:' true
 #'showLamp:' true
 #'lampColor:' #(#Color 100.0 100.0 0.0)
 )
 #(#ToggleSpec
 #'name:' 'painterLabel'
 #'layout:' #(#LayoutFrame -81 1.0 1 0 -1 1.0 23 0)
+#'activeHelpKey:' #painterShown
 #'label:' 'Painter'
 #'model:' #painterShown
 #'isTriggerOnDown:' true
 #'showLamp:' true
 #'lampColor:' #(#Color 100.0 100.0 0.0)
 #'component:'
 #(#SpecCollection
 #'collection:'
 #(
 #(#MenuPanelSpec
-#'name:' 'menuMove'
+#'name:' 'menuChangeHierarchy'
-#'menu:' #menuMove
+#'activeHelpKey:' #menuChangeHierarchy
+#'enableChannel:' #hasOneSelectionOtherThanCanvas
+#'menu:' #menuChangeHierarchy
 #'showSeparatingLines:' true
 #'extent:' #(#Point 123 32)
 )
 #(#MenuPanelSpec
 #'name:' 'menuAlignment'
+#'activeHelpKey:' #menuAlignment
+#'enableChannel:' #canMoveOrAlignSelection
 #'tabable:' true
 #'menu:' #menuAlignment
 #'showSeparatingLines:' true
 #'extent:' #(#Point 233 32)
 )
 #(#SpecCollection
 #'collection:'
 #(
 #(#ArrowButtonSpec
 #'name:' 'moveLeft'
+#'activeHelpKey:' #moveSelectionLeft
 #'tabable:' true
 #'model:' #moveSelectionLeft
 #'isTriggerOnDown:' true
-#'enableChannel:' #hasValidSelection
+#'enableChannel:' #canMoveOrAlignSelection
 #'direction:' #left
-#'extent:' #(#Point 25 24)
+#'extent:' #(#Point 22 24)
 )
 #(#ArrowButtonSpec
 #'name:' 'moveRight'
+#'activeHelpKey:' #moveSelectionRight
 #'model:' #moveSelectionRight
 #'isTriggerOnDown:' true
-#'enableChannel:' #hasValidSelection
+#'enableChannel:' #canMoveOrAlignSelection
 #'direction:' #right
-#'extent:' #(#Point 26 24)
+#'extent:' #(#Point 22 24)
 )
 #(#ArrowButtonSpec
 #'name:' 'moveDown'
+#'activeHelpKey:' #moveSelectionDown
 #'model:' #moveSelectionDown
 #'isTriggerOnDown:' true
-#'enableChannel:' #hasValidSelection
+#'enableChannel:' #canMoveOrAlignSelection
 #'direction:' #down
-#'extent:' #(#Point 26 24)
+#'extent:' #(#Point 22 24)
 )
 #(#ArrowButtonSpec
 #'name:' 'moveUp'
+#'activeHelpKey:' #moveSelectionUp
 #'model:' #moveSelectionUp
 #'isTriggerOnDown:' true
-#'enableChannel:' #hasValidSelection
+#'enableChannel:' #canMoveOrAlignSelection
 #'direction:' #up
 #'extent:' #(#Point 22 24)
 )
 )
 )
 #(
 #(#MenuItem
 #'label:' 'align left'
 #'value:' #alignSelectionLeft
-#'enabled:' #hasValidSelection
-#'activeHelpKey:' #alignSelectionLeft
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignL
 )
 )
 #(#MenuItem
 #'label:' 'align right'
 #'value:' #alignSelectionRight
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionRight
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignR
 )
 )
 #(#MenuItem
 #'label:' 'align left & right'
 #'value:' #alignSelectionLeftAndRight
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionLeftAndRight
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignLR
 )
 )
 #(#MenuItem
 #'label:' 'align top'
 #'value:' #alignSelectionTop
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionTop
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignT
 )
 )
 #(#MenuItem
 #'label:' 'align bottom'
 #'value:' #alignSelectionBottom
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionBottom
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignB
 )
 )
 #(#MenuItem
 #'label:' 'align top & bottom'
 #'value:' #alignSelectionTopAndBottom
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionTopAndBottom
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignTB
 )
 )
 #(#MenuItem
 #'label:' 'align centered horizontal'
 #'value:' #alignSelectionCenterHor
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionCenterHor
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignCenterH
 )
 )
 #(#MenuItem
 #'label:' 'align centered vertical'
 #'value:' #alignSelectionCenterVer
-#'enabled:' #hasValidSelection
 #'activeHelpKey:' #alignSelectionCenterVer
 #'labelImage:'
 #(#ResourceRetriever
 nil #iconAlignCenterV
 )
 <resource: #menu>
 ^
 #(#Menu
 #(
 #(#MenuItem
 #'label:' 'copy'
 #'value:' #copySelection
+#'enabled:' #hasSelection
 #'shortcutKeyCharacter:' #Copy
 )
 #(#MenuItem
 #'label:' 'cut'
 #'value:' #deleteSelection
+#'enabled:' #hasSelection
 #'shortcutKeyCharacter:' #Cut
 )
 #(#MenuItem
 #'label:' 'paste'
 #'nameKey:' #paste
+#'enabled:' #canPaste
 #'value:' #paste
 #'submenu:'
 #(#Menu
 #(
 #'shortcutKeyCharacter:' #Paste
 )
 #(#MenuItem
 #'label:' 'keep layout'
 #'value:' #pasteWithLayout
+#'enabled:' #canKeepLayoutInSelection
 #'activeHelpKey:' #pasteWithLayout
 )
 ) nil
 nil
 )
 #'label:' '-'
 )
 #(#MenuItem
 #'label:' 'undo'
 #'nameKey:' #undo
+#'enabled:' #hasUndoHistory
 #'value:' #undoLast
 )
 #(#MenuItem
 #'label:' '-'
 )
 #(#MenuItem
 #'label:' 'dimension'
 #'value:' #dimension
+#'enabled:' #hasSelection
 #'submenu:'
 #(#Menu
 #(
 #(#MenuItem
 #'label:' 'default extent'
 #'value:' #setToDefaultExtent
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #setToDefaultExtent
 )
 #(#MenuItem
 #'label:' 'default width'
 #'value:' #setToDefaultWidth
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #setToDefaultWidth
 )
 #(#MenuItem
 #'label:' 'default height'
 #'value:' #setToDefaultHeight
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #setToDefaultHeight
 )
 #(#MenuItem
 #'label:' 'copy extent'
 #'value:' #copyExtent
+#'enabled:' #hasSingleSelection
 #'activeHelpKey:' #copyExtent
 )
 #(#MenuItem
 #'label:' 'paste extent'
 #'value:' #pasteExtent
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #pasteExtent
 )
 #(#MenuItem
 #'label:' 'paste width'
 #'value:' #pasteWidth
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #pasteWidth
 )
 #(#MenuItem
 #'label:' 'paste height'
 #'value:' #pasteHeight
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #pasteHeight
 )
 #(#MenuItem
 #'label:' 'copy  layout'
 #'value:' #copyLayout
+#'enabled:' #hasSingleSelection
 #'activeHelpKey:' #copyLayout
 )
 #(#MenuItem
 #'label:' 'paste layout'
 #'value:' #pasteLayout
+#'enabled:' #canMoveOrAlignSelection
 #'activeHelpKey:' #pasteLayout
 )
 )
 #(3 1 3)
 nil
 )
 )
 #(#MenuItem
 #'label:' 'align'
 #'value:' #align
+#'enabled:' #canMoveOrAlignSelection
 #'submenu:'
 #(#Menu
 #(
 #(#MenuItem
 )
 !
-menuMove
+menuChangeHierarchy
 "this window spec was automatically generated by the ST/X MenuEditor"
 "do not manually edit this - the builder may not be able to
 handle the specification if its corrupted."
 "
-MenuEditor new openOnClass:UIPainter andSelector:#menuMove
+MenuEditor new openOnClass:UIPainter andSelector:#menuChangeHierarchy
-(Menu new fromLiteralArrayEncoding:(UIPainter menuMove)) startUp
+(Menu new fromLiteralArrayEncoding:(UIPainter menuChangeHierarchy)) startUp
 "
 <resource: #menu>
 ^
 #(
 #(#MenuItem
 #'label:' 'stepUp'
 #'value:' #doStepUp
-#'enabled:' #hasSingleSelection
 #'labelImage:'
 #(#ResourceRetriever
 #UIPainter #iconStepUp
 )
 )
 #(#MenuItem
 #'label:' 'stepDown'
 #'value:' #doStepDown
-#'enabled:' #hasSingleSelection
 #'labelImage:'
 #(#ResourceRetriever
 #UIPainter #iconStepDown
 )
+)
+#(#MenuItem
+#'label:' '-'
 )
 #(#MenuItem
 #'label:' 'stepIn'
 #'value:' #doStepIn
-#'enabled:' #canStepIn
+#'enabled:' #canMoveSelectionIntoContainer
 #'labelImage:'
 #(#ResourceRetriever
 #UIPainter #iconStepIn
 )
 )
 #(#MenuItem
 #'label:' 'stepOut'
 #'value:' #doStepOut
-#'enabled:' #canStepOut
+#'enabled:' #canMoveSelectionOutOfContainer
 #'labelImage:'
 #(#ResourceRetriever
 #UIPainter #iconStepOut
 )
 )
-)
+) nil
-#( 2 )
 nil
 )
 !
 menuPullDown
 ) nil
 nil
 )
 ! !
-!UIPainter methodsFor:'accessing menu'!
-menuCanvas
-^ [ treeView canvas showMiddleButtonMenu ]
-!
-menuMove
-"this window spec was automatically generated by the ST/X MenuEditor"
-^ self class menuMove
-!
-menuPullDown
-"this window spec was automatically generated by the ST/X MenuEditor"
-^ self class menuPullDown
-! !
 !UIPainter methodsFor:'actions'!
 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|
 self isLayoutToolSelected ifTrue:[
 (layout := layoutTool layout) notNil ifTrue:[
 layoutTool layoutType == #Extent ifTrue:[
-self painter setExtent:layout
+layoutTool layoutView == self painter topView ifTrue:[
+layoutTool layoutView extent:layout
+] ifFalse:[
+self painter setExtent:layout
+]
 ] ifFalse:[
 self painter setLayout:layout
 ]
 ]
 ] ifFalse:[
 self modifiedChannel value:false.
 !
 cancel
-"cancel all changes and read back attributes from current view
+"cancel all changes done to the specification; reread attributes from the
+assigned component
 "
 self isModified ifTrue:[
 specTool specification:(self painter specForSelection).
-layoutTool layoutView:(layoutTool layoutView).
+self setViewInLayoutTool:(layoutTool layoutView).
 self modifiedChannel value:false.
 ]
+!
+moveSelectionDown
+"move selected components down
+"
+self painter moveSelectionDown
+!
+moveSelectionLeft
+"move selected components left
+"
+self painter moveSelectionLeft
+!
+moveSelectionRight
+"move selected components right
+"
+self painter moveSelectionRight
+!
+moveSelectionUp
+"move selected components up
+"
+self painter moveSelectionUp
 !
 openEditMenu
 |cls aspect editor|
 ! !
 !UIPainter methodsFor:'aspects'!
-canStepIn
+canMoveOrAlignSelection
-^ builder booleanValueAspectFor:#canStepIn
+"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
-"Modified: 28.7.1997 / 12:52:16 / cg"
+align operation
-!
+"
+^ builder booleanValueAspectFor:#canMoveOrAlignSelection
-canStepOut
+!
-^ builder booleanValueAspectFor:#canStepOut
+canMoveSelectionIntoContainer
-"Modified: 28.7.1997 / 12:52:18 / cg"
+"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
+the same container.
+"
+^ builder booleanValueAspectFor:#canMoveSelectionIntoContainer
+!
+canMoveSelectionOutOfContainer
+"returns a boolean value holder which is true in case that one component is selected
+which is contained within another component
+"
+^ builder booleanValueAspectFor:#canMoveSelectionOutOfContainer
 !
 enableChannel
 "true if modifications are allowed otherwise running test
 "
 ^ self painter enableChannel
 !
 galleryShown
+"returns a boolean value holder which is set to true if the gallery is shown
+"
 |holder|
 (holder := builder bindingAt:#galleryShown) isNil ifTrue:[
 builder aspectAt:#galleryShown put:(holder :=  true asValue).
 holder addDependent:self
 ].
 ^ holder
 !
-hasSingleSelection
+hasOneSelectionOtherThanCanvas
-^ builder booleanValueAspectFor:#hasSingleSelection
+"returns a value holder which is true in case that one component is selected
+other than the canvas.
-"Modified: 28.7.1997 / 12:52:20 / cg"
+"
-!
+^ builder booleanValueAspectFor:#hasOneSelectionOtherThanCanvas
-hasValidSelection
-^ builder booleanValueAspectFor:#hasValidSelection
-"Modified: 28.7.1997 / 12:52:22 / cg"
 !
 modifiedChannel
+"returns a boolean value holder which is set to true if something is modified
+and not accepted
+"
 ^ builder booleanValueAspectFor:#modifiedChannel
-"Modified: 28.7.1997 / 12:52:24 / cg"
 !
 noteBookView
-"automatically generated by UIPainter ..."
+"returns the notebook view; initialize components within the notebook
+"
 |noteBook channel n1 n2|
 (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
 noteBook   := View new.
 layoutTool := UILayoutTool new.
 builder aspectAt:#noteBookView put:noteBook.
 ].
 ^ noteBook
 !
-objectList
-^ nil
-"
-|holder|
-(holder := builder bindingAt:#objectList) isNil ifTrue:[
-builder aspectAt:#objectList put:(holder := SelectionInList).
-].
-^ holder
-"
-!
-objectListMenu
-"returns a block which returns the menu
-!!hack!!
-"
-^ [ self painter showMiddleButtonMenu ].
-!
 painterShown
+"returns a boolean value holder which is set to true if the painter is shown
+"
 |holder|
 (holder := builder bindingAt:#painterShown) isNil ifTrue:[
 builder aspectAt:#painterShown put:(holder :=  true asValue).
 holder addDependent:self
 ^ holder
 !
 tabList
-"automatically generated by UIPainter ..."
+"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).
 holder value:#( 'Properties' ).
 ].
 ^ holder
 !
 tabModel
-"automatically generated by UIPainter ..."
+"returns a value holder which keeps the current name of the tab selected
+"
 |holder|
 (holder := builder bindingAt:#tabModel) isNil ifTrue:[
 holder := AspectAdaptor new subject:self; forAspect:#tabSelection.
 builder aspectAt:#tabModel put:holder.
 ].
 ^ holder
 !
 treeView
+"returns the selection tree view which holds all widget identifiers
+"
 ^ treeView
 ! !
 !UIPainter methodsFor:'binding access'!
 ! !
 !UIPainter methodsFor:'change & update'!
 layoutChanged
+"called by the painter/canvas whenever the layout of the current selected
+widget changed
+"
 self isModified ifFalse:[
 layoutTool update.
 self modifiedChannel value:false
 ]
 !
 propertyChanged
-"property changed
+"called by the painter/canvas whenever the property of the current selected
+widget changed
 "
 |p|
 (p := treeView propertySelected) notNil ifTrue:[
 specTool specification:(p spec copy).
-layoutTool  layoutView:(p view).
+self setViewInLayoutTool:(p view).
 self modifiedChannel value:false
 ] ifFalse:[
 layoutTool layoutView notNil ifTrue:[
 self modifiedChannel value:false.
 self treeSelection
 ]
 ]
 !
 update:something with:aParameter from:someObject
+"catch change notifications
+"
 someObject == treeView model ifTrue:[
 something == #selection ifTrue:[self treeSelection].
 ^ self
 ].
 ! !
 !UIPainter methodsFor:'event handling'!
 doesNotUnderstand:aMessage
-|painter|
+|painter|
-painter := self painter.
+painter := self painter.
-(painter respondsTo:(aMessage selector)) ifTrue:[
+(painter respondsTo:(aMessage selector)) ifTrue:[
 ^ aMessage sendTo:painter
 ].
 super doesNotUnderstand:aMessage
+! !
+!UIPainter methodsFor:'menu accessing'!
+menuAlignment
+"returns the pull down menu which keeps the alignment operations
+"
+^ self class menuAlignment
+!
+menuCanvas
+"returns the middle button menu used by the painter and the tree view
+"
+^ [ treeView canvas showMiddleButtonMenu ]
+!
+menuChangeHierarchy
+"returns the hierarchy pull down menu
+"
+^ self class menuChangeHierarchy
+!
+menuPullDown
+"returns the main pull down menu
+"
+^ self class menuPullDown
 ! !
 !UIPainter methodsFor:'private'!
 hideUIView:aView
+"hide the view which is an application or top view
+"
 aView beIndependent.
 aView unmap.
 !
 painter
+"returns the painter/canvas view
+"
 ^ treeView canvas
 !
 raiseUIView:aView
+"raise the view which is an application or top view
+"
 aView map.
 aView bePartner.
 !
 setClass:cls selector:selector
+"set the application class and the selector under which the
+window specification should be stored
+"
 |clsName superClassName|
 clsName := cls name.
 superClassName := cls superclass name.
 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:[
+layoutTool layoutView:aView type:nil
+] ifFalse:[
+layoutTool layoutView:aView type:#Extent
+].
 ! !
 !UIPainter methodsFor:'queries'!
 hasSpecClass
+"checks whether an application class is defined
+"
 specClass notNil ifTrue:[
 ^ (specClass isBehavior or:[(Smalltalk at:specClass asSymbol) notNil])
 ].
 ^ false
 !
 hasSpecClassAndSelector
+"checks whether an application class and a selector under which
+the window specification is stored is defined.
+"
 specSelector size > 1 ifTrue:[
 ^ self hasSpecClass
 ].
 ^ false
 !
 isHelpToolSelected
+"returns true if current selected tab in the noteBook is assigned
+to the 'Help' tool
+"
 ^ tabSelection = 'Help'
 !
 isLayoutToolSelected
+"returns true if current selected tab in the noteBook is assigned
+to the 'Layout' tool
+"
 ^ tabSelection = layoutTool class label
 !
 isModified
-"returns true if current spec. is modified
+"returns true if current specification or layout is modified
 "
 ^ self modifiedChannel value
 !
 isPainterEnabled
+"returns true if not running in test mode
+"
 ^ self painter enabled
 ! !
 !UIPainter methodsFor:'selection'!
-canvasSelected
-|spec|
-self hasValidSelection value:false.
-self canStepIn value:false.
-self canStepOut value:false.
-self hasSingleSelection value:false.
-spec := treeView canvasSpec.
-(builder componentAt:#noteBook) setSelection:nil.
-self setupSlicesFrom:spec hasLayout:false.
-tabSelection := nil.
-layoutTool layoutView:nil.
-specTool specification:spec.
-self modifiedChannel value:false.
-self tabSelection:(self tabList value first).
-specTool selection:tabSelection.
-(self noteBookView subViews at:2) raise.
-(builder componentAt:#noteBook) setSelection:1.
-self modifiedChannel value:false.
-!
-setupSlicesFrom:aSpec hasLayout:hasLayout
-|slices list|
-slices := aSpec class slices.
-list   := slices collect:[:aSlice| aSlice first asString].
-hasLayout ifTrue:[
-list add:(layoutTool class label)
-].
-self tabList value:list.
-!
 tabSelection
-"returns current name of section
+"returns name of current selected tab in the notebook.
 "
 ^ tabSelection
 !
 tabSelection:something
-"section changed
+"the tab selection of the notebook changed
 "
 |raiseViewIdx|
 (something isNil or:[tabSelection = something]) ifTrue:[
 ^ self
 (self noteBookView subViews at:raiseViewIdx) raise.
 self cancel.
 !
 treeSelection
-"called whenever tree-selection changed
+"called whenever the selection of the treeview changed
 "
-|oldSelection view slices list spec props size nameOfSpec|
+|view list spec property tabComponent|
 self isModified ifTrue:[
 (self confirm:'accept change made in ' , tabSelection printString , ' section ?') ifTrue:[
 self accept
 ]
 ].
+self canMoveOrAlignSelection        value:(treeView canMoveOrAlignSelection).
+self canMoveSelectionIntoContainer  value:(treeView canMoveSelectionIntoContainer).
+self canMoveSelectionOutOfContainer value:(treeView canMoveSelectionOutOfContainer).
+self hasOneSelectionOtherThanCanvas value:(treeView hasOneSelectionOtherThanCanvas).
 treeView isCanvasSelected ifTrue:[
-^ self canvasSelected
+spec := treeView canvasSpec.
-].
+view := self painter topView.
+] ifFalse:[
-props := treeView propertySelected.
+(property := treeView propertySelected) notNil ifTrue:[
-oldSelection := tabSelection.
+view := property view.
-tabSelection := nil.
+spec := property spec copy.
+]
-self hasValidSelection value:(treeView hasValidSelection).
+].
-self canStepIn value:(treeView canStepIn).
+tabComponent := builder componentAt:#noteBook.
-self canStepOut value:(treeView canStepOut).
+self setViewInLayoutTool:view.
+specTool specification:spec.
-props isNil ifFalse:[
-self hasSingleSelection value:true.
+spec notNil ifTrue:[
-view := props view.
+list := spec class slices collect:[:aSlice| aSlice first asString].
-spec := props spec copy.
+view notNil ifTrue:[list add:(layoutTool class label)].
+self tabList value:list.
-layoutTool layoutView == view ifFalse:[
+self showHelp:(spec class name) for:nil.
-self setupSlicesFrom:spec hasLayout:true.
+tabComponent enabled:true.
+(tabSelection := tabComponent selection) isNil ifTrue:[
+tabComponent setSelection:(tabSelection := list first)
 ].
-list := self tabList value.
-(list findFirst:[:n| n = oldSelection ]) ~~ 0 ifTrue:[
-tabSelection := oldSelection
-] ifFalse:[
-tabSelection := list first
-].
-nameOfSpec := spec class name.
-] ifTrue:[
-self hasSingleSelection value:false.
-nameOfSpec := ''
-].
-self showHelp:nameOfSpec for:nil.
-layoutTool layoutView:view.
-specTool specification:spec.
-tabSelection notNil ifTrue:[
 self isLayoutToolSelected ifTrue:[
 (self noteBookView subViews at:1) raise
 ] ifFalse:[
 specTool selection:tabSelection.
 (self noteBookView subViews at:2) raise
 ]
-].
+] ifFalse:[
+tabComponent enabled:false.
-(builder componentAt:#noteBook) setSelection:tabSelection.
+self showHelp:'' for:nil.
+].
 self modifiedChannel value:false.
 ! !
 !UIPainter methodsFor:'startup / release'!
 super openInterface.
 topView := self window.
 topView bePartner.
 topView label:'GUI Builder'.
-topView icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
 painterView openInGroup:(topView windowGroup).
 painterView bePartner.
 painterView application:self.
 painterView open.
 selectionPanel allButOpenInterface:#windowSpec.
 selectionPanel window openInGroup:(topView windowGroup).
 selectionPanel window bePartner.
 selectionPanel openWindow.
 selectionPanel masterApplication:self.
+topView iconLabel:'Builder'.
+topView icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
+painterView iconLabel:'Builder'.
+painterView icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
+selectionPanel window iconLabel:'Builder'.
+selectionPanel window icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
 "Modified: 1.8.1997 / 14:22:10 / cg"
 !
 openNewWindowCanvas
 ! !
 !UIPainter methodsFor:'user interaction - move'!
 doStepDown
+"move selected component after the next component in the hierarchy of
+its container widget
+"
 treeView doStepOver:1
 !
 doStepIn
+"change the container of the selected widget
+"
 treeView doStepIn
 !
 doStepOut
+"change the container of the selected widget
+"
 treeView doStepOut
 !
 doStepUp
+"move selected component before the previous component in the hierarchy of
+its container widget
+"
 treeView doStepOver:-1
 ! !
 !UIPainter methodsFor:'user interaction - pullDown'!
 "Modified: 28.7.1997 / 18:30:13 / cg"
 !
 doFromClass
+"setup new specification from a class and selector accessed through
+to a dialog
+"
 |className methodName cls sel accepted failed spec s painter|
 self painter isModified ifTrue:[
 (self confirm:'edit another interface without saving your modifications ?') ifFalse:[
 ^ self
 "Modified: 24.6.1997 / 18:59:29 / cg"
 !
 doInstallAspects
+"install aspects and actions
+"
 |code|
 self hasSpecClassAndSelector ifFalse:[
 self defineClassAndSelector
 ].
 self information:'no help text defined'
 ]
 !
 doInstallSpec
+"install window specification
+"
 |code painter|
 self hasSpecClassAndSelector ifFalse:[
 self defineClassAndSelector
 ].
 (ReadStream on:code) fileIn.
 !
 doNew
+"remove all components and associated resources
+"
 self painter isModified ifTrue:[
 (self confirm:'edit a new interface without saving your modifications ?') ifFalse:[
 ^ self
 ]
 ].
+self painter removeAll
-self removeAll
-"Modified: 28.7.1997 / 18:28:02 / cg"
 !
 doPickAView
+"pick a view and setup specifications
+"
 |painter view cls spec|
 self painter isModified ifTrue:[
 (self confirm:'pick another interface without saving your modifications ?') ifFalse:[
 ^ self
 "Modified: 24.6.1997 / 19:02:57 / cg"
 !
 doStartApplication
+"start current edited application
+"
 |cls|
 self painter isModified ifTrue:[
 (self confirm:'the changed spec has not yet been reinstalled.\\Start anyway (based upon the previous interface) ?' withCRs) ifFalse:[
 ^ self
 "Modified: 28.7.1997 / 18:30:25 / cg"
 !
 doWindowSpec
+"create the window specification but do not write to application; instead
+open a view
+"
 |code v|
 code := self painter generateWindowSpecMethodSource.
 v := CodeView open.
 ! !
 !UIPainter::TreeView class methodsFor:'constants'!
+defaultNameOfCanvas
+"returns the default name (id) of the application
+"
+^ 'Canvas'
+!
+imageEmptyParent
+ImageEmptyParent isNil ifTrue:[
+ImageEmptyParent := Image fromFile:('xpmBitmaps/document_images/tiny_dir.xpm').
+].
+^ ImageEmptyParent
+"
+ImageEmptyParent := nil
+"
+!
 imageMasterChild
 ImageMasterChild isNil ifTrue:[
 ImageMasterChild := Image fromFile:('xpmBitmaps/document_images/tiny_file_plain_gray.xpm').
 ].
 !
 imageMasterParent
 ImageMasterParent isNil ifTrue:[
-"/        ImageMasterParent := Image fromFile:('xpmBitmaps/document_images/tiny_yellow_dir_locked.xpm').
 ImageMasterParent := Image fromFile:('xpmBitmaps/document_images/tiny_yellow_dir_gray.xpm').
 ].
 ^ ImageMasterParent
 "
 "
 |props|
 props := UIPainterView::ViewProperty new.
 props view:aCanvas.
-model root:(TreeItem name:'Canvas' contents:props).
+model root:(TreeItem name:(self class defaultNameOfCanvas) contents:props).
 model root expand.
 self enableChannel:(aCanvas enableChannel).
-!
-canvasName:aName
-"change id of canvas
-"
-|name|
-(    aName size ~~ 0
-and:[(name := aName string withoutSeparators) size ~~ 0
-and:[(self propertyDetect:[:p| p name = name]) isNil
-and:[(listOfNodes at:1) name ~= name]]]
-) ifTrue:[
-(listOfNodes at:1) name:name.
-self redrawLine:1.
-]
 !
 canvasSpec
 "returns spec assigned to canvas
 "
 spec := WindowSpec new.
 spec fromView:(self canvas topView) callBack:nil.
 spec name:(listOfNodes at:1) name.
 ^ spec
+!
+itemOfView:aView
+"returns item assigned to view or nil
+"
+aView notNil ifTrue:[
+self allItemsDo:[:anItem|
+(anItem contents view == aView) ifTrue:[^ anItem]
+]
+].
+^ nil
 ! !
 !UIPainter::TreeView methodsFor:'accessing property'!
 propertiesDo:aOneArgBlock
 !UIPainter::TreeView methodsFor:'adding & removing'!
 addProperty:aProperty
 "add a new item
 "
-|prnt child canvas view|
+model add:(TreeItem name:(aProperty name) contents:aProperty)
+below:(self detectItemRespondsToView:(aProperty view superView))
-child  := TreeItem name:(aProperty name) contents:aProperty.
-view   := aProperty view.
-canvas := self canvas.
-[ ((view := view superView) notNil and:[(prnt := self itemOfView:view) isNil])
-] whileTrue.
-prnt isNil ifTrue:[
-prnt := model root
-].
-model add:child below:prnt.
 !
 removeAll
 lastDrawnMaster := nil.
 self canvas subViews copy do:[:aView|
 (aView isKindOf:InputView) ifFalse:[aView destroy]
 ].
+model root name:(self class defaultNameOfCanvas).
 model root children:(OrderedCollection new).
 model recomputeList.
 self selection:nil.
 !
 removeView:aView
 "remove a view
 "
-|item spv|
+|item prnt|
-item := self itemOfView:aView.
+((item := self itemOfView:aView) notNil and:[(prnt := item parent) notNil]) ifTrue:[
-item notNil ifTrue:[
-spv := aView superView.
 aView destroy.
-spv sizeChanged:nil.
+prnt contents view sizeChanged:nil.
 model remove:item
 ]
 ! !
 "drop objects ? delegate to canvas
 "
 self canvas drop:anObjectOrCollection at:aPoint
 ! !
+!UIPainter::TreeView methodsFor:'enumerating'!
+allItemsDo:aOneArgBlock
+"evaluate the argument a block on each item other than the canvas
+"
+model root allChildrenDo:aOneArgBlock
+! !
 !UIPainter::TreeView methodsFor:'event processing'!
 cvsEventsDisabledDo:aBlock
 "evaluate the block without raising selection changed notifications
 to canvas
 "
 super initialize.
 self multipleSelectOk:true.
 self model:(SelectionInTree new).
 cvsEventsDisabled := false.
+imageMasterChild  := (self class imageMasterChild) onDevice:device.
+imageMasterParent := (self class imageMasterParent) onDevice:device.
+imageEmptyParent  := (self class imageEmptyParent)  onDevice:device.
 ! !
 !UIPainter::TreeView methodsFor:'private'!
-allItemsDo:aOneArgBlock
-"evaluate the argument a block on each item other than the canvas
-"
-model root allChildrenDo:aOneArgBlock
-!
 figureFor:aNode
 "returns image for an item; testing whether item is the first
 entry into the selection
 "
-|master|
+|master subComp|
+subComp := (aNode parent isNil or:[aNode contents spec class supportsSubComponents]).
 selection size == 0 ifFalse:[
 master := listOfNodes at:(selection first).
 aNode == master ifTrue:[
 lastDrawnMaster := master.
-aNode children size == 0 ifTrue:[
+subComp ifFalse:[^ imageMasterChild]
-imageMasterChild isNil ifTrue:[
+ifTrue:[^ imageMasterParent].
-imageMasterChild := (self class imageMasterChild) onDevice:device.
-].
-^ imageMasterChild
-].
-imageMasterParent isNil ifTrue:[
-imageMasterParent := (self class imageMasterParent) onDevice:device.
-].
-^ imageMasterParent
 ]
 ].
-^ super figureFor:aNode
+subComp ifFalse:[
+^ imageItem
+].
-!
+aNode hasChildren ifTrue:[
+aNode isExpandable ifTrue:[ ^ imageClosed ]
-itemOfView:aView
+ifFalse:[ ^ imageOpened ]
-"returns item assigned to view or nil
+].
-"
+^ imageEmptyParent
-aView notNil ifTrue:[
-self allItemsDo:[:anItem|
-(anItem contents view == aView) ifTrue:[^ anItem]
-]
-].
-^ nil
 !
 selectionChangedFrom:oldSelection
 "selection has changed. update master selection and raise notification
 to canvas in case of enabled cvs events
 "
-|sel|
+|sel size|
 super selectionChangedFrom:oldSelection.
+size := selection size.
 cvsEventsDisabled ifFalse:[
-selection notNil ifTrue:[
+(size ~~ 0 and:[size ~~ 1 or:[selection first ~~ 1]]) ifTrue:[
-sel := selection collect:[:i| (listOfNodes at:i) contents view].
+sel := OrderedCollection new.
-] ifFalse:[
-sel := #()
+selection do:[:i|
+i ~~ 1 ifTrue:[sel add:(listOfNodes at:i) contents view]
+]
 ].
-self canvas updateSelectionFromModel:sel.
+self canvas updateSelectionFromModel:sel
 ].
-selection size ~~ 0 ifTrue:[
+size ~~ 0 ifTrue:[
 sel := selection first.
 (listOfNodes at:sel) == lastDrawnMaster ifFalse:[
 self redrawLine:sel
 ]
 ]
 ! !
 !UIPainter::TreeView methodsFor:'queries'!
-canStepIn
+canMoveOrAlignSelection
-"returns true if can step in
+"returns true if any selection exists and all widgets in the selection
+can change their layout through to a move or align operation.
+"
+|canvas|
+selection size == 0 ifTrue:[
+^ false
+].
+canvas := self canvas.
+selection do:[:i|
+i == 1 ifTrue:[^ false].
+(canvas canChangeLayoutOfView:((listOfNodes at:i) contents view)) ifFalse:[
+^ false
+]
+].
+^ true
+!
+canMoveSelectionIntoContainer
+"returns true in case that one component is selected and can change its container
+widget to the next element in the list which will have the same container.
 "
 |item prnt|
 (     (item := self selectedNode) isNil
 or:[(prnt := item parent) isNil
 ^ false
 ].
 ^ true
 !
-canStepOut
+canMoveSelectionOutOfContainer
+"returns true in case that one component is selected which is contained within
+another component.
+"
 |item prnt|
 (     (item := self selectedNode) isNil
 or:[(prnt := item parent) isNil
 or:[prnt parent isNil]]
 ^ false
 ].
 ^ true
 !
-hasValidSelection
+hasOneSelectionOtherThanCanvas
-"returns true if any selection exists other than root
+"returns true in case that one selection exists other than the canvas
 "
-|size|
+^ (selection size == 1 and:[selection first ~~ 1])
-(size := selection size) > 1 ifFalse:[
-(size == 0 or:[self isInSelection:1]) ifTrue:[
-^ false
-]
-].
-^ true
 !
 isCanvasSelected
 "returns true in case of a single selection and the
 selection is the canvas (index 1)
 "
 ^ (selection size == 1 and:[self isInSelection:1])
+! !
+!UIPainter::TreeView methodsFor:'seraching'!
+detectItemRespondsToView:aView
+"detect the item responding to the view. The item of the view or the first
+subview providing the item is returned. If no property is detected nil is
+returned
+"
+|view item|
+(view := aView) notNil ifTrue:[
+[(item := self itemOfView:view) isNil] whileTrue:[
+(view := view superView) isNil ifTrue:[^ listOfNodes at:1]
+].
+].
+^ item
 ! !
 !UIPainter::TreeView methodsFor:'user interactions'!
 doStepIn
 !
 doStepOver:anIndex
 "move child 'anOffset' forward or backward in list of children
 "
-|item idx size prnt spVw view|
+|item idx size prnt spVw view canvas|
 (    (item := self selectedNode) isNil
 or:[(prnt := item parent) isNil
-or:[(size := prnt children size) < 2]]
+or:[(size := prnt children size) < 2
-) ifFalse:[
+or:[(idx  := prnt indexOfChild:item) == 0]]]
-idx := prnt indexOfChild:item.
+) ifTrue:[
+^ self
-model removeDependent:self.
+].
-model removeSelection.
+model removeDependent:self.
-selection := nil.
+model removeSelection.
-model addDependent:self.
+selection := nil.
-idx := idx + anIndex.
+model addDependent:self.
+idx := idx + anIndex.
-idx < 1 ifTrue:[idx := size]
-ifFalse:[idx > size ifTrue:[idx := 1]].
+idx < 1 ifTrue:[idx := size]
+ifFalse:[idx > size ifTrue:[idx := 1]].
-model add:item beforeIndex:idx below:prnt.
-idx  := prnt indexOfChild:item.
+model add:item beforeIndex:idx below:prnt.
-view := item contents view.
+idx    := prnt indexOfChild:item.
-spVw := view superView.
+view   := item contents view.
+spVw   := prnt contents view.
-"/ input view might by contained in sequence
+canvas := self canvas.
-((size := self canvas findInputViewIn:spVw) ~~ 0 and:[idx >= size]) ifTrue:[
-idx := idx + 1
+canvas hideSelection.
-].
-spVw changeSequenceOrderFor:view to:idx.
+"/ input view might by contained in sequence
+((size := canvas findInputViewIn:spVw) ~~ 0 and:[idx >= size]) ifTrue:[
-spVw specClass isLayoutContainer ifFalse:[
+idx := idx + 1
-spVw subViews do:[:v| v raise ].
+].
-self canvas inputView raise
+spVw changeSequenceOrderFor:view to:idx.
-].
-self selectNode:item.
+spVw specClass isLayoutContainer ifFalse:[
-]
+spVw subViews do:[:v| v raise ].
+canvas inputView raise
+].
+canvas showSelection.
+self selectNode:item.
 ! !
 !UIPainter class methodsFor:'documentation'!
 version

changeset 282	bb88d92ae887
parent 281	aabb4037f6a3
child 287	1ecabfd468dc