hg/stx-libtool2: comparison MenuEditor.st

equal deleted inserted replaced

-:d63d47fea8be
+:d7979e4253fd
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
-MenuEditor::Item subclass:#ItemAction
+MenuEditor::Item subclass:#ActionItem
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
-MenuEditor::Item subclass:#ItemLinkedMenu
+MenuEditor::Item subclass:#LinkedMenuItem
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
-MenuEditor::Item subclass:#ItemMenu
+MenuEditor::Item subclass:#MenuItem
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:MenuEditor
-!
-MenuEditor::ItemMenu subclass:#ItemRoot
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:MenuEditor
-!
-MenuEditor::Item subclass:#ItemSeparator
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
 	privateIn:MenuEditor
 !
 HierarchicalItem subclass:#ResourceEditorItem
 	instanceVariableNames:'selector icon'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:MenuEditor
+!
+MenuEditor::MenuItem subclass:#RootItem
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:MenuEditor
+!
+MenuEditor::Item subclass:#SeparatorItem
+	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MenuEditor
 !
 <resource: #menu>
 ^
 #(#Menu
-	#(
+#(
-	 #(#MenuItem
+#(#MenuItem
-	    #label: 'Cut'
+#label: 'Cut'
-	    #value: #doCut
+#translateLabel: true
-	    #activeHelpKey: #editCut
+#activeHelpKey: #editCut
-	    #enabled: #hasSelectionChannel
+#enabled: #hasSelectionChannel
-	  )
+)
-	 #(#MenuItem
+#(#MenuItem
-	    #label: 'Copy'
+#label: 'Copy'
-	    #value: #doCopy
+#translateLabel: true
-	    #activeHelpKey: #editCopy
+#activeHelpKey: #editCopy
-	    #enabled: #hasSelectionChannel
+#enabled: #hasSelectionChannel
-	  )
+)
-	 #(#MenuItem
+#(#MenuItem
-	    #label: 'Paste'
+#label: 'Paste'
-	    #value: #doPaste
+#translateLabel: true
-	    #activeHelpKey: #editPaste
+#activeHelpKey: #editPaste
-	    #enabled: #valueOfCanPaste
+#enabled: #valueOfCanPaste
-	  )
+)
-	 #(#MenuItem
+#(#MenuItem
-	    #label: 'Delete'
+#label: 'Delete'
-	    #value: #doDelete
+#translateLabel: true
-	    #activeHelpKey: #editDelete
+#isVisible: false
-	    #enabled: #hasSelectionChannel
+#activeHelpKey: #editDelete
-	  )
+#enabled: #hasSelectionChannel
-	 #(#MenuItem
+)
-	    #label: '-'
+#(#MenuItem
-	  )
+#label: '-'
-	 #(#MenuItem
+)
-	    #label: 'Move Up'
+#(#MenuItem
-	    #startGroup: #right
+#label: 'Move Up'
-	    #value: #doMoveUpOrDown:
+#translateLabel: true
-	    #activeHelpKey: #editMoveUp
+#startGroup: #right
-	    #enabled: #valueOfEnableMovingUpOrDown
+#activeHelpKey: #editMoveUp
-	    #argument: #up
+#enabled: #valueOfEnableMovingUpOrDown
-	    #labelImage: #(#ResourceRetriever #Icon #upIcon 'Move Up')
+#argument: #up
-	  )
+#resourceRetriever: #(#ResourceRetriever #Icon #upIcon '')
-	 #(#MenuItem
+)
-	    #label: 'Move Down'
+#(#MenuItem
-	    #value: #doMoveUpOrDown:
+#label: 'Move Down'
-	    #activeHelpKey: #editMoveDown
+#translateLabel: true
-	    #enabled: #valueOfEnableMovingUpOrDown
+#activeHelpKey: #editMoveDown
-	    #argument: #down
+#enabled: #valueOfEnableMovingUpOrDown
-	    #labelImage: #(#ResourceRetriever #Icon #downIcon 'Move Down')
+#argument: #down
-	  )
+#resourceRetriever: #(#ResourceRetriever #Icon #downIcon '')
-	 #(#MenuItem
+)
-	    #label: 'Move In'
+#(#MenuItem
-	    #value: #doMoveIn:
+#label: 'Move Into Next'
-	    #activeHelpKey: #editMoveIn
+#translateLabel: true
-	    #enabled: #valueOfEnableMovingIn
+#activeHelpKey: #editMoveIn
-	    #argument: #inNext
+#enabled: #valueOfEnableMovingIn
-	    #labelImage: #(#ResourceRetriever #Icon #downRightIcon 'Move In')
+#argument: #inNext
-	  )
+#resourceRetriever: #(#ResourceRetriever #Icon #downRightIcon '')
-	 #(#MenuItem
+)
-	    #label: 'Move In Above'
+#(#MenuItem
-	    #value: #doMoveIn:
+#label: 'Move Into Previous'
-	    #activeHelpKey: #editMoveInAbove
+#translateLabel: true
-	    #enabled: #valueOfEnableMovingInAbove
+#activeHelpKey: #editMoveInAbove
-	    #argument: #inPrev
+#enabled: #valueOfEnableMovingInAbove
-	    #labelImage: #(#ResourceRetriever #Icon #upRightIcon 'Move In Above')
+#argument: #inPrev
-	  )
+#resourceRetriever: #(#ResourceRetriever #Icon #upRightIcon '')
-	 #(#MenuItem
+)
-	    #label: 'Move Out'
+#(#MenuItem
-	    #value: #doMoveOut
+#label: 'Move Out'
-	    #activeHelpKey: #editMoveOut
+#translateLabel: true
-	    #enabled: #valueOfEnableMovingOut
+#activeHelpKey: #editMoveOut
-	    #labelImage: #(#ResourceRetriever #Icon #leftDownIcon 'Move Out')
+#enabled: #valueOfEnableMovingOut
-	  )
+#resourceRetriever: #(#ResourceRetriever #Icon #leftDownIcon '')
-	 )
+)
-	nil
+)
-	nil
+nil
+nil
 )
 !
 fileMenu
 "This resource specification was automatically generated
 ^
 #(#Menu
 #(
 #(#MenuItem
