hg/stx-libtool2: comparison MenuEditor.st

equal deleted inserted replaced

-:930b778d5e28
+:11bbf4599843
 hereby transferred.
 "
-ToolApplicationModel subclass:#MenuEditor
+ListSpecEditor subclass:#MenuEditor
-	instanceVariableNames:'isModified specClass specCanvas helpCanvas tabSelection aspects
+	instanceVariableNames:'specCanvas helpCanvas slices'
-		slices didInstall'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
 SelectionInTreeView subclass:#TreeView
-	instanceVariableNames:'images'
+	instanceVariableNames:''
-	classVariableNames:'CopyBuffer Images'
+	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
 !MenuEditor class methodsFor:'documentation'!
 ^ self new openOnClass:aClass andSelector:aSelector
 ! !
+!MenuEditor class methodsFor:'accessing'!
+resourceType
+^#menu
+! !
+!MenuEditor class methodsFor:'aspects'!
+aspects
+^#(
+label
+accessCharacterPos
+argument
+submenuChannel
+enabled
+value
+nameKey
+indication
+translateLabel
+isButton
+shortcutKey
+startGroup
+retriever
+iconAndLabel
+icon
+isVisible
+)
+! !
 !MenuEditor class methodsFor:'code generation'!
 sourceCategory
 "returns the category where to install the menu
 "
 #filePickAMenu
 'Changes the cursor for moving it over another menu view to load its menu spec.'
 #fileSave
 'Saves current menu spec and if modified the help spec.'
+#fileSaveAs
+'Opens a dialog to save current menu spec and if modified the help spec.'
 #imageImageAndLabel
 'Turns on/off displaying both image and textual label.'
 #imageImageEditor
 )
 )
 )
 !
-classDefineSpec
-"this window spec was automatically generated by the ST/X UIPainter"
-"do not manually edit this - the painter/builder may not be able to
-handle the specification if its corrupted."
-"
-UIPainter new openOnClass:MenuEditor andSelector:#classDefineSpec
-MenuEditor new openInterface:#classDefineSpec
-"
-<resource: #canvas>
-^
-#(#FullSpec
-#'window:'
-#(#WindowSpec
-#'name:' 'Menu Editor'
-#'layout:' #(#LayoutFrame 262 0 426 0 508 0 519 0)
-#'label:' 'Menu Editor'
-#'min:' #(#Point 10 10)
-#'max:' #(#Point 1152 900)
-#'bounds:' #(#Rectangle 262 426 509 520)
-#'usePreferredExtent:' false
-)
-#'component:'
-#(#SpecCollection
-#'collection:'
-#(
-#(#LabelSpec
-#'name:' 'boxLabel'
-#'layout:' #(#LayoutFrame 2 0.0 4 0 -2 1.0 24 0)
-#'label:' 'Class for code:'
-#'adjust:' #left
-#'resizeForLabel:' true
-)
-#(#InputFieldSpec
-#'name:' 'classNameField'
-#'layout:' #(#LayoutFrame 2 0.0 27 0 -2 1.0 49 0)
-#'tabable:' true
-#'model:' #classNameChannel
-#'acceptOnReturn:' false
-#'acceptOnTab:' false
-)
-#(#UISubSpecification
-#'name:' 'SubSpecification'
-#'layout:' #(#LayoutFrame 0 0 -29 1 0 1 -5 1)
-#'majorKey:' #ToolApplicationModel
-#'minorKey:' #windowSpecForCommitWithoutChannels
-)
-)
-)
-)
-!
 detailsEditSpec
 "this window spec was automatically generated by the ST/X UIPainter"
 "do not manually edit this - the painter/builder may not be able to
 handle the specification if its corrupted."
 "
 <resource: #canvas>
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
 #'name:' 'unnamed canvas'
 #'layout:' #(#LayoutFrame 238 0 321 0 482 0 462 0)
 #'label:' 'Image & Label'
 )
 )
 )
 )
 !
 windowSpec
 "this window spec was automatically generated by the ST/X UIPainter"
 #'label:' '-'
 )
 #(#MenuItem
 #'label:' 'Load...'
 #'translateLabel:' true
