--- a/MenuEditor.st Thu Oct 24 17:32:37 2002 +0200
+++ b/MenuEditor.st Thu Oct 24 22:21:49 2002 +0200
@@ -601,50 +601,53 @@
#(#Menu
#(
#(#MenuItem
+ #activeHelpKey: #addMenuSeparator
#label: 'Separator'
+ #itemValue: #doCreateSep
#translateLabel: true
- #value: #doCreateSep
- #activeHelpKey: #addMenuSeparator
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconSeparator '')
)
#(#MenuItem
+ #activeHelpKey: #addMenuItem
#label: 'Item'
+ #itemValue: #doCreateItem
#translateLabel: true
- #value: #doCreateItem
- #activeHelpKey: #addMenuItem
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconItem '')
)
#(#MenuItem
+ #activeHelpKey: #addMenuItem
#label: 'Menu'
+ #itemValue: #doCreateMenu
#translateLabel: true
- #value: #doCreateMenu
- #activeHelpKey: #addMenuItem
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconMenu '')
)
#(#MenuItem
+ #activeHelpKey: #addSubMenuLink
#label: 'Linked Menu'
- #value: #doCreateLinkedMenu
- #activeHelpKey: #addSubMenuLink
+ #itemValue: #doCreateLinkedMenu
+ #translateLabel: true
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconLinkedMenu '')
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
- #label: 'Delayed Menu'
- #value: #doCreateDelayedMenu:
+ #activeHelpKey: #addDelayedMenu
#enabled: #canCreateDelayedMenuChannel
- #activeHelpKey: #addDelayedMenu
- #argument: #menu
+ #label: 'Delayed Menu'
+ #itemValue: #doCreateDelayedMenu:
+ #translateLabel: true
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedMenu '')
+ #argument: #menu
)
#(#MenuItem
- #label: 'Delayed Linked Menu'
- #value: #doCreateDelayedMenu:
+ #activeHelpKey: #addDelayedSubMenuLink
#enabled: #canCreateDelayedMenuChannel
- #activeHelpKey: #addDelayedSubMenuLink
+ #label: 'Delayed Linked Menu'
+ #itemValue: #doCreateDelayedMenu:
+ #translateLabel: true
+ #labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedLinkedMenu '')
#argument: #linkedMenu
- #labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedLinkedMenu '')
)
#(#MenuItem
#label: '-'
@@ -679,72 +682,81 @@
#(#Menu
#(
#(#MenuItem
- #label: 'Cut'
- #translateLabel: true
#activeHelpKey: #editCut
#enabled: #hasSelectionChannel
+ #label: 'Cut'
+ #itemValue: #doCut
+ #translateLabel: true
)
#(#MenuItem
- #label: 'Copy'
- #translateLabel: true
#activeHelpKey: #editCopy
#enabled: #hasSelectionChannel
+ #label: 'Copy'
+ #itemValue: #doCopy
+ #translateLabel: true
)
#(#MenuItem
- #label: 'Paste'
- #translateLabel: true
#activeHelpKey: #editPaste
#enabled: #valueOfCanPaste
+ #label: 'Paste'
+ #itemValue: #doPaste
+ #translateLabel: true
)
#(#MenuItem
+ #activeHelpKey: #editDelete
+ #enabled: #hasSelectionChannel
#label: 'Delete'
+ #itemValue: #doDelete
#translateLabel: true
#isVisible: false
- #activeHelpKey: #editDelete
- #enabled: #hasSelectionChannel
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
- #label: 'Move Up'
- #translateLabel: true
- #startGroup: #right
#activeHelpKey: #editMoveUp
#enabled: #valueOfEnableMovingUpOrDown
+ #label: 'Move Up'
+ #itemValue: #doMoveUpOrDown:
+ #translateLabel: true
+ #startGroup: #right
+ #labelImage: #(#ResourceRetriever #Icon #upIcon '')
#argument: #up
- #resourceRetriever: #(#ResourceRetriever #Icon #upIcon '')
)
#(#MenuItem
- #label: 'Move Down'
- #translateLabel: true
#activeHelpKey: #editMoveDown
#enabled: #valueOfEnableMovingUpOrDown
+ #label: 'Move Down'
+ #itemValue: #doMoveUpOrDown:
+ #translateLabel: true
+ #labelImage: #(#ResourceRetriever #Icon #downIcon '')
#argument: #down
- #resourceRetriever: #(#ResourceRetriever #Icon #downIcon '')
)
#(#MenuItem
- #label: 'Move Into Next'
- #translateLabel: true
#activeHelpKey: #editMoveIn
#enabled: #valueOfEnableMovingIn
+ #label: 'Move Into Next'
+ #itemValue: #doMoveIn:
+ #translateLabel: true
+ #labelImage: #(#ResourceRetriever #Icon #downRightIcon '')
#argument: #inNext
- #resourceRetriever: #(#ResourceRetriever #Icon #downRightIcon '')
)
#(#MenuItem
- #label: 'Move Into Previous'
- #translateLabel: true
#activeHelpKey: #editMoveInAbove
#enabled: #valueOfEnableMovingInAbove
+ #label: 'Move Into Previous'
+ #itemValue: #doMoveIn:
+ #translateLabel: true
+ #labelImage: #(#ResourceRetriever #Icon #upRightIcon '')
#argument: #inPrev
- #resourceRetriever: #(#ResourceRetriever #Icon #upRightIcon '')
)
#(#MenuItem
- #label: 'Move Out'
- #translateLabel: true
#activeHelpKey: #editMoveOut
#enabled: #valueOfEnableMovingOut
- #resourceRetriever: #(#ResourceRetriever #Icon #leftDownIcon '')
+ #label: 'Move Out'
+ #itemValue: #doMoveOut
+ #translateLabel: true
+ #labelImage: #(#ResourceRetriever #Icon #leftDownIcon '')
)
)
nil
@@ -770,68 +782,68 @@
#(#Menu
#(
#(#MenuItem
+ #activeHelpKey: #fileNew
#label: 'New'
+ #itemValue: #doNew
#translateLabel: true
- #value: #doNew
- #activeHelpKey: #fileNew
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #fileLoad
#label: 'Load...'
+ #itemValue: #doLoad
#translateLabel: true
- #value: #doLoad
- #activeHelpKey: #fileLoad
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #fileSave
#label: 'Save'
+ #itemValue: #doSave
#translateLabel: true
- #value: #doSave
- #activeHelpKey: #fileSave
)
#(#MenuItem
+ #activeHelpKey: #fileSaveAs
#label: 'Save As...'
+ #itemValue: #doSaveAs
#translateLabel: true
- #value: #doSaveAs
- #activeHelpKey: #fileSaveAs
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #filePickAMenu
#label: 'Pick a Menu...'
+ #itemValue: #doPickAMenu
#translateLabel: true
- #value: #doPickAMenu
- #activeHelpKey: #filePickAMenu
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #fileShowMenuSpec
#label: 'Show Menu Spec'
+ #itemValue: #doShowMenuSpec
#translateLabel: true
- #value: #doShowMenuSpec
- #activeHelpKey: #fileShowMenuSpec
)
#(#MenuItem
- #label: 'Browse Class'
- #translateLabel: true
- #value: #doBrowseClass
#activeHelpKey: #fileBrowseClass
#enabled: #hasValidSpecClass
+ #label: 'Browse Class'
+ #itemValue: #doBrowseClass
+ #translateLabel: true
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #fileExit
#label: 'Exit'
+ #itemValue: #closeRequest
#translateLabel: true
- #value: #closeRequest
- #activeHelpKey: #fileExit
)
)
nil
@@ -857,10 +869,11 @@
#(#Menu
#(
#(#MenuItem
- #label: 'Aspect Methods'
- #value: #doGenerateAspectMethods
#activeHelpKey: #generateAspectMethods
#enabled: #hasValidSpecClass
+ #label: 'Aspect Methods'
+ #itemValue: #doGenerateAspectMethods
+ #translateLabel: true
)
)
nil
@@ -886,39 +899,39 @@
#(#Menu
#(
#(#MenuItem
+ #activeHelpKey: #helpTutorial
#label: 'Documentation'
+ #itemValue: #openHTMLDocument:
#translateLabel: true
- #value: #openHTMLDocument:
- #activeHelpKey: #helpTutorial
#argument: 'tools/uipainter/MenuEditor.html'
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #helpHelpTool
#label: 'Help Tool'
+ #itemValue: #openHTMLDocument:
#translateLabel: true
- #value: #openHTMLDocument:
- #activeHelpKey: #helpHelpTool
#argument: 'tools/uipainter/HelpTool.html'
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #helpShowHelp
#label: 'Show Help Texts'
#translateLabel: true
- #activeHelpKey: #helpShowHelp
#indication: #showingHelp:
)
#(#MenuItem
#label: '-'
)
#(#MenuItem
+ #activeHelpKey: #aboutThisAppliaction
#label: 'About MenuEditor...'
+ #itemValue: #openAboutThisApplication
#translateLabel: true
- #value: #openAboutThisApplication
- #activeHelpKey: #aboutThisAppliaction
)
)
nil
@@ -944,58 +957,58 @@
#(#Menu
#(
#(#MenuItem
+ #activeHelpKey: #file
#label: '&File'
#translateLabel: true
- #activeHelpKey: #file
#submenuChannel: #fileMenu
#keepLinkedMenu: true
)
#(#MenuItem
+ #activeHelpKey: #edit
#label: '&Edit'
#translateLabel: true
- #activeHelpKey: #edit
#submenuChannel: #editMenu
#keepLinkedMenu: true
)
#(#MenuItem
+ #activeHelpKey: #add
+ #enabled: #hasSingleSelectionChannel
#label: 'Item'
#translateLabel: true
- #activeHelpKey: #add
- #enabled: #hasSingleSelectionChannel
#submenuChannel: #addMenu
#keepLinkedMenu: true
)
#(#MenuItem
+ #activeHelpKey: #generate
#label: 'Generate'
#translateLabel: true
- #activeHelpKey: #generate
#submenuChannel: #generateMenu
#keepLinkedMenu: true
)
#(#MenuItem
+ #activeHelpKey: #test
#label: 'Test'
#translateLabel: true
- #activeHelpKey: #test
#submenuChannel: #submenuTest
)
#(#MenuItem
+ #activeHelpKey: #settings
#label: 'Settings'
#translateLabel: true
- #activeHelpKey: #settings
#submenuChannel: #settingsMenu
#keepLinkedMenu: true
)
#(#MenuItem
+ #activeHelpKey: #history
#label: 'History'
#translateLabel: true
- #activeHelpKey: #history
#submenuChannel: #menuHistory
)
#(#MenuItem
+ #activeHelpKey: #help
#label: '&Help'
#translateLabel: true
#startGroup: #right
- #activeHelpKey: #help
#submenuChannel: #helpMenu
#keepLinkedMenu: true
)
@@ -1013,8 +1026,8 @@
the MenuEditor may not be able to read the specification."
"
- MenuEditor new openOnClass:MenuEditor andSelector:#generateMenu
- (Menu new fromLiteralArrayEncoding:(MenuEditor generateMenu)) startUp
+ MenuEditor new openOnClass:MenuEditor andSelector:#settingsMenu
+ (Menu new fromLiteralArrayEncoding:(MenuEditor settingsMenu)) startUp
"
<resource: #menu>
@@ -1023,11 +1036,11 @@
#(#Menu
#(
#(#MenuItem
+ #activeHelpKey: #settingsRedefineAspectMethods
+ #enabled: #hasValidSpecClass
#label: 'Redefine Aspect Methods'
#translateLabel: true
#hideMenuOnActivated: false
- #activeHelpKey: #settingsRedefineAspectMethods
- #enabled: #hasValidSpecClass
#indication: #redefineAspectMethodsChannel
)
)
@@ -1052,25 +1065,25 @@
^
#(#Menu
- #(
- #(#MenuItem
- #label: 'Standard Menu: Edit'
- #translateLabel: true
- #value: #doCreateStandardEditMenu
- )
- #(#MenuItem
- #label: 'Standard Menu: Help'
- #translateLabel: true
- #value: #doCreateStandardHelpMenu
- )
- #(#MenuItem
- #label: 'Standard Menu: File'
- #translateLabel: true
- #value: #doCreateStandardFileMenu
- )
- )
- nil
- nil
+ #(
+ #(#MenuItem
+ #label: 'Standard Menu: Edit'
+ #itemValue: #doCreateStandardEditMenu
+ #translateLabel: true
+ )
+ #(#MenuItem
+ #label: 'Standard Menu: Help'
+ #itemValue: #doCreateStandardHelpMenu
+ #translateLabel: true
+ )
+ #(#MenuItem
+ #label: 'Standard Menu: File'
+ #itemValue: #doCreateStandardFileMenu
+ #translateLabel: true
+ )
+ )
+ nil
+ nil
)
!
@@ -1092,148 +1105,164 @@
#(#Menu
#(
#(#MenuItem
+ #activeHelpKey: #fileLoad
#label: 'Load'
+ #itemValue: #doLoad
+ #translateLabel: true
#isButton: true
- #value: #doLoad
- #activeHelpKey: #fileLoad
+ #submenuChannel: #menuHistory
#labelImage: #(#ResourceRetriever #Icon #loadIcon)
- #submenuChannel: #menuHistory
)
#(#MenuItem
+ #activeHelpKey: #fileSave
#label: 'Save'
+ #itemValue: #doSave
+ #translateLabel: true
#isButton: true
- #value: #doSave
- #activeHelpKey: #fileSave
#labelImage: #(#ResourceRetriever #Icon #saveIcon)
)
#(#MenuItem
#label: ''
)
#(#MenuItem
- #label: 'Cut'
- #isButton: true
- #value: #doCut
#activeHelpKey: #editCut
#enabled: #hasSelectionChannel
+ #label: 'Cut'
+ #itemValue: #doCut
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #Icon #cutIcon)
)
#(#MenuItem
- #label: 'Copy'
- #isButton: true
- #value: #doCopy
#activeHelpKey: #editCopy
#enabled: #hasSelectionChannel
+ #label: 'Copy'
+ #itemValue: #doCopy
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #Icon #copyIcon)
)
#(#MenuItem
- #label: 'Paste'
- #isButton: true
- #value: #doPaste
#activeHelpKey: #editPaste
#enabled: #valueOfCanPaste
+ #label: 'Paste'
+ #itemValue: #doPaste
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #Icon #pasteIcon)
)
#(#MenuItem
#label: ''
)
#(#MenuItem
- #label: 'Add Separator'
- #isButton: true
- #value: #doCreateSep
#activeHelpKey: #addMenuSeparator
#enabled: #hasSingleSelectionChannel
+ #label: 'Add Separator'
+ #itemValue: #doCreateSep
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconSeparator)
)
#(#MenuItem
- #label: 'Add Item'
- #isButton: true
- #value: #doCreateItem
#activeHelpKey: #addMenuItem
#enabled: #hasSingleSelectionChannel
+ #label: 'Add Item'
+ #itemValue: #doCreateItem
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconItem)
)
#(#MenuItem
- #label: 'Add Menu'
- #isButton: true
- #value: #doCreateMenu
#activeHelpKey: #addSubMenu
#enabled: #hasSingleSelectionChannel
+ #label: 'Add Menu'
+ #itemValue: #doCreateMenu
+ #translateLabel: true
+ #isButton: true
+ #submenuChannel: #standardMenus
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconMenu)
- #submenuChannel: #standardMenus
#keepLinkedMenu: true
)
#(#MenuItem
- #label: 'Add Linked Menu'
- #isButton: true
- #value: #doCreateLinkedMenu
#activeHelpKey: #addSubMenuLink
#enabled: #hasSingleSelectionChannel
+ #label: 'Add Linked Menu'
+ #itemValue: #doCreateLinkedMenu
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconLinkedMenu)
)
#(#MenuItem
#label: ''
)
#(#MenuItem
- #label: 'Add Delayed Menu'
- #isButton: true
- #value: #doCreateDelayedMenu:
#activeHelpKey: #addDelayedMenu
#enabled: #canCreateDelayedMenuChannel
+ #label: 'Add Delayed Menu'
+ #itemValue: #doCreateDelayedMenu:
+ #translateLabel: true
+ #isButton: true
+ #labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedMenu)
#argument: #menu
- #labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedMenu)
)
#(#MenuItem
- #label: 'Add Delayed Linked Menu'
- #isButton: true
- #value: #doCreateDelayedMenu:
#activeHelpKey: #addDelayedSubMenuLink
#enabled: #canCreateDelayedMenuChannel
+ #label: 'Add Delayed Linked Menu'
+ #itemValue: #doCreateDelayedMenu:
+ #translateLabel: true
+ #isButton: true
+ #labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedLinkedMenu)
#argument: #linkedMenu
- #labelImage: #(#ResourceRetriever #'MenuEditor::Item' #iconDelayedLinkedMenu)
)
#(#MenuItem
+ #activeHelpKey: #editMoveUp
+ #enabled: #valueOfEnableMovingUpOrDown
#label: 'Move Up'
+ #itemValue: #doMoveUpOrDown:
+ #translateLabel: true
#isButton: true
#startGroup: #right
- #value: #doMoveUpOrDown:
- #activeHelpKey: #editMoveUp
- #enabled: #valueOfEnableMovingUpOrDown
+ #labelImage: #(#ResourceRetriever #Icon #upIcon)
#argument: #up
- #labelImage: #(#ResourceRetriever #Icon #upIcon)
)
#(#MenuItem
- #label: 'Move Down'
- #isButton: true
- #value: #doMoveUpOrDown:
#activeHelpKey: #editMoveDown
#enabled: #valueOfEnableMovingUpOrDown
+ #label: 'Move Down'
+ #itemValue: #doMoveUpOrDown:
+ #translateLabel: true
+ #isButton: true
+ #labelImage: #(#ResourceRetriever #Icon #downIcon)
#argument: #down
- #labelImage: #(#ResourceRetriever #Icon #downIcon)
)
#(#MenuItem
- #label: 'Move In'
- #isButton: true
- #value: #doMoveIn:
#activeHelpKey: #editMoveIn
#enabled: #valueOfEnableMovingIn
+ #label: 'Move In'
+ #itemValue: #doMoveIn:
+ #translateLabel: true
+ #isButton: true
+ #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
#argument: #inNext
- #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
)
#(#MenuItem
- #label: 'Move In Above'
- #isButton: true
- #value: #doMoveIn:
#activeHelpKey: #editMoveInAbove
#enabled: #valueOfEnableMovingInAbove
+ #label: 'Move In Above'
+ #itemValue: #doMoveIn:
+ #translateLabel: true
+ #isButton: true
+ #labelImage: #(#ResourceRetriever #Icon #upRightIcon)
#argument: #inPrev
- #labelImage: #(#ResourceRetriever #Icon #upRightIcon)
)
#(#MenuItem
- #label: 'Move Out'
- #isButton: true
- #value: #doMoveOut
#activeHelpKey: #editMoveOut
#enabled: #valueOfEnableMovingOut
+ #label: 'Move Out'
+ #itemValue: #doMoveOut
+ #translateLabel: true
+ #isButton: true
#labelImage: #(#ResourceRetriever #Icon #leftDownIcon)
)
)
@@ -3408,7 +3437,7 @@
#layout: #(#LayoutFrame 110 0 71 0 -5 1.0 93 0)
#activeHelpKey: #basicsAction
#tabable: true
- #model: #value
+ #model: #itemValue
#group: #inputGroup
#type: #symbolOrNil
#immediateAccept: false
@@ -3574,7 +3603,6 @@
|item|
item := super menuItem.
-
self hasDelayedMenu ifTrue:[
children first setDelayedAttributesTo:item.