-#label: 'Redefine Aspect Methods'
-#hideMenuOnActivated: false
-#activeHelpKey: #settingsRedefineAspectMethods
-#enabled: #hasValidSpecClass
-#indication: #redefineAspectMethodsChannel
-)
-#(#MenuItem
 #label: 'Aspect Methods'
 #value: #doGenerateAspectMethods
 #activeHelpKey: #generateAspectMethods
 #enabled: #hasValidSpecClass
 )
 #activeHelpKey: #edit
 #submenuChannel: #editMenu
 #keepLinkedMenu: true
 )
 #(#MenuItem
-#label: 'Add'
+#label: 'Item'
 #translateLabel: true
 #activeHelpKey: #add
 #enabled: #hasSingleSelectionChannel
 #submenuChannel: #addMenu
 #keepLinkedMenu: true
 )
 #(#MenuItem
-#label: 'Test'
-#translateLabel: true
-#activeHelpKey: #test
-#submenuChannel: #submenuTest
-)
-#(#MenuItem
-#label: 'History'
-#translateLabel: true
-#activeHelpKey: #history
-#submenuChannel: #menuHistory
-)
-#(#MenuItem
 #label: 'Generate'
 #translateLabel: true
 #activeHelpKey: #generate
 #submenuChannel: #generateMenu
 #keepLinkedMenu: true
+)
+#(#MenuItem
+#label: 'Test'
+#translateLabel: true
+#activeHelpKey: #test
+#submenuChannel: #submenuTest
+)
+#(#MenuItem
+#label: 'Settings'
+#translateLabel: true
+#activeHelpKey: #settings
+#submenuChannel: #settingsMenu
+#keepLinkedMenu: true
+)
+#(#MenuItem
+#label: 'History'
+#translateLabel: true
+#activeHelpKey: #history
+#submenuChannel: #menuHistory
 )
 #(#MenuItem
 #label: '&Help'
 #translateLabel: true
 #startGroup: #right
 #activeHelpKey: #help
 #submenuChannel: #helpMenu
 #keepLinkedMenu: true
+)
+)
+nil
+nil
+)
+!
+settingsMenu
+"This resource specification was automatically generated
+by the MenuEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the MenuEditor may not be able to read the specification."
+"
+MenuEditor new openOnClass:MenuEditor andSelector:#generateMenu
+(Menu new fromLiteralArrayEncoding:(MenuEditor generateMenu)) startUp
+"
+<resource: #menu>
+^
+#(#Menu
+#(
+#(#MenuItem
+#label: 'Redefine Aspect Methods'
+#translateLabel: true
+#hideMenuOnActivated: false
+#activeHelpKey: #settingsRedefineAspectMethods
+#enabled: #hasValidSpecClass
+#indication: #redefineAspectMethodsChannel
 )
 )
 nil
 nil
 )
 selectionHolder    := #() asValue.
 selectionHolder addDependent:self.
 listOfItems := HierarchicalList new.
 listOfItems application:self.
-listOfItems root:(ItemRoot new).
+listOfItems root:(RootItem new).
 tabHolder := nil asValue.
 tabHolder addDependent:self.
 listOfTabs := List new.
 selectedItem ifNil:[^ self].
 selectedItem canAddDelayedMenu      ifFalse:[ ^ self ].
 self askForItemModification ifFalse:[ ^ self ].