-#'value:' #doFromClass
+#'value:' #doLoad
 #'activeHelpKey:' #fileLoad
 #'enabled:' #isStandAlone
 )
 #(#MenuItem
 #'label:' '-'
 )
 #(#MenuItem
 #'label:' 'Save'
-#'value:' #doInstallSpec
+#'value:' #doSave
 #'activeHelpKey:' #fileSave
+)
+#(#MenuItem
+#'label:' 'Save As...'
+#'value:' #doSaveAs
+#'activeHelpKey:' #fileSaveAs
 )
 #(#MenuItem
 #'label:' '-'
 )
 #(#MenuItem
-#'label:' 'Pick A Menu'
+#'label:' 'Pick A Menu...'
 #'value:' #doPickAMenu
 #'activeHelpKey:' #filePickAMenu
 #'enabled:' #isStandAlone
 )
 #(#MenuItem
-#'label:' 'Define Class...'
+#'label:' '-'
-#'value:' #doDefineClass
-#'activeHelpKey:' #fileDefineClass
-#'enabled:' #isStandAlone
 )
 #(#MenuItem
 #'label:' 'Browse Class'
-#'value:' #doBrowseAppClass
+#'value:' #doBrowseClass
 #'activeHelpKey:' #fileBrowseClass
 )
 #(#MenuItem
 #'label:' '-'
 )
 )
 #(#MenuItem
 #'label:' 'Move Up'
 #'value:' #doStepUp
 #'activeHelpKey:' #editMoveUp
-#'enabled:' #enabledStepOver
+#'enabled:' #valueOfEnableMovingUp
 #'labelImage:' #(#ResourceRetriever #ToolApplicationModel #upIcon 'Move Up')
 )
 #(#MenuItem
 #'label:' 'Move Down'
 #'value:' #doStepDown
 #'activeHelpKey:' #editMoveDown
-#'enabled:' #enabledStepOver
+#'enabled:' #valueOfEnableMovingDown
 #'labelImage:' #(#ResourceRetriever #ToolApplicationModel #downIcon 'Move Down')
 )
 #(#MenuItem
 #'label:' 'Move In'
 #'value:' #doStepIn
 #'activeHelpKey:' #editMoveIn
-#'enabled:' #enabledStepIn
+#'enabled:' #valueOfEnableMovingIn
 #'labelImage:' #(#ResourceRetriever #ToolApplicationModel #downRightIcon 'Move In')
 )
 #(#MenuItem
 #'label:' 'Move Out'
 #'value:' #doStepOut
 #'activeHelpKey:' #editMoveOut
-#'enabled:' #enabledStepOut
+#'enabled:' #valueOfEnableMovingOut
 #'labelImage:' #(#ResourceRetriever #ToolApplicationModel #leftDownIcon 'Move Out')
 )
 ) nil
 nil
 )
 #'labelImage:' #(#ResourceRetriever nil #newIcon)
 )
 #(#MenuItem
 #'label:' 'Load'
 #'isButton:' true
-#'value:' #doFromClass
+#'value:' #doLoad
 #'activeHelpKey:' #fileLoad
 #'labelImage:' #(#ResourceRetriever nil #loadIcon)
 )
 #(#MenuItem
 #'label:' 'Save'
 #'isButton:' true
-#'value:' #doInstallSpec
+#'value:' #doSave
 #'activeHelpKey:' #fileSave
 #'labelImage:' #(#ResourceRetriever nil #saveIcon)
 )
 #(#MenuItem
 #'label:' ''
 #(#MenuItem
 #'label:' 'Move Up'
 #'isButton:' true
 #'value:' #doStepUp
 #'activeHelpKey:' #editMoveUp
-#'enabled:' #enabledStepOver
+#'enabled:' #valueOfEnableMovingUp
 #'labelImage:' #(#ResourceRetriever nil #upIcon)
 )
 #(#MenuItem
 #'label:' 'Move Down'
 #'isButton:' true
 #'value:' #doStepDown
 #'activeHelpKey:' #editMoveDown
