hg/stx-libtool2: comparison MenuEditor.st

equal deleted inserted replaced

-:bbe063ccf4a3
+:638ae95885e1
 !
 documentation
 "
-create and modify or inspect popup and pullDown menus of the
+The MenuEditor allows you to create, modify or just inspect
-new style( derives from Menu).
+hierarchical menus of menu bars, popup menu, or tool bar menus.
 [start with:]
 MenuEditor open
-MenuEditor new openOnClass:MenuEditor andSelector:#menuPullDown
+MenuEditor openOnClass:MenuEditor andSelector:#menu
 [see also:]
 UIPainter
-UIHelpTool
-UISpecificationTool
-SelectionInTreeView
 [author:]
 Claus Atzkern, eXept Software AG
 Thomas Zwick, eXept Software AG
 "
 ! !
-!MenuEditor class methodsFor:'initialization'!
-initialize
-super initialize.
-TreeView initialize
-! !
 !MenuEditor class methodsFor:'instance creation'!
 openModalOnClass:aClass andSelector:aSelector
-^ self new openModalOnClass:aClass andSelector:aSelector
+"Open modal a MenuEditor on aClass and aSelector"
+"self openModalOnClass:self andSelector:#menu"
+^self new openModalOnClass:aClass andSelector:aSelector
+!
+openModalOnMenu: aMenu
+"Open a MenuEditor modal on aMenu"
+"self openModalOnMenu: (self perform: #menu) decodeAsLiteralArray"
+^self new openModalOnMenu: aMenu
 !
 openOnClass:aClass andSelector:aSelector
-^ self new openOnClass:aClass andSelector:aSelector
+"Open a MenuEditor on aClass and aSelector"
+"self openOnClass:self andSelector:#menu"
+^self new openOnClass:aClass andSelector:aSelector
 ! !
 !MenuEditor class methodsFor:'accessing'!
 resourceType
+"get the type of resource of the method generated by the MenuEditor"
 ^#menu
 ! !
 !MenuEditor class methodsFor:'aspects'!
 aspects
+"get the aspects for the attributes of the menu components"
-^#(
+^#(
 label
 accessCharacterPos
 argument
 submenuChannel
 enabled
 startGroup
 retriever
 iconAndLabel
 icon
 isVisible
 )
-! !
-!MenuEditor class methodsFor:'code generation'!
-sourceCategory
-"returns the category where to install the menu
-"
-^ 'accessing menu'
 ! !
 !MenuEditor class methodsFor:'help specs'!
 helpSpec
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Basics Item'
-#layout: #(#LayoutFrame 72 0 301 0 338 0 619 0)
+#layout: #(#LayoutFrame 212 0 351 0 478 0 669 0)
-#label: 'unnamed canvas'
+#label: 'Basics Item'
 #min: #(#Point 10 10)
 #max: #(#Point 1160 870)
-#bounds: #(#Rectangle 72 301 339 620)
+#bounds: #(#Rectangle 212 351 479 670)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #acceptOnReturn: false
 #acceptOnTab: false
 )
 #(#CheckBoxSpec
 #name: 'translateLabelCheckBox'
-#layout: #(#Point 20 192)
+#layout: #(#Point 20 190)
 #activeHelpKey: #basicsTranslateLabel
 #tabable: true
 #model: #translateLabel
 #label: 'Translate Label'
 )
 #(#CheckBoxSpec
 #name: 'isButtonCheckBox'
-#layout: #(#Point 20 221)
+#layout: #(#Point 20 219)
 #activeHelpKey: #basicsIsButton
 #tabable: true
 #model: #isButton
 #label: 'Is Button'
 )
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Basics Link'
-#layout: #(#LayoutFrame 478 0 279 0 744 0 597 0)
+#layout: #(#LayoutFrame 212 0 351 0 478 0 669 0)
-#label: 'unnamed canvas'
+#label: 'Basics Link'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 478 279 745 598)
+#bounds: #(#Rectangle 212 351 479 670)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #acceptOnReturn: false
 #acceptOnTab: false
 )
 #(#CheckBoxSpec
 #name: 'translateLabelCheckBox'