-what == #menu ifTrue:[ delayedItem := ItemMenu new ]
+what == #menu ifTrue:[ delayedItem := MenuItem new ]
-ifFalse:[ delayedItem := ItemLinkedMenu new ].
+ifFalse:[ delayedItem := LinkedMenuItem new ].
 delayedItem setExpanded:true.
 delayedItem := selectedItem add:delayedItem.
 delayedItem ifNotNil:[
 !
 doCreateItem
 "create a new Item
 "
-self addAndSelect:[ ItemAction new ].
+self addAndSelect:[ ActionItem new translateLabel:true ].
 !
 doCreateLinkedMenu
 "create a new Linked Menu
 "
-self addAndSelect:[ ItemLinkedMenu new ].
+self addAndSelect:[ LinkedMenuItem new ].
 !
 doCreateMenu
 "create a new Menu
 "
 self addAndSelect:[ |item|
-	item := ItemMenu new.
+item := MenuItem new.
-	item expand.
+item expand.
-	item
+item
 ].
 !
 doCreateSep
 "create a new Separator Item
 "
-self addAndSelect:[ ItemSeparator new ].
+self addAndSelect:[ SeparatorItem new ].
 !
 doCreateStandardEditMenu
 "create a standart edit menu
 "
 self addAndSelect:[
-	ItemMenu menu:(self class standardEditMenu) labeled:'Edit'
+MenuItem menu:(self class standardEditMenu) labeled:'Edit' translateLabel:true
 ].
 !
 doCreateStandardFileMenu
 "create a standart file menu
 "
 self addAndSelect:[
-	ItemMenu menu:(self class standardFileMenu) labeled:'File'
+MenuItem menu:(self class standardFileMenu) labeled:'File' translateLabel:true
 ].
 !
 doCreateStandardHelpMenu
 "create a standart help menu
 "
 |item|
 self addAndSelect:[
-	item := ItemMenu menu:(self class standardHelpMenu) labeled:'Help'.
+item := MenuItem menu:(self class standardHelpMenu) labeled:'Help' translateLabel:true.
-	item aspectAt:#startGroup put:#right.
+item aspectAt:#startGroup put:#right.
-	item
+item
 ].
 ! !
 !MenuEditor methodsFor:'user actions - editing'!
 !MenuEditor::Item class methodsFor:'instance creation'!
 classFor:aMenuItem
-aMenuItem ifNil:[ ^ nil ].
+aMenuItem isNil ifTrue:[ ^ nil ].
-aMenuItem value ifNil:[
+aMenuItem itemValue isNil ifTrue:[
-	aMenuItem submenu        ifNotNil:[ ^ MenuEditor::ItemMenu ].
+aMenuItem submenu        notNil ifTrue:[ ^ MenuEditor::MenuItem ].
-	aMenuItem submenuChannel ifNotNil:[ ^ MenuEditor::ItemLinkedMenu ].
+aMenuItem submenuChannel notNil ifTrue:[ ^ MenuEditor::LinkedMenuItem ].
-	(self separatorTypeOf:(aMenuItem rawLabel)) notNil ifTrue:[
+(self separatorTypeOf:(aMenuItem rawLabel)) notNil ifTrue:[
-	    ^ MenuEditor::ItemSeparator
+^ MenuEditor::SeparatorItem
-	]
+]
 ].
-^ MenuEditor::ItemAction
+^ MenuEditor::ActionItem
 !
 menuItem:aMenuItem
 |item cls|
 submenu
 "returns the submenu (of class Menu) or nil
 "
 ^ nil
+!
+translateLabel:aBoolean
+menuItem translateLabel:aBoolean
 ! !
 !MenuEditor::Item methodsFor:'aspects'!
 aspectAt:aKey put:aValue
 "returns true if the item can change its vertical order in its sibling
 "
 ^ parent children size > 1
 ! !
-!MenuEditor::ItemAction class methodsFor:'defaults'!
+!MenuEditor::ActionItem class methodsFor:'defaults'!
 defaultLabel
 ^ 'Action'
 ! !
-!MenuEditor::ItemAction class methodsFor:'interface - editor'!
+!MenuEditor::ActionItem class methodsFor:'interface - editor'!
 addBindingsTo:aspects for:aMenuEditor
 "add additional bindings to the aspects
 "
 aspects at:#indicationEnabled  ifAbsentPut:[
 aspects at:#hasNoDelayedMenuValue ifAbsentPut:[
 	true asValue
 ].
 ! !
-!MenuEditor::ItemAction class methodsFor:'interface - specs'!
+!MenuEditor::ActionItem class methodsFor:'interface - specs'!
 basicsEditSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 )
 )
 ! !
-!MenuEditor::ItemAction methodsFor:'accessing'!
+!MenuEditor::ActionItem methodsFor:'accessing'!
 menuItem
 |item|
 item := super menuItem.
 super menuItem:anItem.
 submenu := anItem submenu.
 submenu notNil ifTrue:[
-	item := MenuEditor::ItemMenu new
+item := MenuEditor::MenuItem new
 ] ifFalse:[
-	anItem submenuChannel ifNil:[
+anItem submenuChannel isNil ifTrue:[
-	    ^ self
+^ self
-	].
+].
-	item := MenuEditor::ItemLinkedMenu new
+item := MenuEditor::LinkedMenuItem new
 ].
 item getDelayedAttributesFrom:anItem.
 self add:item.
 !
 	    (Image    image  )
 	    (Help     help)
 )
 ! !
-!MenuEditor::ItemAction methodsFor:'adding & removing'!
+!MenuEditor::ActionItem methodsFor:'adding & removing'!
 add:anItem
 "add an item; test whether the item is a delayed menu and
 not already a delayed menu exists.
 "
 children := Array with:anItem.
 self expand.
 ^ anItem
 ! !