-#'enabled:' #enabledStepOver
+#'enabled:' #valueOfEnableMovingDown
 #'labelImage:' #(#ResourceRetriever nil #downIcon)
 )
 #(#MenuItem
 #'label:' 'Move In'
 #'isButton:' true
 #'value:' #doStepIn
 #'activeHelpKey:' #editMoveIn
-#'enabled:' #enabledStepIn
+#'enabled:' #valueOfEnableMovingIn
 #'labelImage:' #(#ResourceRetriever nil #downRightIcon)
 )
 #(#MenuItem
 #'label:' 'Move Out'
 #'isButton:' true
 #'value:' #doStepOut
 #'activeHelpKey:' #editMoveOut
-#'enabled:' #enabledStepOut
+#'enabled:' #valueOfEnableMovingOut
 #'labelImage:' #(#ResourceRetriever nil #leftDownIcon)
 )
 ) nil
 nil
 )
 ! !
 !MenuEditor methodsFor:'accessing'!
-isModified: aBoolean
-"sets menu tree modifications; invoked by the painter."
-isModified := aBoolean
-!
-specClass
-^specClass
-!
-specClass:aClass
-aClass isBehavior ifTrue:[specClass := aClass name]
-ifFalse:[specClass := aClass]
-!
 submenuTest
 "returns submenu assigned to item test"
 |menu|
 self helpTool dictionary:aDictionary
 ! !
 !MenuEditor methodsFor:'aspects'!
-aspectFor:aKey
-"returns aspect for a key or nil"
-^aspects at: aKey ifAbsent: [super aspectFor:aKey]
-!
-enabledStepIn
-"returns whether user can put selected item in next submenu"
-^builder booleanValueAspectFor: #enabledStepIn
-!
-enabledStepOut
-"returns whether user can put selected item out of current parent submenu"
-^builder booleanValueAspectFor: #enabledStepOut
-!
-enabledStepOver
-"returns whether user can shift selected item up or down"
-^builder booleanValueAspectFor:#enabledStepOver
-!
 hasAnySingleSelection
 ^builder booleanValueAspectFor: #hasAnySingleSelection
 !
 (holder := builder bindingAt:#tabList) isNil ifTrue:[
 builder aspectAt:#tabList put:(holder := #('Properties') asValue).
 ].
 ^ holder
-!
-tabModel
-|holder|
-(holder := builder bindingAt:#tabModel) isNil ifTrue:[
-holder := AspectAdaptor new subject:self; forAspect:#tabSelection.
-builder aspectAt:#tabModel put:holder.
-].
-^ holder
 !
 treeView
 "returns the tree view representing hierarchically all the menu items"
 ].
 ^treeView
 ! !
 !MenuEditor methodsFor:'change & update'!
-update:something with:aParameter from:changedObject
-"one of my value holders has changed its value, so let me set the editing menu as modified"
-self valueOfEnablingCommitButtons value: true
-!
 updateEnabledChannels
 "update enabled channels"
 |node parent next state|
 self hasAnySingleSelection value:true.
 (parent := node parent) notNil
 ifTrue:
 [
 next := parent childAt:((parent indexOfChild:node) + 1).
-self enabledStepIn           value:(next notNil and:[next hasChildren]).
+self valueOfEnableMovingIn       value:(next notNil and:[next hasChildren]).
-self enabledStepOver         value:(parent children size > 1).
+self valueOfEnableMovingUpOrDown value:(parent children size > 1).
-self enabledStepOut          value:(parent parent notNil).
+self valueOfEnableMovingOut      value:parent parent notNil.
-self hasValidSingleSelection value:true.
+self hasValidSingleSelection     value:true.
-self hasValidSelection       value:true.
+self hasValidSelection           value:true.
 ^ self
 ]
 ]
 ifFalse:
 [
 self hasAnySingleSelection value:false.
 self treeView numberOfSelections ~~ 0 ifTrue:[
 state := (self treeView isInSelection:1) not
 ]
 ].