-#layout: #(#Point 20 128)
+#layout: #(#Point 20 190)
 #activeHelpKey: #basicsTranslateLabel
 #tabable: true
 #model: #translateLabel
 #label: 'Translate Label'
 )
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Basics Menu'
-#layout: #(#LayoutFrame 484 0 274 0 750 0 592 0)
+#layout: #(#LayoutFrame 212 0 351 0 478 0 669 0)
-#label: 'unnamed canvas'
+#label: 'Basics Menu'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 484 274 751 593)
+#bounds: #(#Rectangle 212 351 479 670)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #acceptOnReturn: false
 #acceptOnTab: false
 )
 #(#CheckBoxSpec
 #name: 'translateLabelCheckBox'
-#layout: #(#Point 20 100)
+#layout: #(#Point 20 190)
 #activeHelpKey: #basicsTranslateLabel
 #tabable: true
 #model: #translateLabel
 #label: 'Translate Label'
 )
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Basics Root'
-#layout: #(#LayoutFrame 448 0 290 0 714 0 608 0)
+#layout: #(#LayoutFrame 424 0 293 0 690 0 611 0)
-#label: 'unnamed canvas'
+#label: 'Basics Root'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 448 290 715 609)
+#bounds: #(#Rectangle 424 293 691 612)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Basics Separator'
-#layout: #(#LayoutFrame 467 0 304 0 733 0 622 0)
+#layout: #(#LayoutFrame 297 0 354 0 563 0 672 0)
-#label: 'unnamed canvas'
+#label: 'Basics Separator'
 #min: #(#Point 10 10)
 #max: #(#Point 1160 870)
-#bounds: #(#Rectangle 467 304 734 623)
+#bounds: #(#Rectangle 297 354 564 673)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #label: 'Visibility:'
 #adjust: #right
 #resizeForLabel: true
 )
 #(#InputFieldSpec
-#name: 'isVisibleInputField'
+#name: 'visibilityInputField'
 #layout: #(#LayoutFrame 132 0 65 0 -5 1.0 87 0)
 #activeHelpKey: #detailsVisibility
 #tabable: true
 #model: #isVisible
 #type: #symbolOrNil
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Details Edit'
-#layout: #(#LayoutFrame 449 0 329 0 707 0 616 0)
+#layout: #(#LayoutFrame 263 0 364 0 521 0 651 0)
-#label: 'unnamed canvas'
+#label: 'Details Edit'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 449 329 708 617)
+#bounds: #(#Rectangle 263 364 522 652)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 ^
 #(#FullSpec
 #window:
 #(#WindowSpec
-#name: 'unnamed canvas'
+#name: 'Image Item'
-#layout: #(#LayoutFrame 462 0 313 0 706 0 454 0)
+#layout: #(#LayoutFrame 263 0 364 0 507 0 505 0)
-#label: 'unnamed canvas'
+#label: 'Image Item'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 462 313 707 455)
+#bounds: #(#Rectangle 263 364 508 506)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #labelImage: #(#ResourceRetriever nil #menuIcon)
 #submenuChannel: #menuAbout
 )
 #(#MenuItem
 #label: 'File'
-#translateLabel: true
 #activeHelpKey: #file
 #submenu:
 #(#Menu
 #(
 #(#MenuItem
 #label: 'Load...'
 #translateLabel: true
 #value: #doLoad
 #activeHelpKey: #fileLoad
-#enabled: #isStandAlone
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 )
 #(#MenuItem
 #label: 'Pick A Menu...'
 #value: #doPickAMenu
 #activeHelpKey: #filePickAMenu
-#enabled: #isStandAlone
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 )
 ! !
 !MenuEditor class methodsFor:'resources'!