-!MenuEditor::ItemAction methodsFor:'aspects'!
+!MenuEditor::ActionItem methodsFor:'aspects'!
 aspectAt:aKey put:aValue
 "pass the argument to the delayed menu if existant
 "
 aKey == #argument ifTrue:[
 hasDelayedMenu ifTrue:[
 (aspects at:#triggerOnDown) value:false
 ].
 ! !
-!MenuEditor::ItemAction methodsFor:'displaying'!
+!MenuEditor::ActionItem methodsFor:'displaying'!
 icon
 ^ self class iconItem
 ! !
-!MenuEditor::ItemAction methodsFor:'initialization'!
+!MenuEditor::ActionItem methodsFor:'initialization'!
 initialize
 super initialize.
 isExpanded := true.
 ! !
-!MenuEditor::ItemAction methodsFor:'queries'!
+!MenuEditor::ActionItem methodsFor:'queries'!
 canCollapse
 ^ false
 !
 isAction
 ^ true
 ! !
-!MenuEditor::ItemAction methodsFor:'queries - operation'!
+!MenuEditor::ActionItem methodsFor:'queries - operation'!
 canAddDelayedMenu
 "returns true if a delayed menu can be added
 "
 ^ self hasDelayedMenu not
 ! !
-!MenuEditor::ItemLinkedMenu class methodsFor:'defaults'!
+!MenuEditor::LinkedMenuItem class methodsFor:'defaults'!
 defaultLabel
 ^ 'Linked Menu'
 ! !
-!MenuEditor::ItemLinkedMenu class methodsFor:'interface - specs'!
+!MenuEditor::LinkedMenuItem class methodsFor:'interface - specs'!
 basicsEditSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 )
 )
 ! !
-!MenuEditor::ItemLinkedMenu methodsFor:'accessing'!
+!MenuEditor::LinkedMenuItem methodsFor:'accessing'!
 argument:aValue
 menuItem argument:aValue.
 !
 submenuChannel:aValue
 menuItem submenuChannel:aValue.
 ! !
-!MenuEditor::ItemLinkedMenu methodsFor:'aspects'!
+!MenuEditor::LinkedMenuItem methodsFor:'aspects'!
 aspectAt:aKey put:aValue
 "set a specific aspect named aKey to the aValue
 "
 aKey == #submenuChannel ifTrue:[ ^ self submenuChannel:aValue ].
 aMenuItem   submenuChannel:(self submenuChannel).
 aMenuItem horizontalLayout:(menuItem horizontalLayout).
 aMenuItem   keepLinkedMenu:(menuItem keepLinkedMenu).
 ! !
-!MenuEditor::ItemLinkedMenu methodsFor:'displaying'!
+!MenuEditor::LinkedMenuItem methodsFor:'displaying'!
 displayLabel
 "returns the label dependent on is delayed or not
 "
 self isDelayedMenu ifTrue:[ ^ self submenuChannel ].
 icon
 self isDelayedMenu ifTrue:[ ^ self class iconDelayedLinkedMenu ].
 ^ self class iconLinkedMenu
 ! !
-!MenuEditor::ItemLinkedMenu methodsFor:'queries'!
+!MenuEditor::LinkedMenuItem methodsFor:'queries'!
 isKindOfMenu
 ^ true
 ! !
-!MenuEditor::ItemMenu class methodsFor:'defaults'!
+!MenuEditor::MenuItem class methodsFor:'defaults'!
 defaultDelayedLabel
 ^ 'delayed'
 !
 defaultLabel
 ^ 'Menu'
 ! !
-!MenuEditor::ItemMenu class methodsFor:'instance creation'!
+!MenuEditor::MenuItem class methodsFor:'instance creation'!
 menu:aMenu labeled:aString
 |item|
 item := self new.
 item menu:aMenu labeled:aString.
 ^ item
-! !
+!
-!MenuEditor::ItemMenu class methodsFor:'interface - specs'!
+menu:aMenu labeled:aString translateLabel:translateLabel
+|item|
+item := self new.
+item menu:aMenu labeled:aString.
+item translateLabel:translateLabel.
+^ item
+! !
+!MenuEditor::MenuItem class methodsFor:'interface - specs'!
 basicsEditSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 )
 )
 ! !
-!MenuEditor::ItemMenu methodsFor:'accessing'!
+!MenuEditor::MenuItem methodsFor:'accessing'!
 argument:aValue
 "/ ignorred.
 !
 	children do:[:el| menu addItem:(el menuItem) ].
 ].
 ^ menu
 ! !
-!MenuEditor::ItemMenu methodsFor:'aspects'!
+!MenuEditor::MenuItem methodsFor:'aspects'!
 getDelayedAttributesFrom:aMenuItem
 self menu:(aMenuItem submenu) labeled:nil.
 menuItem horizontalLayout:(aMenuItem horizontalLayout).
 setDelayedAttributesTo:aMenuItem
 aMenuItem          submenu:(self submenu).
 aMenuItem horizontalLayout:(menuItem horizontalLayout).
 ! !
-!MenuEditor::ItemMenu methodsFor:'displaying'!
+!MenuEditor::MenuItem methodsFor:'displaying'!
 displayLabel
 "returns the label dependent on is delayed or not
 "
 self isDelayedMenu ifTrue:[ ^ self class defaultDelayedLabel ].
 icon
 self isDelayedMenu ifTrue:[ ^ self class iconDelayedMenu ].
 ^ self class iconMenu
 ! !