-self enabledStepOver         value:false.
+self valueOfEnableMovingUpOrDown value:false.
-self enabledStepIn           value:false.
+self valueOfEnableMovingIn       value:false.
-self enabledStepOut          value:false.
+self valueOfEnableMovingOut      value:false.
-self hasValidSingleSelection value:false.
+self hasValidSingleSelection     value:false.
-self hasValidSelection       value:state.
+self hasValidSelection           value:state.
 ! !
 !MenuEditor methodsFor:'event handling'!
 doesNotUnderstand: aMessage
 ! !
 !MenuEditor methodsFor:'help'!
-defaultInfoLabel
-specClass isNil ifTrue: [^'No menu class defined'].
-^specClass printString, ' >> ', self treeView selectorName
-!
 openTutorial
 self openTutorial: 'tools/MenuEditor/TOP.html'.
 ! !
+!MenuEditor methodsFor:'initialization'!
+initialize
+"initialize value holders for the menu item properties"
+|holder|
+super initialize.
+aspects at:#seperatorSelection put:(holder := SelectionInList new).
+holder list: Item separatorList.
+holder addDependent:self.
+! !
 !MenuEditor methodsFor:'private'!
-checkMenuItemModified
-"check menu item modification"
-self valueOfEnablingCommitButtons value
-ifTrue:
-[
-((YesNoBox title:'Menu item was modified!!\Save it?\' withCRs)
-noText:'No';
-yesText:'Yes';
-showAtPointer;
-accepted)
-ifFalse:
-[
-self valueOfEnablingCommitButtons value: false.
-isModified := false.
-^true
-].
-self accept
-].
-^true
-!
 helpKey
 |node|
 (node := self treeView selectedNode) notNil ifTrue:[
 ^helpCanvas application
 ! !
 !MenuEditor methodsFor:'queries'!
-didInstall
-"returns true if the menu was installed"
-^didInstall
-!
 isHelpToolSelected
 "returns true if current selection is help tool"
 (tabSelection ~~ 0 and:[slices notNil]) ifTrue:[
 ].
 self updateEnabledChannels.
 aspects do: [:holder| holder addDependent:self].
 !
-tabSelection
-^tabSelection ? 0
-!
 tabSelection: aSelection
 |sel|
 tabSelection = aSelection ifTrue:[
 ^ self
 ].
 (aSelection ~~ 0 and:[slices isNil]) ifTrue:[
 ^ self
 !MenuEditor methodsFor:'startup / release'!
 buildFrom:aClass andSelector:aSelector
-|oldClass newClass|
+|oldClass|
 self valueOfEnablingCommitButtons value: false.
 oldClass := self specClass.
 self specClass:aClass.
-newClass := self specClass.
+specSelector := aSelector.
-(self isStandAlone and:[oldClass ~= newClass]) ifTrue:[
+(self isStandAlone and:[oldClass ~= specClass]) ifTrue:[
-self helpTool helpSpecFrom:newClass
+self helpTool helpSpecFrom:specClass
 ].
-self treeView buildFrom: newClass andSelector: aSelector.
+self treeView buildFrom: specClass andSelector: specSelector.
-aClass notNil & aSelector notNil
+self updateHistory.
-ifTrue:
-[
-|className message|
-aClass isClass ifTrue: [className := aClass name].
-aClass isString ifTrue: [className := aClass].
-message := className, ' ', aSelector.
-self addToHistory: message -> #loadFromMessage:
-].
 self updateInfoLabel.
 self treeView selection: 2.
 self menuChanged
 !
-checkModified
-"check menu modification
-"
-isModified
-ifTrue:
-[
-((YesNoBox title:'Menu was modified!!')
-noText:'Cancel';
-yesText:'Waste it and proceed';
-showAtPointer;
-accepted) ifFalse: [^false].
-isModified := false
-].
-^true
-!
-closeRequest
-"close request"
-(self checkMenuItemModified and: [self checkModified]) ifTrue: [super closeRequest]
-!
-initialize
-"initialize value holders for the menu item properties"
-|holder|
-super initialize.
-aspects := IdentityDictionary new.
-tabSelection := 0.
-#(
-label
-accessCharacterPos
-argument
-submenuChannel
-enabled
-value
-nameKey
-indication
-translateLabel
-isButton
-shortcutKey
-startGroup
-retriever
-iconAndLabel
-icon
-isVisible
-) do:[:aKey|
-aspects at:aKey put:(holder := ValueHolder new).
-holder addDependent: self
-].
-aspects at:#seperatorSelection put:(holder := SelectionInList new).
-holder list: Item separatorList.
-holder addDependent:self.
-!
-loadFromMessage: aMessage
-(((aMessage size > 0) and: [self checkMenuItemModified]) and: [self checkModified])
-ifTrue:
-[
-|readStream aClass aSelector|
-readStream := aMessage readStream.
-aClass := Smalltalk at: (readStream upTo: $ ) asSymbol.
-aSelector :=  readStream upToEnd asSymbol.
-self buildFrom: aClass andSelector: aSelector
-]
-!
 openModalOnClass:aClass andSelector:aSelector
 specClass := Association key:aClass value:aSelector.
 super openInterfaceModal.
 postBuildWith:builder
 |cls sel|
 super postBuildWith:builder.
-didInstall := false.
-isModified := false.
 specClass isAssociation ifTrue:[
 cls := specClass key.
 sel := specClass value.
 self isHelpToolSelected
 ifTrue:  [helpCanvas raise]
 ifFalse: [specCanvas raise]
 ! !
-!MenuEditor methodsFor:'user interactions'!
+!MenuEditor methodsFor:'user actions'!
 accept
 "invoked by button 'OK' and by save requests of menu item changes"
 |node|
 node := self treeView selectedNode.
 node notNil
 ifTrue:
 [
 self isHelpToolSelected
 self helpTool accept.
 node contents activeHelpKey: self helpTool helpKey
 ]
 ifFalse:
 [
-self treeView updateNode: (node contents buildFromAspects: aspects)
+node contents buildFromAspects: aspects.
+node changed.
+specSelector := self treeView selectorName.
 ]
 ].
 self valueOfEnablingCommitButtons value:false.
-isModified := true
+modified := true
 !
 cancel
 "invoked by button 'Cancel'"
 self helpTool helpKey:(self helpKey).
 aspects do:[:anAspect| anAspect value:nil].
 node contents toAspects:aspects
 ].
 self valueOfEnablingCommitButtons value: false.
-isModified := false
+modified := false
 !
-doBrowseAppClass
+doNew
-"open a browser on the class"
+self buildFrom: nil andSelector: self treeView selectorName
-|cls|
+!
-(cls := self resolveName: self specClass) notNil
+doPickAMenu
-ifTrue:
-[
+|view|
-SystemBrowser openInClass:cls class selector: self treeView selectorName
-]
+view := Screen current viewFromUser.
-ifFalse:
-[
+(view isNil or:[view == Screen current rootView]) ifTrue:[
-self information:'No valid class defined!!'.
+^ self
-]
+].
-!
+view specClass == MenuPanelSpec ifTrue:[
+^ self treeView buildFromMenu: view asMenu
-doDefineClass
+].
+^ nil
-aspects at:#classNameChannel  put:(self specClass asValue).
+!
-(self openDialogInterface:#classDefineSpec) ifTrue:[
+doSave
-self specClass:((aspects at:#classNameChannel) value)
+|cls treeView menu spec mthd category code|
-].
+cls := self resolveName:(self specClass).
-!
-doEditImage
-|cls resourceClass resourceSelector imageResourceMessage readStream|
-cls := self resolveName: self specClass.
 cls isNil ifTrue:[
 ^ self information:'No valid class defined!!'.
 ].
-(aspects at:#icon) value size > 0
-ifTrue:  [resourceSelector := (aspects at:#icon) value]
+treeView := self treeView.
-ifFalse: [resourceSelector := #stxIcon].
-(aspects at:#retriever) value size > 0
-ifTrue:  [resourceClass := (aspects at:#retriever) value]
-ifFalse: [resourceClass := cls withAllSuperclasses detect: [:cls| cls class implements: resourceSelector] ifNone: [cls]].
-(imageResourceMessage := ImageEditor openModalOnClass: resourceClass andSelector: resourceSelector) notNil
-ifTrue:
-[
-readStream := imageResourceMessage readStream.
-resourceClass := (readStream upTo: $ ) asSymbol.
-resourceSelector := readStream upToEnd asSymbol.
-resourceClass size > 0 ifTrue: [(aspects at:#retriever) value: resourceClass].
-resourceSelector size > 0 ifTrue: [(aspects at:#icon) value: resourceSelector. self valueOfEnablingCommitButtons value: true]
-]
-!
-doFromClass
-self loadFromMessage:
-(ResourceSelectionBrowser
-request: 'Load Menu From Class'
-onSuperclass: nil
-andClass: specClass
-andSelector: self treeView selectorName
-withResourceTypes: #(menu))
-!
-doInstallSpec
-|cls selector treeView menu spec mthd category code|
-cls := self resolveName:(self specClass).
-cls isNil ifTrue:[
-^ self information:'No valid class defined!!'.
-].
-treeView  := self treeView.
-selector := treeView selectorName.
 menu     := treeView asMenu.
 menu isNil ifTrue:[
 ^ self information:'No menu defined!!'
 ].
 spec := spec contents.
 "/ if that method already exists, do not overwrite the category
 category := 'menu specs'.
-(mthd := cls class compiledMethodAt:selector) notNil ifTrue:[
+(mthd := cls class compiledMethodAt:specSelector) notNil ifTrue:[
 category := mthd category.
 ].
 code := Character excla asString
 , cls name , ' class methodsFor:' , category storeString
 , Character excla asString , '\\'
-, selector , '\'
+, specSelector , '\'
 , '    "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:' , cls name , ' andSelector:#' , selector , '\'
+, '     MenuEditor new openOnClass:' , cls name , ' andSelector:#' , specSelector , '\'
-, '     (Menu new fromLiteralArrayEncoding:(' , cls name , ' ' , selector , ')) startUp\'
+, '     (Menu new fromLiteralArrayEncoding:(' , cls name , ' ' , specSelector , ')) startUp\'
 , '    "\'.
 code := code
 , '\'
 , '    <resource: #menu>\\'
 (ReadStream on:code) fileIn.
 self isStandAlone ifTrue:[
 self helpTool installHelpSpecInto:(self specClass)
 ].
-didInstall := true.
+self updateHistory.
-isModified := false.
+hasSaved := true.
+modified := false.
-!
+!
-doNew
+doSaveAs
-self buildFrom:nil andSelector: self treeView selectorName
-!
+super doSaveAs.
-doPickAMenu
+self treeView selectorName: specSelector
-|view|
-view := Screen current viewFromUser.
-(view isNil or:[view == Screen current rootView]) ifTrue:[
-^ self
-].
-view specClass == MenuPanelSpec ifTrue:[
-^ self treeView buildFromMenu: view asMenu
-].
-^ nil
 !
 doStepDown
 "shift selected menu item one step down"
 self treeView selectedNodeChangeSequenceOrder:1.
-isModified := true.
+modified := true.
 !
 doStepIn
 "move selected menu item into next submenu"
 self treeView selectedNodeBecomeChildOfNext.
-isModified := true.
+modified := true.
 doStepOut
 "move selected menu item out from parent submenu"
 self treeView selectedNodeBecomeSisterOfParent.
-isModified := true.
+modified := true.
 !
 doStepUp
 "shift selected menu item one step up"
 self treeView selectedNodeChangeSequenceOrder:-1.
-isModified := true.
+modified := true.
 ! !
 !MenuEditor::Item class methodsFor:'constants'!
 separatorList
 ! !
 !MenuEditor::Item methodsFor:'queries'!
+iconFor: aNode
+aNode hasChildren
+ifTrue:
+[
+^MenuEditor submenuImage
+]
+ifFalse:
+[
+submenuChannel notNil
+ifTrue:
+[
+^MenuEditor linkSubmenuImage
+]
+ifFalse:
+[
+self isSeparator
+ifTrue:  [^MenuEditor menuSeparatorImage]
+ifFalse: [^MenuEditor menuItemImage]
+]
+]
+!
 isSeparator
 "returns true if item is a seperator"
 ^self separatorType notNil
-! !
+!
-!MenuEditor::TreeView class methodsFor:'defaults'!
+treeViewLabel
-defaultMenuMessage
+^label asBoldText,
-"this message is the default yo be sent to the menuHolder to get a menu"
+(value notNil ifTrue: [': [',
+value ,
-^#menu
+(argument notNil ifTrue: [' ', (Text string: argument emphasis: #italic)] ifFalse: ['']),
+']'] ifFalse: [''])
 ! !
 !MenuEditor::TreeView class methodsFor:'documentation'!
 documentation
 "
 ! !
-!MenuEditor::TreeView class methodsFor:'initialization'!
-initialize
-super initialize.
-Images := nil
-! !
-!MenuEditor::TreeView class methodsFor:'resources'!
-images
-"returns an IdentityDictionary containing a list of images and keys used
-"
-^ Images ?
-(Images := IdentityDictionary new
-at: #menuItemImage      put: MenuEditor menuItemImage;
-at: #menuSeparatorImage put: MenuEditor menuSeparatorImage;
-at: #submenuImage       put: MenuEditor submenuImage;
-at: #linkSubmenuImage   put: MenuEditor linkSubmenuImage;
-yourself)
-! !
 !MenuEditor::TreeView methodsFor:'accessing'!
 selectorName
-^ (listOfNodes first contents label) asSymbol
+^(listOfNodes first contents label) asSymbol
+!
+selectorName: aSymbol
+listOfNodes first contents label: aSymbol
 ! !
 !MenuEditor::TreeView methodsFor:'building'!
 buildFrom:aClass andSelector:aSelector
 aSelector notNil ifTrue:[cls := aSelector asString]
 ifFalse:[cls := 'menu'].
 node := self nodeLabel:cls.
 ].
-node hasChildren ifFalse:[
-node add:(self nodeLabel:'Item 1')
-].
 node expand.
 model root:node.
+node hasChildren ifFalse:[
+|n|
+n := self nodeLabel:'Item 1'.
+n parent: node.
+node add: n.
+node icon: nil.
+model recomputeList
+].
 !
 buildFromMenu:aMenu
 |node|
 |node|
 node := self nodeLabel: anItem label.
 node contents buildFromMenuItem:anItem.
-node name: node contents label.
 self subMenu: anItem submenu parent:node.
 ^node.
 !
 y := yCenter + 2.
 self displayLineFromX:x y:y toX:x2 y:y.
 ]
 ]
 ]
-!
-figureFor:aNode
-"access figure for a node"
-aNode hasChildren
-ifFalse:
-[
-|item|
-(item := aNode contents) submenuChannel notNil ifTrue:[^images at: #linkSubmenuImage].
-item isSeparator ifTrue:[^images at: #menuSeparatorImage].
-^images at: #menuItemImage
-].
-^images at: #submenuImage
 ! !
 !MenuEditor::TreeView methodsFor:'event handling'!
 keyPress:key x:x y:y
 ! !
 !MenuEditor::TreeView methodsFor:'initialization'!
-fetchImageResources
-"initialize heavily used device resources - to avoid rendering
-images again and again later; returns maximum extent of the images used."
-|defaultExtent imageWidth imageHeight maxWidth maxHeight|
-defaultExtent := super fetchImageResources.
-maxHeight := defaultExtent y.
-maxWidth := defaultExtent x.
-images do:
-[:anIcon|
-(imageWidth  := anIcon widthOn:self)  > maxWidth  ifTrue:[maxWidth  := imageWidth].
-(imageHeight := anIcon heightOn:self) > maxHeight ifTrue:[maxHeight := imageHeight].
-].
-^maxWidth@maxHeight
-!
 initialize
 super initialize.
-images := IdentityDictionary new.
-self class images associationsDo:[:imageAsso|images at: imageAsso key put:(imageAsso value onDevice:device)].
 self multipleSelectOk:true.
 self showDirectoryIndicator: true.
 self showDirectoryIndicatorForRoot: false.
 self selectConditionBlock: [:i|self application checkMenuItemModified].
 self validateDoubleClickBlock: [:node| node ~~ listOfNodes first].
+self model iconAction: [:aNode| aNode contents iconFor: aNode].
+self model labelAction: [:aNode| aNode contents treeViewLabel]
 ! !
 !MenuEditor::TreeView methodsFor:'menus'!
 doCopy
 self hasSelection ifTrue:[
-CopyBuffer := OrderedCollection new.
+self application clipboard: OrderedCollection new.
-self selectionDo:[:i| CopyBuffer add:((listOfNodes at:i) copy)]
+self selectionDo:[:i| self application clipboard add:((listOfNodes at:i) copy)]
 ]
 !
 doCreateItem
 doCreateMenu
 |node|
 node := self nodeLabel:'Submenu'.
+node parent: self selectedNode.
 node add:(self nodeLabel:'Item 1').
 self addElement:node
 !
 doCreateSep
 !
 doPaste
-(CopyBuffer notNil and:[self selectedNode notNil]) ifTrue:[
+(self application clipboard notNil and:[self selectedNode notNil]) ifTrue:[
-self addElement:(CopyBuffer collect:[:el| el copy])
+self addElement:(self application clipboard collect:[:el| el copy])
 ].
 ! !
 !MenuEditor::TreeView methodsFor:'private'!
 addElement: aNode
 "add something after selection"
 self checkMenuItemModified
 ifTrue:
 [
+self selectedNodeAdd: aNode.
 (aNode isCollection not and: [aNode name = 'Item'])
 ifTrue:
 [
 |label|
 label := aNode name, ' ',
-(self selectedNode parent notNil ifTrue:
+(self selectedNode parent notNil
-[(((self selectedNode children size = 0 ifTrue: [self selectedNode parent children] ifFalse: [self selectedNode children]) select: [:node|
+ifTrue:
-|lab| lab := node contents label. ((node children size = 0) & node contents submenuChannel isNil & (lab ~= '-') & (lab ~= '=') & (lab ~= ''))]) size + 1) printString] ifFalse: ['1']).
+[
-aNode name: label.
+(((self selectedNode children size = 0
-aNode contents label: label.
+ifTrue: [self selectedNode parent children]
-].
+ifFalse: [self selectedNode children]) select:
-self selectedNodeAdd: aNode.
+[:node|
+|lab|
+lab := node contents label.
+((node children size = 0) &
+node contents submenuChannel isNil &
+(lab ~= '-') & (lab ~= '=') & (lab ~= ''))
+]) size) printString]
+ifFalse: ['1']).
+aNode name: label string asBoldText.
+aNode contents label: label string.
+].
 aNode isCollection ifFalse: [self selectNode: aNode] ifTrue: [self selection: (aNode collect: [:node| self indexOfNode: node])].
 self setModified.
 ]
 !
 checkMenuItemModified
-^self topView application checkMenuItemModified
+^self topView application checkItemModified
 !
 nodeLabel:aLabel
-^TreeItem name:aLabel contents: (MenuEditor::Item new label:aLabel)
+^TreeItem new contents: (MenuEditor::Item new label:aLabel)
 !
 selectedNodeAdd:something
 |node|
 !
 setModified
-self topView application isModified: true.
+self topView application modified: true.
 self topView application updateEnabledChannels
-! !
-!MenuEditor::TreeView methodsFor:'selection'!
-updateNode: aNode
-|name treeItem index|
-name := aNode label.
-treeItem := listOfNodes detect: [:n| n contents = aNode] ifNone: [1].
-index := self indexOfNode: treeItem.
-treeItem name: name.
-self redrawLine: index.
-! !
-!MenuEditor::TreeView methodsFor:'startup / release'!
-destroy
-"destroy images"
-super destroy.
-Images := nil
 ! !
 !MenuEditor class methodsFor:'documentation'!
 version

changeset 633	11bbf4599843
parent 627	e28ca0319230
child 634	ebc0beb615c5