+iconUnknown
+"returns an image used for picked items containing an image
+"
+<resource: #fileImage>
+^ Image fromFile:'brokenImage.xpm'
+!
 linkSubmenuImage
 "Generated by the Image Editor"
 "
 ImageEditor openOnClass:self andSelector:#linkSubmenuImage
 "
 ! !
 !MenuEditor methodsFor:'accessing'!
 submenuTest
-"returns submenu assigned to item test"
+"return submenu assigned to item test"
 |menu|
 (menu := self treeView asMenu) allItemsDo:
 [:anItem|
 ].
 ^menu
 !
 useHelpTool: aHelpTool
+"take the help dictionaries from aHelpTool into my helpTool"
 self noteBookView.
 self helpTool helpSpecFrom: aHelpTool specClass.
 self helpTool dictionaries: aHelpTool dictionaries.
 ^builder booleanValueAspectFor: #hasValidSingleSelection
 !
 noteBookView
+"create the note book view containing the attibute sections and the help tool"
 |noteBook helpTool|
 (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
 noteBook := View new.
 ].
 ^ noteBook
 !
 tabList
+"get a value holder with the list of the attribute sections (slices)"
 |holder|
 (holder := builder bindingAt:#tabList) isNil ifTrue:[
-builder aspectAt:#tabList put:(holder := #('Properties') asValue).
+builder aspectAt:#tabList put:(holder := self class slicesRootMenu asValue).
 ].
 ^ holder
 !
 treeView
-"returns the tree view representing hierarchically all the menu items"
+"get a tree view representing hierarchically the menu items"
 |treeView|
 (treeView := builder bindingAt:#treeView) isNil ifTrue:[
 treeView := TreeView new.
 treeView action:[:dummy|self menuChanged].
 builder aspectAt: #treeView put: treeView
 ].
 ^treeView
+! !
+!MenuEditor methodsFor:'building'!
+buildFromListSpec: aListSpec
+self buildFromMenu: aListSpec
 ! !
 !MenuEditor methodsFor:'change & update'!
 updateEnabledChannels
 ! !
 !MenuEditor methodsFor:'initialization'!
 initialize
-"initialize value holders for the menu item properties"
+"initialize value holders for the attributes of the menu components"
 |holder|
 super initialize.
 aspects at:#seperatorSelection put:(holder := SelectionInList new).
 holder list: Item separatorList.
 holder addDependent:self.
 ! !
 !MenuEditor methodsFor:'private'!
 helpKey
+"get the help key of the selected menu item"
 |node|
 (node := self treeView selectedNode) notNil ifTrue:[
 ^ node contents activeHelpKey
 ].
 ^ nil
 !
 helpTool
+"get the help tool"
 ^helpCanvas application
 ! !
 !MenuEditor methodsFor:'queries'!
 isHelpToolSelected
-"returns true if current selection is help tool"
+"return true if current selection is help tool"
 (tabSelection ~~ 0 and:[slices notNil]) ifTrue:[
 ^(slices at:tabSelection) first = UIHelpTool label
 ].
 ^false
 !