-!MenuEditor::ItemMenu methodsFor:'queries'!
+!MenuEditor::MenuItem methodsFor:'queries'!
 canAddChildren
 "children can be added
 "
 ^ true
 ^ true
 !
 isKindOfMenu
 ^ true
-! !
-!MenuEditor::ItemRoot class methodsFor:'defaults'!
-defaultLabel
-^ MenuEditor resourceType
-! !
-!MenuEditor::ItemRoot class methodsFor:'interface - editor'!
-addBindingsTo:aspects for:aMenuEditor
-"add additional bindings to the aspects
-"
-! !
-!MenuEditor::ItemRoot class methodsFor:'interface - specs'!
-basicsEditSpec
-"This resource specification was automatically generated
-by the UIPainter of ST/X."
-"Do not manually edit this!! If it is corrupted,
-the UIPainter may not be able to read the specification."
-"
-UIPainter new openOnClass:MenuEditor::ItemRoot andSelector:#basicsEditSpec
-"
-<resource: #canvas>
-^
-#(#FullSpec
-	#name: #basicsEditSpec
-	#window:
-#(#WindowSpec
-	  #label: 'basicsEditSpec'
-	  #name: 'basicsEditSpec'
-	  #min: #(#Point 10 10)
-	  #max: #(#Point 1280 1024)
-	  #bounds: #(#Rectangle 644 547 904 593)
-	)
-	#component:
-#(#SpecCollection
-	  #collection: #(
-	   #(#LabelSpec
-	      #label: 'Selector:'
-	      #name: 'selectorLabel'
-	      #layout: #(#AlignmentOrigin 107 0 26 0 1 0.5)
-	      #activeHelpKey: #basicsSelector
-	      #resizeForLabel: true
-	      #adjust: #right
-	    )
-	   #(#InputFieldSpec
-	      #name: 'selectorField'
-	      #layout: #(#LayoutFrame 110 0 15 0 -5 1.0 37 0)
-	      #activeHelpKey: #basicsSelector
-	      #tabable: true
-	      #model: #rawLabel
-	      #group: #inputGroup
-	      #type: #string
-	      #immediateAccept: false
-	      #acceptOnReturn: true
-	      #acceptOnTab: true
-	      #acceptChannel: #acceptChannel
-	      #modifiedChannel: #modifiedChannel
-	      #acceptOnPointerLeave: false
-	    )
-	   )
-	)
-)
-! !
-!MenuEditor::ItemRoot methodsFor:'accessing'!
-menuItem:aMenuItem
-"rebuild self from a MenuItem
-"
-|submenu selector|
-aMenuItem notNil ifTrue:[
-	submenu  := aMenuItem submenu.
-	selector := aMenuItem rawLabel.
-] ifFalse:[
-	selector := submenu := nil.
-].
-self menu:submenu labeled:selector.
-!
-rawLabel:aValue
-"set the label assigned to the item
-"
-|value|
-aValue isString ifTrue:[
-value := aValue withoutSeparators.
-(value notEmpty and:[value first isLetter]) ifTrue:[
-menuItem rawLabel:(value asSymbol)
-].
-].
-!
-slices
-^ #(
-	    (Basics   basicsEditSpec)
-)
-! !
-!MenuEditor::ItemRoot methodsFor:'adding & removing'!
-remove
-"cannot remove the root item; delete all my children
-"
-self removeAll.
-! !
-!MenuEditor::ItemRoot methodsFor:'aspects'!
-aspectAt:aKey put:aValue
-"discard all other than the rawLabel
-"
-aKey == #rawLabel ifTrue:[ self rawLabel:aValue ].
-! !
-!MenuEditor::ItemRoot methodsFor:'displaying'!
-heightOn:aGC
-height ifNil:[ height := aGC font heightOn:aGC device ].
-^ height
-! !
-!MenuEditor::ItemRoot methodsFor:'initialization'!
-initialize
-super initialize.
-isExpanded := true.
-! !
-!MenuEditor::ItemRoot methodsFor:'queries'!
-canCollapse
-^ false
-!
-hasIndicator
-^ false
-!
-isDelayedMenu
-^ false
-!
-isRootItem
-^ true
-! !
-!MenuEditor::ItemRoot methodsFor:'queries - editor'!
-actionSelectors
-"returns my action selectors
-"
-^ #()
-!
-aspectSelectors
-"returns my aspect selectors
-"
-^ #()
-! !
-!MenuEditor::ItemRoot methodsFor:'queries - operation'!
-canMoveInAbove
-^ false
-!
-canMoveInNext
-^ false
-!
-canMoveOut
-^ false
-!
-canMoveUpOrDown
-^ false
-! !
-!MenuEditor::ItemSeparator class methodsFor:'interface - editor'!
-addBindingsTo:aspects for:aMenuEditor
-"add additional bindings to the aspects
-"
-|holder|
-aspects at:#seperatorList  ifAbsentPut:[
-	self separatorSlices collect:[:el| el last ]
-].
-aspects at:#seperatorSelection ifAbsentPut:[
-	holder := 0 asValue.
-	holder addDependent:aMenuEditor.
-	holder
-].
-!
-defaultLabel
-^ '-'
-!
-separatorSlices
-"get the list of menu spec values of the corresponding separator types
-"
-^ #(
-	( #blank        ''      'blank' )
-	( #single       '-'     'single line')
-	( #double       '='     'double line')
-)
-! !
-!MenuEditor::ItemSeparator class methodsFor:'interface - specs'!
-basicsEditSpec
-"This resource specification was automatically generated
-by the UIPainter of ST/X."
-"Do not manually edit this!! If it is corrupted,
-the UIPainter may not be able to read the specification."
-"
-UIPainter new openOnClass:MenuEditor::ItemSeparator andSelector:#basicsEditSpec
-"
-<resource: #canvas>
-^
-#(#FullSpec
-	#name: #basicsEditSpec
-	#window:
-#(#WindowSpec
-	  #label: 'basicsEditSpec'
-	  #name: 'basicsEditSpec'
-	  #min: #(#Point 10 10)
-	  #max: #(#Point 1160 870)
-	  #bounds: #(#Rectangle 160 398 420 643)
-	)
-	#component:
-#(#SpecCollection
-	  #collection: #(
-	   #(#LabelSpec
-	      #label: 'Separator:'
-	      #name: 'separatorLabel'
-	      #layout: #(#AlignmentOrigin 107 0 26 0 1 0.5)
-	      #resizeForLabel: true
-	      #adjust: #right
-	    )
-	   #(#ComboListSpec
-	      #name: 'seperatorList'
-	      #layout: #(#LayoutFrame 110 0 15 0 -5 1.0 37 0)
-	      #activeHelpKey: #basicsSeparatorType
-	      #tabable: true
-	      #model: #seperatorSelection
-	      #comboList: #seperatorList
-	      #useIndex: true
-	    )
-	   #(#LabelSpec
-	      #label: 'Visibility:'
-	      #name: 'visibilityLabel'
-	      #layout: #(#AlignmentOrigin 107 0 51 0 1 0.5)
-	      #resizeForLabel: true
-	      #adjust: #right
-	    )
-	   #(#InputFieldSpec
-	      #name: 'visibilityInputField'
-	      #layout: #(#LayoutFrame 110 0 40 0 -5 1.0 62 0)
-	      #activeHelpKey: #detailsVisibility
-	      #tabable: true
-	      #model: #isVisible
-	      #group: #inputGroup
-	      #type: #symbolOrNil
-	      #immediateAccept: false
-	      #acceptOnReturn: true
-	      #acceptOnTab: true
-	      #acceptChannel: #acceptChannel
-	      #modifiedChannel: #modifiedChannel
-	      #acceptOnPointerLeave: false
-	    )
-	   #(#LabelSpec
-	      #label: 'Start Group:'
-	      #name: 'startGroupLabel'
-	      #layout: #(#AlignmentOrigin 107 0 88 0 1 0.5)
-	      #resizeForLabel: true
-	      #adjust: #right
-	    )
-	   #(#PopUpListSpec
-	      #label: 'left'
-	      #name: 'startGroupPopUp'
-	      #layout: #(#LayoutFrame 110 0 77 0 -5 1.0 99 0)
-	      #activeHelpKey: #detailsStartGroup
-	      #tabable: true
-	      #model: #startGroup
-	      #menu:
-	     #(#left
-		#right
-	      )
-	    )
-	   )
-	)
-)
-! !
-!MenuEditor::ItemSeparator methodsFor:'accessing'!
-icon
-^ self class iconSeparator
-!
-rawLabel:aValue
-|value|
-aValue isString ifTrue:[
-	value := aValue withoutSeparators.
-	(self class separatorTypeOf:value) ifNotNil:[
-	    menuItem rawLabel:value
-	]
-].
-!
-separatorType
-^ self class separatorTypeOf:(menuItem rawLabel).
-!
-slices
-^ #(
-	    (Basics   basicsEditSpec)
-)
-! !
-!MenuEditor::ItemSeparator methodsFor:'aspects'!
-fromAspects:aspects
-"put my values into the values of aspects
-"
-|index slice|
-index  := (aspects at:#seperatorSelection) value ? 0.
-slice  := self class separatorSlices at:index ifAbsent:nil.
-slice ifNotNil:[ slice := slice at:2 ].
-(aspects at:#rawLabel) value:slice.
-^ super fromAspects:aspects.
-!
-toAspects:aspects
-"put my values into the values of aspects
-"
-|index type|
-type   := self separatorType.
-index  := self class separatorSlices findFirst:[:el| el first == type ].
-(aspects at:#seperatorSelection) value:index.
-^ super  toAspects:aspects.
-! !
-!MenuEditor::ItemSeparator methodsFor:'displaying'!
-displayOn:aGC x:x y:y h:h
-"draw the receiver in the graphicsContext, aGC.
-"
-|x1 y0 type|
-type := self separatorType.
-type == #blank ifTrue:[ ^ self ].
-x1 := x + (self widthOn:aGC).
-y0 := y + (h // 2) - 1.
-type == #double ifTrue:[
-	y0 := y0 + 1.
-	aGC displayLineFromX:x y:y0 toX:x1 y:y0.
-	y0 := y0 - 2
-].
-aGC displayLineFromX:x y:y0 toX:x1 y:y0
-!
-widthOn:aGC
-width ifNil:[ width := 60 ].
-^ width
 ! !
 !MenuEditor::ResourceEditor class methodsFor:'interface specs'!
 windowSpec
 parent ifNotNil:[
 	ImageEditor openOnClass:(parent selector) andSelector:selector
 ].
 ! !
+!MenuEditor::RootItem class methodsFor:'defaults'!
+defaultLabel
+^ MenuEditor resourceType
+! !
+!MenuEditor::RootItem class methodsFor:'interface - editor'!
+addBindingsTo:aspects for:aMenuEditor
+"add additional bindings to the aspects
+"
+! !
+!MenuEditor::RootItem class methodsFor:'interface - specs'!
+basicsEditSpec
+"This resource specification was automatically generated
+by the UIPainter of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIPainter may not be able to read the specification."
+"
+UIPainter new openOnClass:MenuEditor::ItemRoot andSelector:#basicsEditSpec
+"
+<resource: #canvas>
+^
+#(#FullSpec
+	#name: #basicsEditSpec
+	#window:
+#(#WindowSpec
+	  #label: 'basicsEditSpec'
+	  #name: 'basicsEditSpec'
+	  #min: #(#Point 10 10)
+	  #max: #(#Point 1280 1024)
+	  #bounds: #(#Rectangle 644 547 904 593)
+	)
+	#component:
+#(#SpecCollection
+	  #collection: #(
+	   #(#LabelSpec
+	      #label: 'Selector:'
+	      #name: 'selectorLabel'
+	      #layout: #(#AlignmentOrigin 107 0 26 0 1 0.5)
+	      #activeHelpKey: #basicsSelector
+	      #resizeForLabel: true
+	      #adjust: #right
+	    )
+	   #(#InputFieldSpec
+	      #name: 'selectorField'
+	      #layout: #(#LayoutFrame 110 0 15 0 -5 1.0 37 0)
+	      #activeHelpKey: #basicsSelector
+	      #tabable: true
+	      #model: #rawLabel
+	      #group: #inputGroup
+	      #type: #string
+	      #immediateAccept: false
+	      #acceptOnReturn: true
+	      #acceptOnTab: true
+	      #acceptChannel: #acceptChannel
+	      #modifiedChannel: #modifiedChannel
+	      #acceptOnPointerLeave: false
+	    )
+	   )
+	)
+)
+! !
+!MenuEditor::RootItem methodsFor:'accessing'!
+menuItem:aMenuItem
+"rebuild self from a MenuItem
+"
+|submenu selector|
+aMenuItem notNil ifTrue:[
+	submenu  := aMenuItem submenu.
+	selector := aMenuItem rawLabel.
+] ifFalse:[
+	selector := submenu := nil.
+].
+self menu:submenu labeled:selector.
+!
+rawLabel:aValue
+"set the label assigned to the item
+"
+|value|
+aValue isString ifTrue:[
+value := aValue withoutSeparators.
+(value notEmpty and:[value first isLetter]) ifTrue:[
+menuItem rawLabel:(value asSymbol)
+].
+].
+!
+slices
+^ #(
+	    (Basics   basicsEditSpec)
+)
+! !
+!MenuEditor::RootItem methodsFor:'adding & removing'!
+remove
+"cannot remove the root item; delete all my children
+"
+self removeAll.
+! !
+!MenuEditor::RootItem methodsFor:'aspects'!
+aspectAt:aKey put:aValue
+"discard all other than the rawLabel
+"
+aKey == #rawLabel ifTrue:[ self rawLabel:aValue ].
+! !
+!MenuEditor::RootItem methodsFor:'displaying'!
+heightOn:aGC
+height ifNil:[ height := aGC font heightOn:aGC device ].
+^ height
+! !
+!MenuEditor::RootItem methodsFor:'initialization'!
+initialize
+super initialize.
+isExpanded := true.
+! !
+!MenuEditor::RootItem methodsFor:'queries'!
+canCollapse
+^ false
+!
+hasIndicator
+^ false
+!
+isDelayedMenu
+^ false
+!
+isRootItem
+^ true
+! !
+!MenuEditor::RootItem methodsFor:'queries - editor'!
+actionSelectors
+"returns my action selectors
+"
+^ #()
+!
+aspectSelectors
+"returns my aspect selectors
+"
+^ #()
+! !
+!MenuEditor::RootItem methodsFor:'queries - operation'!
+canMoveInAbove
+^ false
+!
+canMoveInNext
+^ false
+!
+canMoveOut
+^ false
+!
+canMoveUpOrDown
+^ false
+! !
+!MenuEditor::SeparatorItem class methodsFor:'interface - editor'!
+addBindingsTo:aspects for:aMenuEditor
+"add additional bindings to the aspects
+"
+|holder|
+aspects at:#seperatorList  ifAbsentPut:[
+	self separatorSlices collect:[:el| el last ]
+].
+aspects at:#seperatorSelection ifAbsentPut:[
+	holder := 0 asValue.
+	holder addDependent:aMenuEditor.
+	holder
+].
+!
+defaultLabel
+^ '-'
+!
+separatorSlices
+"get the list of menu spec values of the corresponding separator types
+"
+^ #(
+	( #blank        ''      'blank' )
+	( #single       '-'     'single line')
+	( #double       '='     'double line')
+)
+! !
+!MenuEditor::SeparatorItem class methodsFor:'interface - specs'!
+basicsEditSpec
+"This resource specification was automatically generated
+by the UIPainter of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIPainter may not be able to read the specification."
+"
+UIPainter new openOnClass:MenuEditor::ItemSeparator andSelector:#basicsEditSpec
+"
+<resource: #canvas>
+^
+#(#FullSpec
+	#name: #basicsEditSpec
+	#window:
+#(#WindowSpec
+	  #label: 'basicsEditSpec'
+	  #name: 'basicsEditSpec'
+	  #min: #(#Point 10 10)
+	  #max: #(#Point 1160 870)
+	  #bounds: #(#Rectangle 160 398 420 643)
+	)
+	#component:
+#(#SpecCollection
+	  #collection: #(
+	   #(#LabelSpec
+	      #label: 'Separator:'
+	      #name: 'separatorLabel'
+	      #layout: #(#AlignmentOrigin 107 0 26 0 1 0.5)
+	      #resizeForLabel: true
+	      #adjust: #right
+	    )
+	   #(#ComboListSpec
+	      #name: 'seperatorList'
+	      #layout: #(#LayoutFrame 110 0 15 0 -5 1.0 37 0)
+	      #activeHelpKey: #basicsSeparatorType
+	      #tabable: true
+	      #model: #seperatorSelection
+	      #comboList: #seperatorList
+	      #useIndex: true
+	    )
+	   #(#LabelSpec
+	      #label: 'Visibility:'
+	      #name: 'visibilityLabel'
+	      #layout: #(#AlignmentOrigin 107 0 51 0 1 0.5)
+	      #resizeForLabel: true
+	      #adjust: #right
+	    )
+	   #(#InputFieldSpec
+	      #name: 'visibilityInputField'
+	      #layout: #(#LayoutFrame 110 0 40 0 -5 1.0 62 0)
+	      #activeHelpKey: #detailsVisibility
+	      #tabable: true
+	      #model: #isVisible
+	      #group: #inputGroup
+	      #type: #symbolOrNil
+	      #immediateAccept: false
+	      #acceptOnReturn: true
+	      #acceptOnTab: true
+	      #acceptChannel: #acceptChannel
+	      #modifiedChannel: #modifiedChannel
+	      #acceptOnPointerLeave: false
+	    )
+	   #(#LabelSpec
+	      #label: 'Start Group:'
+	      #name: 'startGroupLabel'
+	      #layout: #(#AlignmentOrigin 107 0 88 0 1 0.5)
+	      #resizeForLabel: true
+	      #adjust: #right
+	    )
+	   #(#PopUpListSpec
+	      #label: 'left'
+	      #name: 'startGroupPopUp'
+	      #layout: #(#LayoutFrame 110 0 77 0 -5 1.0 99 0)
+	      #activeHelpKey: #detailsStartGroup
+	      #tabable: true
+	      #model: #startGroup
+	      #menu:
+	     #(#left
+		#right
+	      )
+	    )
+	   )
+	)
+)
+! !
+!MenuEditor::SeparatorItem methodsFor:'accessing'!
+icon
+^ self class iconSeparator
+!
+rawLabel:aValue
+|value|
+aValue isString ifTrue:[
+	value := aValue withoutSeparators.
+	(self class separatorTypeOf:value) ifNotNil:[
+	    menuItem rawLabel:value
+	]
+].
+!
+separatorType
+^ self class separatorTypeOf:(menuItem rawLabel).
+!
+slices
+^ #(
+	    (Basics   basicsEditSpec)
+)
+! !
+!MenuEditor::SeparatorItem methodsFor:'aspects'!
+fromAspects:aspects
+"put my values into the values of aspects
+"
+|index slice|
+index  := (aspects at:#seperatorSelection) value ? 0.
+slice  := self class separatorSlices at:index ifAbsent:nil.
+slice ifNotNil:[ slice := slice at:2 ].
+(aspects at:#rawLabel) value:slice.
+^ super fromAspects:aspects.
+!
+toAspects:aspects
+"put my values into the values of aspects
+"
+|index type|
+type   := self separatorType.
+index  := self class separatorSlices findFirst:[:el| el first == type ].
+(aspects at:#seperatorSelection) value:index.
+^ super  toAspects:aspects.
+! !
+!MenuEditor::SeparatorItem methodsFor:'displaying'!
+displayOn:aGC x:x y:y h:h
+"draw the receiver in the graphicsContext, aGC.
+"
+|x1 y0 type|
+type := self separatorType.
+type == #blank ifTrue:[ ^ self ].
+x1 := x + (self widthOn:aGC).
+y0 := y + (h // 2) - 1.
+type == #double ifTrue:[
+	y0 := y0 + 1.
+	aGC displayLineFromX:x y:y0 toX:x1 y:y0.
+	y0 := y0 - 2
+].
+aGC displayLineFromX:x y:y0 toX:x1 y:y0
+!
+widthOn:aGC
+width ifNil:[ width := 60 ].
+^ width
+! !
 !MenuEditor class methodsFor:'documentation'!
 version
 ^ '$Header$'
 ! !

changeset 1631	d7979e4253fd
parent 1629	a79dce7e7045
child 1632	1f0a0d241ff8