-isStandAlone
-"returns true in case of owner of the helptool"
-^self masterApplication isNil
-!
 preferredExtent
 ^super preferredExtent max: (Screen current width//3)@(Screen current height//2.5)
 !MenuEditor methodsFor:'selection'!
 menuChanged
-|node item slc sel old dep|
+|node item slc sel old|
 aspects do: [:holder| holder removeDependent:self].
 (node := self treeView selectedNode) notNil ifTrue:[
 aspects do:[:anAspect| anAspect value:nil ].
 item := node contents.
 old := (slices at:tabSelection) first
 ].
 (slices := slc) notNil ifTrue:[
 sel := slices collect:[:s| s first].
 tabSelection := 0.
 self tabList value:sel.
 (old notNil and:[(sel := sel findFirst:[:n|n = old]) ~~ 0]) ifFalse:[
 sel := 1
 ].
 self updateEnabledChannels.
 aspects do: [:holder| holder addDependent:self].
 !
 tabSelection: aSelection
+"put the section aSelection into the note book"
-|sel|
 tabSelection = aSelection ifTrue:[
 ^ self
 ].
 (aSelection ~~ 0 and:[slices isNil]) ifTrue:[
 ^ self
 ].
 self isHelpToolSelected ifTrue:[
 self helpTool helpKey:(self helpKey).
 helpCanvas raise.
 ] ifFalse:[
-sel := (slices at:tabSelection) last.
 aspects do: [:holder| holder release].
-specCanvas client:self spec:(self class perform:sel) builder:builder.
+specCanvas client:self spec:(self class perform:(slices at:tabSelection) last) builder:builder.
 aspects do: [:holder| holder addDependent:self].
 specCanvas raise.
 ]
 ! !
 !MenuEditor methodsFor:'startup / release'!
 self updateHistory.
 self updateInfoLabel.
 self treeView selection: 2.
 self menuChanged
+!
+openModalOnMenu: aMenu
+"build a tree from aMenu open it modal"
+super openModalOnListSpec: aMenu
 !
 postOpenWith:aBuilder
 super postOpenWith:aBuilder.
 !MenuEditor::TreeView methodsFor:'building'!
 buildFromClass:aClass andSelector:aSelector
-|spec cls menu node|
+|spec cls menu firstNode firstNodeLabel|
+"if opened on a menu"
+(aClass isNil and: [aSelector isNil and: [listOfNodes size > 0]]) ifTrue: [^nil].
 (aClass notNil and:[aSelector notNil]) ifTrue:[
 cls := self application resolveName:aClass.
 (cls respondsTo:aSelector) ifTrue:[
 (spec isMemberOf:Menu) ifFalse:[
 menu := Menu new fromLiteralArrayEncoding:spec.
 ] ifTrue:[
 menu := spec.
 ].
-node := self nodeLabel:(aSelector asString).
+firstNode := self nodeLabel:(aSelector asString).
-self subMenu:menu parent:node.
+self subMenu:menu parent:firstNode.
 ] ifTrue:[
-aSelector notNil ifTrue:[cls := aSelector asString]
+(aClass notNil and: [aSelector isNil and: [listOfNodes size > 0]])
-ifFalse:[cls := 'menu'].
+ifTrue:
+[
-node := self nodeLabel:cls.
+firstNode := listOfNodes first
+]
+ifFalse:
+[
+aSelector notNil ifTrue:[firstNodeLabel := aSelector asString]
+ifFalse:[firstNodeLabel := 'menu'].
+firstNode := self nodeLabel:firstNodeLabel.
+]
+].
+firstNode expand.
+model root: firstNode.
+firstNode hasChildren ifFalse:[
+|firstChildNode|
+firstChildNode := self nodeLabel:'Item 1'.
+firstChildNode parent: firstNode.
+firstNode add: firstChildNode.
+model recomputeList
+].
+!
+buildFromMenu:aMenu
+|node|
+node := self nodeLabel:'menu'.
+self subMenu:aMenu parent:node.
+node hasChildren ifFalse:[
+node add:(self nodeLabel:'Item 1')
 ].
 node expand.
 model root:node.
-node hasChildren ifFalse:[
+model recomputeList
-|n|
-n := self nodeLabel:'Item 1'.
-n parent: node.
-node add: n.
-model recomputeList
-].
-!
-buildFromMenu:aMenu
-|node|
-node := self nodeLabel:'menu'.
-self subMenu:aMenu parent:node.
-node hasChildren ifFalse:[
-node add:(self nodeLabel:'Item')
-].
-node expand.
-model root:node.
 !
 menuItem:anItem
 |node|
 !MenuEditor class methodsFor:'documentation'!
 version
 ^ '$Header$'
 ! !
-MenuEditor initialize!

changeset 728	638ae95885e1
parent 725	9d3fa75a40e4
child 734	9fdcc26c458f