From cea99d02a2d0d743880cd7a80a9ded0407bbaf9e Mon Sep 17 00:00:00 2001 From: Jenkins Build Server Date: Wed, 6 Feb 2013 09:03:19 +0100 Subject: [PATCH] 20503 --- .../class/buildNautilusMenu..st | 2 +- .../methodProperties.json | 2 +- .../OrderedIdentityDictionary.class/README.md | 0 .../instance/add..st | 0 .../instance/associationsDo..st | 0 .../instance/at.put..st | 0 .../instance/initialize..st | 0 .../instance/initialize.st | 0 .../instance/removeKey.ifAbsent..st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../class/packagesGroup..st | 2 +- .../class/packagesMenu..st | 2 +- .../CriticBrowser.class/methodProperties.json | 4 +- .../instance/keyText..st | 3 + .../methodProperties.json | 1 + .../instance/attachShortcutCategory.to..st | 2 +- .../instance/initialize.st | 2 +- .../instance/keyText..st | 3 + .../methodProperties.json | 1 + .../instance/keyText..st | 3 + .../instance/keyText.st | 3 + .../methodProperties.json | 2 + .../properties.json | 3 +- .../instance/interpretRegistration..st | 1 + .../methodProperties.json | 2 +- .../instance/isUserInterrupt.st | 5 + .../KeyboardEvent.class/methodProperties.json | 1 + .../MenuMorph.class/instance/addAllFrom..st | 19 +- .../instance/addAllFromPragma.target..st | 6 + .../MenuMorph.class/methodProperties.json | 3 +- .../instance/asMenuItemMorphFrom.isLast..st | 1 + .../instance/keyText..st | 3 + .../instance/keyText.st | 3 + .../methodProperties.json | 4 +- .../properties.json | 3 +- .../instance/drawKeyTextOn..st | 4 +- .../instance/drawText.on.in..st | 24 +- .../instance/drawText.on.in.color..st | 20 ++ .../methodProperties.json | 5 +- .../class/buildAnalyzeSubMenu..st | 13 +- .../class/buildBrowseShortcutsOn..st | 2 +- .../class/classesFixMenu..st | 15 +- .../class/classesMenu..st | 35 ++- .../class/debugMenu..st | 12 +- .../class/groupsFixMenu..st | 12 +- .../class/groupsMenu..st | 17 +- .../class/packagesFixMenu..st | 15 +- .../class/packagesMenu..st | 41 +-- .../class/shiftedSourceCodeMenu..st | 7 +- .../class/sourceCodeMenu..st | 6 +- .../class/sourceCodeMenuExtra..st | 6 +- .../instance/buildCommentButton.st | 2 +- .../instance/buildFirstColumn..st | 2 +- .../instance/buildGroupsButton.st | 2 +- .../instance/buildList.st | 2 +- .../instance/buildList2.st | 2 +- .../instance/categoryMenuBuilder.st | 2 +- .../instance/categoryPragma.st | 3 +- .../instance/classFixPragma.st | 3 +- .../instance/classMenuBuilder.st | 2 +- .../instance/classPragma.st | 3 +- .../instance/classesMenu.shifted..st | 4 +- .../instance/codePaneMenu.shifted..st | 4 +- .../instance/commonPragma.st | 3 +- .../instance/groupFixPragma.st | 3 +- .../instance/groupMenuBuilder.st | 2 +- .../instance/groupPragma.st | 3 +- .../instance/groupsMenu.shifted..st | 4 +- .../instance/methodMenuBuilder.st | 2 +- .../instance/methodPragma.st | 3 +- .../instance/packageFixPragma.st | 3 +- .../instance/packageMenuBuilder.st | 2 +- .../instance/packagePragma.st | 3 +- .../instance/packagesMenu.shifted..st | 5 +- .../instance/setPackageShorcutsTo..st | 4 - .../instance/setShortcuts.to..st | 7 + .../instance/setShortcutsTo..st | 4 + .../instance/shiftedSourceCodeMenu..st | 18 -- .../instance/showGroups..st | 4 +- .../instance/sourceCodeMenu.shifted..st | 4 +- .../instance/sourceCodeMenuBuilder.st | 2 +- .../instance/sourceCodePragma.st | 3 +- .../methodProperties.json | 76 +++--- .../class/categoriesMenu..st | 24 +- .../methodProperties.json | 2 +- .../MethodWidget.class/class/elementsMenu..st | 41 ++- .../MethodWidget.class/methodProperties.json | 2 +- .../class/packagesChangesMenu..st | 2 +- .../class/packagesCommitsMenu..st | 2 +- .../class/packagesCreateMenu..st | 2 +- .../class/packagesOpenMenu..st | 2 +- .../class/packagesSliceMenu..st | 2 +- .../methodProperties.json | 10 +- .../NautilusUI.class/instance/addAll..st | 6 +- .../instance/buildBottomPlugins.st | 2 +- .../instance/buildMiddlePlugins.st | 2 +- .../instance/buildNavigationList.st | 3 +- .../NautilusUI.class/methodProperties.json | 8 +- .../class/classRefactoringSubmenu..st | 8 +- .../class/classVarRefactoringSubmenu..st | 2 +- .../class/codeRewritingClassSubmenu..st | 2 +- .../class/groupRefactoringMenu..st | 2 +- .../class/instVarRefactoringSubmenu..st | 2 +- .../class/methodRefactoringSubMenu..st | 2 +- .../class/packageRefactoringMenu..st | 2 +- .../class/refactoringClassMenu..st | 2 +- .../class/refactoringMethodMenu..st | 5 +- .../class/sourceCodeRefactoringMenu..st | 2 +- .../class/sourceCodeRefactoringMenuHolder..st | 6 +- .../methodProperties.json | 22 +- .../instance/navigationKey..st | 2 + .../Morph.extension/methodProperties.json | 2 +- .../instance/msgPaneMenu.shifted..st | 30 +-- .../methodProperties.json | 2 +- .../instance/commentForCurrentUpdate.st | 14 +- .../ScriptLoader.class/instance/script481.st | 239 ++++++++++++++++++ .../instance/update20503.st | 13 + .../ScriptLoader.class/methodProperties.json | 4 +- .../class/changeSetMenu1..st | 36 +++ .../class/changeSetMenu2..st | 38 +++ .../class/classListMenu..st | 24 ++ .../class/messageListMenu..st | 33 +++ .../instance/changeSetMenu.shifted..st | 1 - .../instance/changeSetMenu1.shifted..st | 26 +- .../instance/changeSetMenu2.shifted..st | 21 +- .../instance/classMenu.shifted..st | 14 +- .../instance/messageMenu.shifted..st | 15 +- .../methodProperties.json | 14 +- .../class/changesListMenu..st | 24 ++ .../class/classListMenu..st | 18 ++ .../class/messageListMenu..st | 18 ++ .../instance/changesMenu.shifted.from.to..st | 42 ++- .../instance/classMenu.shifted.from.to..st | 35 +-- .../instance/messageMenu.shifted.from.to..st | 34 +-- .../methodProperties.json | 9 +- .../class/messageBrowserListMenu..st | 50 ++++ .../MessageBrowser.class/instance/model.st | 3 + .../instance/setListMenu.st | 40 +-- .../methodProperties.json | 4 +- .../class/smalltalkEditorMenuOn..st | 102 ++++++-- .../class/smalltalkEditorShiftedMenuOn..st | 41 ++- .../methodProperties.json | 6 +- .../class/textEditorMenuOn..st | 71 +++++- .../class/textEditorShiftedMenuOn..st | 15 +- .../TextEditor.class/methodProperties.json | 4 +- .../ChangeList.class/class/changeListMenu..st | 123 +++++++++ .../instance/changeListMenu..st | 38 +-- .../ChangeList.class/methodProperties.json | 3 +- .../class/classCommentVersionsListMenu..st | 40 +++ .../instance/versionsMenu..st | 12 +- .../methodProperties.json | 3 +- .../Debugger.class/class/menuCodePane..st | 14 + .../Debugger.class/class/menuStack..st | 43 ++++ .../Debugger.class/class/menuStackAction..st | 36 +++ .../class/menuStackImplement..st | 11 + .../class/menuStackPostMortemAction..st | 11 + .../Debugger.class/class/menuStackProceed..st | 13 + .../instance/codePaneMenu.shifted..st | 8 +- .../instance/contextStackMenu..st | 18 +- .../instance/debugProceedMenu..st | 5 +- .../instance/implementStackMenu..st | 8 +- .../instance/postMortemStackActionMenu..st | 5 +- .../instance/stackActionMenu..st | 14 +- .../Debugger.class/methodProperties.json | 18 +- .../instance/msgPaneMenu.shifted..st | 30 +-- .../methodProperties.json | 2 +- .../class/menuDictionaryFieldList..st | 25 ++ .../class/registerToolsOn..st | 2 +- .../instance/fieldListMenu..st | 14 +- .../methodProperties.json | 3 +- .../FileList.class/class/contentMenu..st | 74 ++++++ .../instance/fileContentsMenu.shifted..st | 24 +- .../FileList.class/methodProperties.json | 3 +- .../instance/msgPaneMenu.shifted..st | 30 +-- .../FinderUI.class/methodProperties.json | 2 +- .../Inspector.class/class/menuFieldList..st | 69 +++++ .../instance/addCollectionItemsTo..st | 13 - .../instance/codePaneMenu.shifted..st | 4 +- .../instance/fieldListMenu..st | 32 +-- .../Inspector.class/methodProperties.json | 6 +- .../class/menuProcessList..st | 97 +++++++ .../class/menuStackList..st | 24 ++ .../instance/processListMenu..st | 60 +---- .../instance/selectedProcess.st | 3 + .../instance/stackListMenu..st | 9 +- .../methodProperties.json | 7 +- .../class/menuDictionaryFieldList..st | 15 ++ .../instance/fieldListMenu..st | 7 +- .../SetInspector.class/methodProperties.json | 3 +- .../instance/codePaneMenu.shifted..st | 4 +- .../StringHolder.class/methodProperties.json | 2 +- .../SyntaxError.class/methodProperties.json | 2 +- .../class/fullReportMenuOn..st | 21 +- .../TimeProfiler.class/methodProperties.json | 4 +- .../class/versionsBrowserListMenu..st | 60 +++++ .../instance/buildDefaultCodePane..st | 2 +- .../instance/versionsMenu..st | 21 +- .../methodProperties.json | 7 +- .../Workspace.class/methodProperties.json | 2 +- 200 files changed, 1930 insertions(+), 895 deletions(-) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/README.md (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/instance/add..st (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/instance/associationsDo..st (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/instance/at.put..st (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/instance/initialize..st (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/instance/initialize.st (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/instance/removeKey.ifAbsent..st (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/methodProperties.json (100%) rename {Spec-Core.package => Collections-Sequenceable.package}/OrderedIdentityDictionary.class/properties.json (84%) create mode 100644 MenuRegistration.package/MenuRegistration.class/instance/keyText..st create mode 100644 MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/keyText..st create mode 100644 MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText..st create mode 100644 MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText.st create mode 100644 Morphic.package/KeyboardEvent.class/instance/isUserInterrupt.st create mode 100644 Morphic.package/MenuMorph.class/instance/addAllFromPragma.target..st create mode 100644 Morphic.package/PluggableMenuItemSpec.class/instance/keyText..st create mode 100644 Morphic.package/PluggableMenuItemSpec.class/instance/keyText.st create mode 100644 Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in.color..st delete mode 100644 Nautilus.package/AbstractNautilusUI.class/instance/setPackageShorcutsTo..st create mode 100644 Nautilus.package/AbstractNautilusUI.class/instance/setShortcuts.to..st create mode 100644 Nautilus.package/AbstractNautilusUI.class/instance/setShortcutsTo..st delete mode 100644 Nautilus.package/AbstractNautilusUI.class/instance/shiftedSourceCodeMenu..st create mode 100644 ScriptLoader20.package/ScriptLoader.class/instance/script481.st create mode 100644 ScriptLoader20.package/ScriptLoader.class/instance/update20503.st create mode 100644 Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu1..st create mode 100644 Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu2..st create mode 100644 Spec-Tools.package/ChangeSorterApplication.class/class/classListMenu..st create mode 100644 Spec-Tools.package/ChangeSorterApplication.class/class/messageListMenu..st create mode 100644 Spec-Tools.package/DualChangeSorterApplication.class/class/changesListMenu..st create mode 100644 Spec-Tools.package/DualChangeSorterApplication.class/class/classListMenu..st create mode 100644 Spec-Tools.package/DualChangeSorterApplication.class/class/messageListMenu..st create mode 100644 Spec-Tools.package/MessageBrowser.class/class/messageBrowserListMenu..st create mode 100644 Spec-Tools.package/MessageBrowser.class/instance/model.st create mode 100644 Tools.package/ChangeList.class/class/changeListMenu..st create mode 100644 Tools.package/ClassCommentVersionsBrowser.class/class/classCommentVersionsListMenu..st create mode 100644 Tools.package/Debugger.class/class/menuCodePane..st create mode 100644 Tools.package/Debugger.class/class/menuStack..st create mode 100644 Tools.package/Debugger.class/class/menuStackAction..st create mode 100644 Tools.package/Debugger.class/class/menuStackImplement..st create mode 100644 Tools.package/Debugger.class/class/menuStackPostMortemAction..st create mode 100644 Tools.package/Debugger.class/class/menuStackProceed..st create mode 100644 Tools.package/DictionaryInspector.class/class/menuDictionaryFieldList..st create mode 100644 Tools.package/FileList.class/class/contentMenu..st create mode 100644 Tools.package/Inspector.class/class/menuFieldList..st delete mode 100644 Tools.package/Inspector.class/instance/addCollectionItemsTo..st create mode 100644 Tools.package/ProcessBrowser.class/class/menuProcessList..st create mode 100644 Tools.package/ProcessBrowser.class/class/menuStackList..st create mode 100644 Tools.package/ProcessBrowser.class/instance/selectedProcess.st create mode 100644 Tools.package/SetInspector.class/class/menuDictionaryFieldList..st create mode 100644 Tools.package/VersionsBrowser.class/class/versionsBrowserListMenu..st diff --git a/CI-Core.package/SliceSubmitter.class/class/buildNautilusMenu..st b/CI-Core.package/SliceSubmitter.class/class/buildNautilusMenu..st index 8f1ffeb3a4..fe24fad2b1 100644 --- a/CI-Core.package/SliceSubmitter.class/class/buildNautilusMenu..st +++ b/CI-Core.package/SliceSubmitter.class/class/buildNautilusMenu..st @@ -1,6 +1,6 @@ nautilus menu buildNautilusMenu: aBuilder - + | package target mc | target := aBuilder model. (package := target selectedPackage) ifNil: [ ^self ]. diff --git a/CI-Core.package/SliceSubmitter.class/methodProperties.json b/CI-Core.package/SliceSubmitter.class/methodProperties.json index 9083f34c83..686dd4fdfe 100644 --- a/CI-Core.package/SliceSubmitter.class/methodProperties.json +++ b/CI-Core.package/SliceSubmitter.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "authenticate:with:" : "BenjaminVanRyseghem 7/4/2012 15:19", - "buildNautilusMenu:" : "EstebanLorenzano 11/7/2012 16:56" }, + "buildNautilusMenu:" : "EstebanLorenzano 1/30/2013 15:52" }, "instance" : { "commit:in:message:" : "BenjaminVanRyseghem 7/6/2012 16:44", "initialize" : "BenjaminVanRyseghem 7/6/2012 16:46", diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/README.md b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/README.md similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/README.md rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/README.md diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/instance/add..st b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/add..st similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/instance/add..st rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/add..st diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/instance/associationsDo..st b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/associationsDo..st similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/instance/associationsDo..st rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/associationsDo..st diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/instance/at.put..st b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/at.put..st similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/instance/at.put..st rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/at.put..st diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/instance/initialize..st b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/initialize..st similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/instance/initialize..st rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/initialize..st diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/instance/initialize.st b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/initialize.st similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/instance/initialize.st rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/initialize.st diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/instance/removeKey.ifAbsent..st b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/removeKey.ifAbsent..st similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/instance/removeKey.ifAbsent..st rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/instance/removeKey.ifAbsent..st diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/methodProperties.json b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/methodProperties.json similarity index 100% rename from Spec-Core.package/OrderedIdentityDictionary.class/methodProperties.json rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/methodProperties.json diff --git a/Spec-Core.package/OrderedIdentityDictionary.class/properties.json b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/properties.json similarity index 84% rename from Spec-Core.package/OrderedIdentityDictionary.class/properties.json rename to Collections-Sequenceable.package/OrderedIdentityDictionary.class/properties.json index e654aac585..f309382101 100644 --- a/Spec-Core.package/OrderedIdentityDictionary.class/properties.json +++ b/Collections-Sequenceable.package/OrderedIdentityDictionary.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Spec-Core", + "category" : "Collections-Sequenceable", "classinstvars" : [ ], "classvars" : [ diff --git a/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesGroup..st b/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesGroup..st index db2e70543f..4132211aa5 100644 --- a/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesGroup..st +++ b/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesGroup..st @@ -1,6 +1,6 @@ instance creation packagesGroup: aBuilder - + | packages target env rules group| target := aBuilder model. diff --git a/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesMenu..st b/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesMenu..st index bd8ae6886c..ac11a192b5 100644 --- a/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesMenu..st +++ b/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesMenu..st @@ -1,6 +1,6 @@ instance creation packagesMenu: aBuilder - + | packages target env rules | target := aBuilder model. (packages := target selectedPackages) ifNil: [ ^ {target} ]. diff --git a/Manifest-CriticBrowser.package/CriticBrowser.class/methodProperties.json b/Manifest-CriticBrowser.package/CriticBrowser.class/methodProperties.json index 390e852ab6..adf74656e6 100644 --- a/Manifest-CriticBrowser.package/CriticBrowser.class/methodProperties.json +++ b/Manifest-CriticBrowser.package/CriticBrowser.class/methodProperties.json @@ -7,8 +7,8 @@ "openOnCurrentWorkingConfiguration" : "StephaneDucasse 12/22/2012 19:52", "openOnRule:onEnvironment:" : "SimonAllier 5/22/2012 15:55", "openOnWorkspace:" : "BenjaminVanRyseghem 11/24/2012 18:12", - "packagesGroup:" : "SimonAllier 7/31/2012 11:06", - "packagesMenu:" : "StephaneDucasse 12/22/2012 19:52", + "packagesGroup:" : "EstebanLorenzano 1/30/2013 15:55", + "packagesMenu:" : "EstebanLorenzano 1/30/2013 15:52", "theme" : "" }, "instance" : { "addModelItemsToWindowMenu:" : "Sd 11/30/2012 17:33", diff --git a/MenuRegistration.package/MenuRegistration.class/instance/keyText..st b/MenuRegistration.package/MenuRegistration.class/instance/keyText..st new file mode 100644 index 0000000000..08776cfd09 --- /dev/null +++ b/MenuRegistration.package/MenuRegistration.class/instance/keyText..st @@ -0,0 +1,3 @@ +spec accessing +keyText: aString + self spec keyText: aString \ No newline at end of file diff --git a/MenuRegistration.package/MenuRegistration.class/methodProperties.json b/MenuRegistration.package/MenuRegistration.class/methodProperties.json index 6c4699a967..fef31bcb17 100644 --- a/MenuRegistration.package/MenuRegistration.class/methodProperties.json +++ b/MenuRegistration.package/MenuRegistration.class/methodProperties.json @@ -20,6 +20,7 @@ "itemList:" : "AlainPlantec 2/15/2010 11:17", "itemNamed:" : "BenjaminVanRyseghem 1/24/2012 20:29", "itemReceiver" : "AlainPlantec 2/13/2010 12:58", + "keyText:" : "EstebanLorenzano 1/30/2013 16:55", "label" : "AlainPlantec 2/12/2010 16:06", "label:" : "AlainPlantec 2/12/2010 16:06", "model" : "AlainPlantec 2/13/2010 12:54", diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/attachShortcutCategory.to..st b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/attachShortcutCategory.to..st index 8b580f40c5..d7978bfcd9 100644 --- a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/attachShortcutCategory.to..st +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/attachShortcutCategory.to..st @@ -1,4 +1,4 @@ -as yet unclassified +initialization attachShortcutCategory: aSymbol to: aClass KMRepository default attachCategoryName: aSymbol to: aClass. \ No newline at end of file diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/initialize.st b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/initialize.st index e6cffa8206..84ef9dc147 100644 --- a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/initialize.st +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/initialize.st @@ -1,4 +1,4 @@ -initialization +keymapping initialize "Initialization code for PragmaMenuAndShortcutRegistration" diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/keyText..st b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/keyText..st new file mode 100644 index 0000000000..44deee5cfc --- /dev/null +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/keyText..st @@ -0,0 +1,3 @@ +menu protocol +keyText: aString + self currentItem keyText: aString \ No newline at end of file diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/methodProperties.json b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/methodProperties.json index b4a647ee3b..821b43cc6a 100644 --- a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/methodProperties.json +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/methodProperties.json @@ -26,6 +26,7 @@ "item:" : "BenjaminVanRyseghem 4/7/2012 23:00", "itemClass" : "BenjaminVanRyseghem 4/7/2012 20:50", "items" : "BenjaminVanRyseghem 4/7/2012 21:25", + "keyText:" : "EstebanLorenzano 1/30/2013 16:47", "label:" : "BenjaminVanRyseghem 4/7/2012 20:49", "model" : "BenjaminVanRyseghem 4/7/2012 23:16", "model:" : "BenjaminVanRyseghem 4/7/2012 23:16", diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText..st b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText..st new file mode 100644 index 0000000000..6f5ca1d324 --- /dev/null +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText..st @@ -0,0 +1,3 @@ +menu protocol +keyText: aString + keyText := aString \ No newline at end of file diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText.st b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText.st new file mode 100644 index 0000000000..f7d133f3a4 --- /dev/null +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText.st @@ -0,0 +1,3 @@ +accessing +keyText + ^keyText \ No newline at end of file diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/methodProperties.json b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/methodProperties.json index cd83dabdb6..579f075919 100644 --- a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/methodProperties.json +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/methodProperties.json @@ -24,6 +24,8 @@ "isWithSeparatorAfter" : "BenjaminVanRyseghem 4/7/2012 21:29", "item" : "BenjaminVanRyseghem 4/7/2012 21:27", "item:" : "BenjaminVanRyseghem 4/7/2012 20:47", + "keyText" : "EstebanLorenzano 1/30/2013 16:48", + "keyText:" : "EstebanLorenzano 1/30/2013 16:47", "label" : "BenjaminVanRyseghem 4/7/2012 21:28", "label:" : "BenjaminVanRyseghem 4/7/2012 20:47", "order" : "BenjaminVanRyseghem 4/7/2012 21:34", diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/properties.json b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/properties.json index 93c800fd94..75a0b9b699 100644 --- a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/properties.json +++ b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/properties.json @@ -26,7 +26,8 @@ "platform", "default", "category", - "shortcutName" ], + "shortcutName", + "keyText" ], "name" : "PragmaMenuAndShortcutRegistrationItem", "pools" : [ ], diff --git a/MenuRegistration.package/PragmaMenuBuilder.class/instance/interpretRegistration..st b/MenuRegistration.package/PragmaMenuBuilder.class/instance/interpretRegistration..st index 27b133682c..0fa6aff290 100644 --- a/MenuRegistration.package/PragmaMenuBuilder.class/instance/interpretRegistration..st +++ b/MenuRegistration.package/PragmaMenuBuilder.class/instance/interpretRegistration..st @@ -22,6 +22,7 @@ interpretRegistration: aRegistration node action: item action ]]. node + keyText: item keyText; help: item help; icon: item icon; order: item order; diff --git a/MenuRegistration.package/PragmaMenuBuilder.class/methodProperties.json b/MenuRegistration.package/PragmaMenuBuilder.class/methodProperties.json index f9541fa31b..9a94dec43e 100644 --- a/MenuRegistration.package/PragmaMenuBuilder.class/methodProperties.json +++ b/MenuRegistration.package/PragmaMenuBuilder.class/methodProperties.json @@ -12,7 +12,7 @@ "collectRegistrations" : "BenjaminVanRyseghem 4/7/2012 22:19", "currentRoot:while:" : "AlainPlantec 2/16/2010 16:36", "initialize" : "AlainPlantec 11/16/2010 19:55", - "interpretRegistration:" : "BenjaminVanRyseghem 4/7/2012 23:44", + "interpretRegistration:" : "EstebanLorenzano 1/30/2013 16:54", "itemReceiver" : "AlainPlantec 2/13/2010 12:57", "menu" : "StephaneDucasse 6/5/2011 22:47", "menuAt:" : "StephaneDucasse 6/5/2011 22:47", diff --git a/Morphic.package/KeyboardEvent.class/instance/isUserInterrupt.st b/Morphic.package/KeyboardEvent.class/instance/isUserInterrupt.st new file mode 100644 index 0000000000..6c9424d63a --- /dev/null +++ b/Morphic.package/KeyboardEvent.class/instance/isUserInterrupt.st @@ -0,0 +1,5 @@ +testing +isUserInterrupt + + ^ UserInterruptHandler cmdDotEnabled and: [ self keyCharacter = $. and: [ self commandKeyPressed ] ]. + \ No newline at end of file diff --git a/Morphic.package/KeyboardEvent.class/methodProperties.json b/Morphic.package/KeyboardEvent.class/methodProperties.json index 8083169afd..0b6d17c783 100644 --- a/Morphic.package/KeyboardEvent.class/methodProperties.json +++ b/Morphic.package/KeyboardEvent.class/methodProperties.json @@ -9,6 +9,7 @@ "isKeyboard" : "ar 9/13/2000 15:49", "isKeystroke" : "ar 9/13/2000 15:49", "isMouseMove" : "ar 10/9/2000 00:43", + "isUserInterrupt" : "SeanDeNigris 1/29/2013 11:22", "keyCharacter" : "michael.rueger 3/11/2009 11:21", "keyString" : "nk 10/13/2004 10:43", "keyValue" : "ar 9/13/2000 15:51", diff --git a/Morphic.package/MenuMorph.class/instance/addAllFrom..st b/Morphic.package/MenuMorph.class/instance/addAllFrom..st index 8f943c8253..dc6cc4be91 100644 --- a/Morphic.package/MenuMorph.class/instance/addAllFrom..st +++ b/Morphic.package/MenuMorph.class/instance/addAllFrom..st @@ -1,13 +1,8 @@ construction -addAllFrom: aMenuMorph - aMenuMorph submorphs - do: [:each | - (each isKindOf: MenuItemMorph) - ifTrue: [self - add: each contents - target: each target - selector: each selector - argumentList: each arguments. - each icon ifNotNil: [:ic | self lastItem icon: ic]]. - (each isKindOf: MenuLineMorph) - ifTrue: [self addLine]] \ No newline at end of file +addAllFrom: aMenuMorph + "This is a fast add..." + submorphs := submorphs, (aMenuMorph submorphs collect: [ :each | + each copy + privateOwner: self; + yourself ]). + menuItems := submorphs copy asOrderedCollection \ No newline at end of file diff --git a/Morphic.package/MenuMorph.class/instance/addAllFromPragma.target..st b/Morphic.package/MenuMorph.class/instance/addAllFromPragma.target..st new file mode 100644 index 0000000000..5f536401e0 --- /dev/null +++ b/Morphic.package/MenuMorph.class/instance/addAllFromPragma.target..st @@ -0,0 +1,6 @@ +construction +addAllFromPragma: aString target: anObject + self addAllFrom: (PragmaMenuBuilder + pragmaKeyword: aString + model: anObject) + menu \ No newline at end of file diff --git a/Morphic.package/MenuMorph.class/methodProperties.json b/Morphic.package/MenuMorph.class/methodProperties.json index 841553e485..a6da428899 100644 --- a/Morphic.package/MenuMorph.class/methodProperties.json +++ b/Morphic.package/MenuMorph.class/methodProperties.json @@ -27,7 +27,8 @@ "add:target:selector:" : "BenjaminVanRyseghem 3/28/2011 15:01", "add:target:selector:argument:" : "BenjaminVanRyseghem 3/28/2011 15:45", "add:target:selector:argumentList:" : "BenjaminVanRyseghem 3/28/2011 15:01", - "addAllFrom:" : "AlainPlantec 10/20/2010 00:38", + "addAllFrom:" : "EstebanLorenzano 1/31/2013 19:25", + "addAllFromPragma:target:" : "EstebanLorenzano 1/31/2013 19:25", "addBlankIconsIfNecessary:" : "dgd 9/13/2004 19:59", "addCustomMenuItems:hand:" : "dgd 8/30/2003 21:52", "addItem" : "alain.plantec 2/6/2009 15:30", diff --git a/Morphic.package/PluggableMenuItemSpec.class/instance/asMenuItemMorphFrom.isLast..st b/Morphic.package/PluggableMenuItemSpec.class/instance/asMenuItemMorphFrom.isLast..st index fca446cbe3..5a83351e9e 100644 --- a/Morphic.package/PluggableMenuItemSpec.class/instance/asMenuItemMorphFrom.isLast..st +++ b/Morphic.package/PluggableMenuItemSpec.class/instance/asMenuItemMorphFrom.isLast..st @@ -9,6 +9,7 @@ asMenuItemMorphFrom: parentMenu isLast: aBoolean ifTrue: [ lbl := self hasCheckBox -> lbl]. it contents: lbl. it icon: self icon. + it keyText: self keyText. it isEnabled: self enabled. (act := self action) ifNotNil: [ it diff --git a/Morphic.package/PluggableMenuItemSpec.class/instance/keyText..st b/Morphic.package/PluggableMenuItemSpec.class/instance/keyText..st new file mode 100644 index 0000000000..b26f9661de --- /dev/null +++ b/Morphic.package/PluggableMenuItemSpec.class/instance/keyText..st @@ -0,0 +1,3 @@ +accessing +keyText: aString + keyText := aString. \ No newline at end of file diff --git a/Morphic.package/PluggableMenuItemSpec.class/instance/keyText.st b/Morphic.package/PluggableMenuItemSpec.class/instance/keyText.st new file mode 100644 index 0000000000..f7d133f3a4 --- /dev/null +++ b/Morphic.package/PluggableMenuItemSpec.class/instance/keyText.st @@ -0,0 +1,3 @@ +accessing +keyText + ^keyText \ No newline at end of file diff --git a/Morphic.package/PluggableMenuItemSpec.class/methodProperties.json b/Morphic.package/PluggableMenuItemSpec.class/methodProperties.json index f0e6d6d0a2..90e566fcdd 100644 --- a/Morphic.package/PluggableMenuItemSpec.class/methodProperties.json +++ b/Morphic.package/PluggableMenuItemSpec.class/methodProperties.json @@ -5,7 +5,7 @@ "action" : "ar 2/28/2006 17:23", "action:" : "ar 2/28/2006 17:23", "analyzeLabel" : "AlainPlantec 2/15/2010 11:28", - "asMenuItemMorphFrom:isLast:" : "StephaneDucasse 4/23/2012 12:19", + "asMenuItemMorphFrom:isLast:" : "EstebanLorenzano 1/30/2013 16:45", "checked" : "AlainPlantec 2/8/2010 11:16", "checked:" : "ar 2/28/2006 17:21", "enabled" : "BenjaminVanRyseghem 4/13/2011 17:24", @@ -15,6 +15,8 @@ "hasCheckBox" : "AlainPlantec 2/10/2010 08:19", "icon" : "AlainPlantec 2/12/2010 22:22", "icon:" : "AlainPlantec 2/12/2010 22:22", + "keyText" : "EstebanLorenzano 1/30/2013 16:45", + "keyText:" : "EstebanLorenzano 1/30/2013 16:44", "label" : "ar 2/28/2006 17:20", "label:" : "ar 2/28/2006 17:21", "morphClass" : "StephaneDucasse 6/10/2011 22:14", diff --git a/Morphic.package/PluggableMenuItemSpec.class/properties.json b/Morphic.package/PluggableMenuItemSpec.class/properties.json index 7177f71ba7..bb852de575 100644 --- a/Morphic.package/PluggableMenuItemSpec.class/properties.json +++ b/Morphic.package/PluggableMenuItemSpec.class/properties.json @@ -13,7 +13,8 @@ "separator", "subMenu", "icon", - "enabledBlock" ], + "enabledBlock", + "keyText" ], "name" : "PluggableMenuItemSpec", "pools" : [ ], diff --git a/Morphic.package/ToggleMenuItemMorph.class/instance/drawKeyTextOn..st b/Morphic.package/ToggleMenuItemMorph.class/instance/drawKeyTextOn..st index 7e460471f8..45e9c3aa1e 100644 --- a/Morphic.package/ToggleMenuItemMorph.class/instance/drawKeyTextOn..st +++ b/Morphic.package/ToggleMenuItemMorph.class/instance/drawKeyTextOn..st @@ -3,8 +3,8 @@ drawKeyTextOn: aCanvas "Draw the key text on the canvas." |ktp ktw b| - self keyText ifNil: [^self]. + self keyText ifNil: [^self]. ktp := self hasSubMenu ifTrue: [self right - self subMenuMarker width] ifFalse: [self right]. ktp := ktp - (ktw := self fontToUse widthOfString: self keyText). b := (ktp @ (self bounds top + self bounds bottom - self fontToUse height // 2) extent: ktw @ self height). - self drawText: self keyText on: aCanvas in: b \ No newline at end of file + self drawText: self keyText on: aCanvas in: b color: Color gray muchDarker. \ No newline at end of file diff --git a/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in..st b/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in..st index 152354d78b..515359f64d 100644 --- a/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in..st +++ b/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in..st @@ -1,21 +1,7 @@ as yet unclassified drawText: aStringOrText on: aCanvas in: aRectangle - "Draw the text on the canvas within the given bounds." - - (self enabled not and: [self theme disabledItemStyle = #inset]) - ifTrue: [|stringColor| - stringColor := self stringColorToUse. - aCanvas - drawString: aStringOrText - in: aRectangle - font: self fontToUse - color: stringColor muchLighter lighter; - drawString: aStringOrText - in: (aRectangle translateBy: -1) - font: self fontToUse - color: stringColor] - ifFalse: [aCanvas - drawString: aStringOrText - in: aRectangle - font: self fontToUse - color: self stringColorToUse] \ No newline at end of file + ^ self + drawText: aStringOrText + on: aCanvas + in: aRectangle + color: self stringColorToUse. \ No newline at end of file diff --git a/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in.color..st b/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in.color..st new file mode 100644 index 0000000000..eea481f1fb --- /dev/null +++ b/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in.color..st @@ -0,0 +1,20 @@ +as yet unclassified +drawText: aStringOrText on: aCanvas in: aRectangle color: stringColor + "Draw the text on the canvas within the given bounds." + + (self enabled not and: [self theme disabledItemStyle = #inset]) + ifTrue: [ + aCanvas + drawString: aStringOrText + in: aRectangle + font: self fontToUse + color: stringColor muchLighter lighter; + drawString: aStringOrText + in: (aRectangle translateBy: -1) + font: self fontToUse + color: stringColor] + ifFalse: [aCanvas + drawString: aStringOrText + in: aRectangle + font: self fontToUse + color: stringColor ] \ No newline at end of file diff --git a/Morphic.package/ToggleMenuItemMorph.class/methodProperties.json b/Morphic.package/ToggleMenuItemMorph.class/methodProperties.json index 98d4ed973c..4c8d5ba385 100644 --- a/Morphic.package/ToggleMenuItemMorph.class/methodProperties.json +++ b/Morphic.package/ToggleMenuItemMorph.class/methodProperties.json @@ -6,10 +6,11 @@ "adoptPaneColor:" : "gvc 3/29/2007 16:25", "basicDrawOn:" : "GaryChambers 9/21/2011 14:12", "drawIcon:on:in:" : "gvc 10/17/2008 14:05", - "drawKeyTextOn:" : "gvc 10/17/2008 13:40", + "drawKeyTextOn:" : "EstebanLorenzano 1/30/2013 18:36", "drawOn:" : "gvc 10/12/2006 15:30", "drawSubMenuMarker:on:in:" : "gvc 10/17/2008 14:11", - "drawText:on:in:" : "gvc 3/1/2010 16:09", + "drawText:on:in:" : "EstebanLorenzano 1/30/2013 17:35", + "drawText:on:in:color:" : "EstebanLorenzano 1/30/2013 17:38", "enablementSelector" : "gvc 6/9/2006 09:35", "enablementSelector:" : "gvc 6/9/2006 09:35", "getStateSelector" : "gvc 6/9/2006 09:16", diff --git a/Nautilus.package/AbstractNautilusUI.class/class/buildAnalyzeSubMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/buildAnalyzeSubMenu..st index e1af00239a..27c400a805 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/buildAnalyzeSubMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/buildAnalyzeSubMenu..st @@ -1,7 +1,9 @@ menu buildAnalyzeSubMenu: aBuilder - + + | target | + target := aBuilder model. target selectedClass ifNil: [^target]. @@ -28,12 +30,14 @@ buildAnalyzeSubMenu: aBuilder order: 300; enabledBlock: [ target showInstance ]. - (aBuilder item: #'Generate initialize method (h, i)') + (aBuilder item: #'Generate initialize method') + keyText: 'h, i'; action: [ target generateInitialize ]; parent: #Analyze; order: 350. - (aBuilder item: #'Force the generaton of the initialize method (h, k)') + (aBuilder item: #'Force the generaton of the initialize method') + keyText: 'h, k'; action: [ target forceGenerateInitialize ]; parent: #Analyze; order: 375; @@ -45,7 +49,8 @@ buildAnalyzeSubMenu: aBuilder parent: #Analyze; order: 400. - (aBuilder item: #'Class refs... (b, N)') + (aBuilder item: #'Class refs...') + keyText: 'b, N'; action: [target browseClassRefs]; parent: #Analyze; order: 500. diff --git a/Nautilus.package/AbstractNautilusUI.class/class/buildBrowseShortcutsOn..st b/Nautilus.package/AbstractNautilusUI.class/class/buildBrowseShortcutsOn..st index 397839cdfc..0d9b7c1c41 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/buildBrowseShortcutsOn..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/buildBrowseShortcutsOn..st @@ -1,6 +1,6 @@ shortcuts buildBrowseShortcutsOn: aBuilder - + (aBuilder shortcut: #browseSenders) category: #NautilusGlobalShortcuts diff --git a/Nautilus.package/AbstractNautilusUI.class/class/classesFixMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/classesFixMenu..st index e216c91135..bbfd53d3af 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/classesFixMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/classesFixMenu..st @@ -1,20 +1,24 @@ menu classesFixMenu: aBuilder - + + | target | target := aBuilder model. - (aBuilder item: #'Find Method... (f, m)') + (aBuilder item: #'Find Method...') + keyText: 'f, m'; action: [target findMethod]; order: 100; help: 'Search for a method by selector'. - (aBuilder item: #'Find Class... (f, c)') + (aBuilder item: #'Find Class...') + keyText: 'f, c'; action: [ target findClass ]; order: 200; help: 'Search for a method by selector'. - (aBuilder item: #'Add Class... (n, c)') + (aBuilder item: #'Add Class...') + keyText: 'n, c'; action: [ target addClass ]; order: 400; help: 'Create a new class'. @@ -23,7 +27,8 @@ classesFixMenu: aBuilder order: 500; withSeparatorAfter. - (aBuilder item: #'Browse full (b, f)') + (aBuilder item: #'Browse full') + keyText: 'b, f'; action: [target fullBrowse]; order: 999; help: 'Open the same browser'. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/class/classesMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/classesMenu..st index 46171e93e2..5646869993 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/classesMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/classesMenu..st @@ -1,29 +1,35 @@ menu classesMenu: aBuilder - + + | target | + target := aBuilder model. target selectedClass ifNil: [^target]. - - (aBuilder item: #'Rename... (r, c)') + + (aBuilder item: #'Rename...') + keyText: 'r,c'; action: [ target renameClass ]; enabledBlock: [ target selectedClasses size <= 1 ]; order: -99; withSeparatorAfter. - (aBuilder item: #'Browse scoped (b, s)') + (aBuilder item: #'Browse scoped') + keyText: 'b, s'; action: [target restrictedBrowseClass]; order: 1000; help: 'Open a browser on a restricted view'. - (aBuilder item: #'Add in Group... (n, e, c)') + (aBuilder item: #'Add in Group...') + keyText: 'n, e, c'; action: [ target addClassesInGroup ]; order: 1100; withSeparatorAfter. (target selectedClasses allSatisfy: [:each | each inheritsFrom: TestCase ]) ifTrue:[ - (aBuilder item:#'Run tests (j, c)') + (aBuilder item:#'Run tests') + keyText: 'j, c'; action: [ target runClassTests ]; order: 1200]. @@ -32,22 +38,26 @@ classesMenu: aBuilder order: 0; withSeparatorAfter. - (aBuilder item: #'Jump to test class (g, j)') + (aBuilder item: #'Jump to test class') + keyText: 'g, j'; action: [ target createTestForSelectedClass ]; enabledBlock: [ target selectedClasses size <= 1 ]; order: 300; withSeparatorAfter. - (aBuilder item: #'Move to package... (m, c)') + (aBuilder item: #'Move to package...') + keyText: 'm, c'; action: [ target moveInNewPackage ]; order: 1400. - (aBuilder item: #'Copy... (c, c)') + (aBuilder item: #'Copy...') + keyText: 'c, c'; action: [ target copyClasses ]; order: 1600. - (aBuilder item: #'Remove... (x, c)') + (aBuilder item: #'Remove...') + keyText: 'x, c'; action: [ target removeClasses ]; icon: (target iconClass iconNamed: #removeIcon); order: 1700; @@ -62,6 +72,7 @@ classesMenu: aBuilder ifTrue: [ target selectedGroup isReadOnly ifFalse: [ - (aBuilder item: #'Remove from Group (X)') + (aBuilder item: #'Remove from Group') + keyText: 'X'; action: [ target removeClassFromGroup ]; - order: 1900]]. \ No newline at end of file + order: 1900] ]. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/class/debugMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/debugMenu..st index 089814a96e..d17b3051fe 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/debugMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/debugMenu..st @@ -1,10 +1,12 @@ menu debugMenu: aBuilder - - - - - + + + + + + + | target | target := aBuilder model. (aBuilder item: #DebugMenu) diff --git a/Nautilus.package/AbstractNautilusUI.class/class/groupsFixMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/groupsFixMenu..st index b4d1f2a52a..7392c13c1d 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/groupsFixMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/groupsFixMenu..st @@ -1,18 +1,22 @@ menu groupsFixMenu: aBuilder - + + | target | target := aBuilder model. - (aBuilder item: #'Find Class... (f, c)') + (aBuilder item: #'Find Class...') + keyText: 'f, c'; action: [target findClass]; order: 0; help: 'Search for a class by name'. - (aBuilder item: #'New group... (n, g)') + (aBuilder item: #'New group...') + keyText: 'n, g'; action: [target addNewGroup]; order: 100; withSeparatorAfter. - (aBuilder item: #'Browse full (b, f)') + (aBuilder item: #'Browse full') + keyText: 'b, f'; action: [target fullBrowse]; order: 999. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/class/groupsMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/groupsMenu..st index 6573f806eb..3c839b30c7 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/groupsMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/groupsMenu..st @@ -1,16 +1,19 @@ menu groupsMenu: aBuilder - + + | target | target := aBuilder model. target selectedGroup ifNil: [ ^ target ]. - (aBuilder item: #'Browse scoped (b, s)') + (aBuilder item: #'Browse scoped') + keyText: 'b, s'; action: [ target restrictedBrowseGroups: target selectedGroups ]; order: 1000; withSeparatorAfter. - (aBuilder item: #'Run tests (j, g)') + (aBuilder item: #'Run tests') + keyText: 'j, g'; action: [ target runTestsOfGroups: target selectedGroups notifying: true ]; order: 1100. @@ -23,13 +26,15 @@ groupsMenu: aBuilder ifFalse: [ target selectedGroup isReadOnly ifFalse: [ - (aBuilder item: #'Rename... (r, g)') + (aBuilder item: #'Rename...') + keyText: 'r, g'; action: [target renameGroup]; enabledBlock: [ target selectedGroups size <= 1]; order: 1300 ]. target selectedGroup removable ifTrue: [ - (aBuilder item: #'Remove groups (x, g)') + (aBuilder item: #'Remove groups') + keyText: 'x, g'; icon: (target iconClass iconNamed: #removeIcon); action: [target removeGroups]; - order: 1400 ]] \ No newline at end of file + order: 1400 ] ] \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/class/packagesFixMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/packagesFixMenu..st index 762df2155a..7e93265d87 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/packagesFixMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/packagesFixMenu..st @@ -1,27 +1,32 @@ menu packagesFixMenu: aBuilder - + + | target | target := aBuilder model. - (aBuilder item: #'Find Class... (f, c)') + (aBuilder item: #'Find Class...') + keyText: 'f, c'; action: [target findClass]; order: 0; help: 'Search for a class by name'. - (aBuilder item: #'Find Package... (f, p)') + (aBuilder item: #'Find Package...') + keyText: 'f, p'; action: [ target findPackage ]; order: 100; help: 'Search for a package by name'; withSeparatorAfter. - (aBuilder item: #'Add package... (n, p)') + (aBuilder item: #'Add package...') + keyText: 'n, p'; action: [target addPackage]; order: 200; help: 'Add a package'; withSeparatorAfter. - (aBuilder item: #'Browse full (b, f)') + (aBuilder item: #'Browse full') + keyText: 'b, f'; action: [target fullBrowse]; order: 999; help: 'Open the same browser'. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/class/packagesMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/packagesMenu..st index 5a7d61a46b..12a1b8b662 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/packagesMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/packagesMenu..st @@ -1,29 +1,34 @@ menu packagesMenu: aBuilder - + + | package target | target := aBuilder model. (package := target selectedPackage) ifNil: [ ^ target ]. - (aBuilder item: #'Browse scoped (b, s)') + (aBuilder item: #'Browse scoped') + keyText: 'b, s'; action: [ target restrictedBrowsePackage ]; order: 1000; help: 'Open a browser on a restricted view'; withSeparatorAfter. - (aBuilder item: #'Rename... (r, p)') + (aBuilder item: #'Rename...') + keyText: 'r, p'; action: [target renamePackage]; order: 1100; help: 'Rename a package'; enabledBlock: [ target selectedPackages size < 2 ]. - (aBuilder item: #'Remove... (x, p)') + (aBuilder item: #'Remove...') + keyText: 'x, p'; action: [target removePackages ]; order: 1200; help: 'Remove a package'; icon: (target iconClass iconNamed: #removeIcon). - (aBuilder item: #'Run tests... (j, p)') + (aBuilder item: #'Run tests...') + keyText: 'j, p'; action: [target runPackagesTestsNotifying: true ]; enabled: (package classes anySatisfy: [:e | e inheritsFrom: TestCase ]); order: 1250; @@ -38,17 +43,14 @@ packagesMenu: aBuilder target selectedPackages size > 1 ifTrue: [ - (aBuilder item: #'Add as Groups & Browse (n, g)') + (aBuilder item: #'Add as Groups & Browse') + keyText: 'n, g'; action: [ target addPackagesAsGroupsAndBrowse ]; order: 1400; help: 'Create a group based on the current package and browse it'. - - (aBuilder item: #'Add as Group & Browse') - action: [ target addPackageAsGroupAndBrowse ]; - order: 1500; - help: 'Create a group based on the current package and browse it'. - (aBuilder item: #'Add as Groups (n, G)') + (aBuilder item: #'Add as Groups') + keyText: 'n, G'; action: [ target addPackagesAsGroups ]; order: 1600; help: 'Create a group based on the current package'. @@ -59,23 +61,26 @@ packagesMenu: aBuilder help: 'Create a group based on the current package'. ] ifFalse: [ - (aBuilder item: #'Add as Group & Browse (n, g)') + (aBuilder item: #'Add as Group & Browse') + keyText: 'n, g'; action: [ target addPackageAsGroupAndBrowse ]; order: 1500; help: 'Create a group based on the current package and browse it'. - (aBuilder item: #'Add as Group (n, G)') + (aBuilder item: #'Add as Group') + keyText: 'n, G'; action: [target addPackageAsGroup]; order: 1700; - help: 'Create a group based on the current package'. - ]. + help: 'Create a group based on the current package' ]. - (aBuilder item: #'Add Matching Packages as Groups and Browse (n, m)') + (aBuilder item: #'Add Matching Packages as Groups and Browse') + keyText: 'n, m'; action: [ target addMatchingPackagesInGroupsAndBrowse ]; order: 1800. - (aBuilder item: #'Add in Group... (n, e, p)') + (aBuilder item: #'Add in Group...') + keyText: 'n, e, p'; action: [target addPackagesInGroup]; order: 1900; help: 'Add current package in a group'; diff --git a/Nautilus.package/AbstractNautilusUI.class/class/shiftedSourceCodeMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/shiftedSourceCodeMenu..st index f635c4ad1d..11b2bf1ed3 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/shiftedSourceCodeMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/shiftedSourceCodeMenu..st @@ -1,7 +1,9 @@ menu shiftedSourceCodeMenu: aBuilder - "" + + | donorMenu items | + items := OrderedCollection new. donorMenu := SmalltalkEditor shiftedYellowButtonMenu. donorMenu submorphs doWithIndex: [:each :index | @@ -9,9 +11,10 @@ shiftedSourceCodeMenu: aBuilder ifTrue: [ items last withSeparatorAfter ] ifFalse: [ items add: ((aBuilder item: each contents asSymbol) + keyText: each keyText; selector: each selector; target: each target; - parent: #'Extended Search...'; + parent: #'Extended search...'; arguments: each arguments; order: (index*100)). each icon ifNotNil: [:ic | items last icon: ic ]]]. diff --git a/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenu..st index 2b1080062d..c6d2f3b964 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenu..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenu..st @@ -1,6 +1,7 @@ menu sourceCodeMenu: aBuilder - + + | donorMenu items | items := OrderedCollection new. @@ -10,6 +11,7 @@ sourceCodeMenu: aBuilder ifTrue: [ items last withSeparatorAfter ] ifFalse: [ items add: ((aBuilder item: each contents asSymbol) + keyText: each keyText; selector: each selector; target: each target; arguments: each arguments; @@ -20,4 +22,4 @@ sourceCodeMenu: aBuilder (aBuilder item: #'lock this text area') selector: #lockTextArea; target: aBuilder model; - order: 100. \ No newline at end of file + order: 0. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenuExtra..st b/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenuExtra..st index a94ece5055..711061c102 100644 --- a/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenuExtra..st +++ b/Nautilus.package/AbstractNautilusUI.class/class/sourceCodeMenuExtra..st @@ -1,14 +1,16 @@ menu sourceCodeMenuExtra: aBuilder - + + | target method | target := aBuilder model. target selectedClass ifNil: [ ^ self ]. method := target selectedMethod. ((target selectedClass inheritsFrom: TestCase) and: [ method notNil and: [ method selector beginsWith: 'test' ]]) ifTrue: [ - (aBuilder item: #'Run Test (j, m)') + (aBuilder item: #'Run Test') order: 1; + keyText: 'j, m'; action: #runTestForAMethod:notifying:; arguments: { target selectedMethod. true }; enabledBlock: [ target sourceTextArea hasUnacceptedEdits not ]; diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/buildCommentButton.st b/Nautilus.package/AbstractNautilusUI.class/instance/buildCommentButton.st index 015b192e80..5de68d4dd7 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/buildCommentButton.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/buildCommentButton.st @@ -8,7 +8,7 @@ buildCommentButton action: #commentButtonAction label: #commentButtonLabel) hResizing: #spaceFill; vResizing: #shrinkWrap. - self setGlobalShorcutsTo: button. + self setShortcuts: #NautilusCommentShortcuts to: button. button submorphs first on: #doubleClick send: #toggleShowFullComment diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/buildFirstColumn..st b/Nautilus.package/AbstractNautilusUI.class/instance/buildFirstColumn..st index 67c7f82e0b..9860c3c089 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/buildFirstColumn..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/buildFirstColumn..st @@ -3,7 +3,7 @@ buildFirstColumn: aWindow | buttons | buttons := PanelMorph new. - self setGlobalShorcutsTo: buttons. + self setShortcuts: #NautilusPackageShortcuts to: buttons. buttons changeProportionalLayout; addMorph: self buildGroupsButton diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/buildGroupsButton.st b/Nautilus.package/AbstractNautilusUI.class/instance/buildGroupsButton.st index 03d5aa36b2..c15af46880 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/buildGroupsButton.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/buildGroupsButton.st @@ -6,5 +6,5 @@ buildGroupsButton getState: #groupsButtonState action: #groupsButtonAction label: #groupsButtonLabel) hResizing: #spaceFill; vResizing: #shrinkWrap. - self setGlobalShorcutsTo: button. + self setShortcuts: #NautilusGroupShortcuts to: button. ^ button \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/buildList.st b/Nautilus.package/AbstractNautilusUI.class/instance/buildList.st index a9b70b7f61..60c5d98492 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/buildList.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/buildList.st @@ -25,7 +25,7 @@ buildList basicGetListElementSelector: #listElement:. - self setGlobalShorcutsTo: list. + self setShortcuts: #NautilusPackageShortcuts to: list. list hResizing: #spaceFill; diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/buildList2.st b/Nautilus.package/AbstractNautilusUI.class/instance/buildList2.st index 4f35a9f8be..d6cb120b40 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/buildList2.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/buildList2.st @@ -26,6 +26,6 @@ buildList2 getListElementSelector: #listElement2:. - self setGlobalShorcutsTo: list2. + self setShortcuts: #NautilusClassShortcuts to: list2. ^ list2 \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/categoryMenuBuilder.st b/Nautilus.package/AbstractNautilusUI.class/instance/categoryMenuBuilder.st index 5e1976ed46..99e2f9073a 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/categoryMenuBuilder.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/categoryMenuBuilder.st @@ -1,4 +1,4 @@ -menu pragmas +menu builder categoryMenuBuilder ^ PragmaMenuBuilder withAllPragmaKeywords: {self commonPragma. self categoryPragma} model: self \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/categoryPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/categoryPragma.st index 6f1c58244f..f7b902ee4d 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/categoryPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/categoryPragma.st @@ -1,4 +1,3 @@ menu pragmas categoryPragma - - ^'nautilusProtocolMenu' \ No newline at end of file + ^'nautilusGlobalProtocolMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/classFixPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/classFixPragma.st index 7efed83d28..8c232a0ba3 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/classFixPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/classFixPragma.st @@ -1,4 +1,3 @@ menu pragmas classFixPragma - - ^'nautilusClassFixMenu' \ No newline at end of file + ^'nautilusGlobalClassFixMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/classMenuBuilder.st b/Nautilus.package/AbstractNautilusUI.class/instance/classMenuBuilder.st index 7c7144cbf0..a55e46734e 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/classMenuBuilder.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/classMenuBuilder.st @@ -1,4 +1,4 @@ -menu pragmas +menu builder classMenuBuilder ^ PragmaMenuBuilder withAllPragmaKeywords: {self classFixPragma. self classPragma} model: self \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/classPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/classPragma.st index 7d69d06c4d..b45248a724 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/classPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/classPragma.st @@ -1,4 +1,3 @@ menu pragmas classPragma - - ^'nautilusClassMenu' \ No newline at end of file + ^'nautilusGlobalClassMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/classesMenu.shifted..st b/Nautilus.package/AbstractNautilusUI.class/instance/classesMenu.shifted..st index 35ced45b15..f0bf12bbfa 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/classesMenu.shifted..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/classesMenu.shifted..st @@ -1,4 +1,4 @@ -menu pragmas +menu builder classesMenu: aMenu shifted: aBoolean - ^ aMenu becomeForward: (self classMenuBuilder menu) \ No newline at end of file + ^ aMenu addAllFrom: self classMenuBuilder menu. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/codePaneMenu.shifted..st b/Nautilus.package/AbstractNautilusUI.class/instance/codePaneMenu.shifted..st index 049a02b65c..a05a0ba47b 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/codePaneMenu.shifted..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/codePaneMenu.shifted..st @@ -5,6 +5,6 @@ codePaneMenu: aMenu shifted: shifted text pane" | donorMenu | donorMenu := shifted - ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] - ifFalse: [SmalltalkEditor yellowButtonMenu]. + ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] + ifFalse: [SmalltalkEditor yellowButtonMenu]. ^ aMenu addAllFrom: donorMenu \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/commonPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/commonPragma.st index 96ee51a684..a286009422 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/commonPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/commonPragma.st @@ -1,4 +1,3 @@ menu pragmas commonPragma - - ^'nautilusCommonMenu' \ No newline at end of file + ^'nautilusGlobalCommonMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/groupFixPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/groupFixPragma.st index cd877989a5..fb388da265 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/groupFixPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/groupFixPragma.st @@ -1,4 +1,3 @@ menu pragmas groupFixPragma - - ^'nautilusGroupFixMenu' \ No newline at end of file + ^'nautilusGlobalGroupFixMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/groupMenuBuilder.st b/Nautilus.package/AbstractNautilusUI.class/instance/groupMenuBuilder.st index c5946a65b5..b836cfe767 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/groupMenuBuilder.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/groupMenuBuilder.st @@ -1,4 +1,4 @@ -menu pragmas +menu builder groupMenuBuilder ^ PragmaMenuBuilder withAllPragmaKeywords: {self groupFixPragma. self groupPragma} model: self \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/groupPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/groupPragma.st index 5f3060fb15..13e17096b2 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/groupPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/groupPragma.st @@ -1,4 +1,3 @@ menu pragmas groupPragma - - ^'nautilusGroupMenu' \ No newline at end of file + ^'nautilusGlobalGroupMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/groupsMenu.shifted..st b/Nautilus.package/AbstractNautilusUI.class/instance/groupsMenu.shifted..st index 8a38d290b1..47818634ce 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/groupsMenu.shifted..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/groupsMenu.shifted..st @@ -1,5 +1,5 @@ -menu pragmas +menu builder groupsMenu: aMenu shifted: aBoolean " Morphic's menus are filled up when pragma's one are returned from a method, so I have to substitute the morphic menu by the pragma one " - ^ aMenu becomeForward: (self groupMenuBuilder menu) \ No newline at end of file + ^ aMenu addAllFrom: (self groupMenuBuilder menu) \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/methodMenuBuilder.st b/Nautilus.package/AbstractNautilusUI.class/instance/methodMenuBuilder.st index 0e66acb500..bd26ec4ee9 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/methodMenuBuilder.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/methodMenuBuilder.st @@ -1,4 +1,4 @@ -menu pragmas +menu builder methodMenuBuilder ^ PragmaMenuBuilder withAllPragmaKeywords: {self commonPragma. self methodPragma} model: self \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/methodPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/methodPragma.st index fa6c3bc88f..2e1a3756f9 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/methodPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/methodPragma.st @@ -1,4 +1,3 @@ menu pragmas methodPragma - - ^'nautilusMethodMenu' \ No newline at end of file + ^'nautilusGlobalMethodMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/packageFixPragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/packageFixPragma.st index 5418116b26..5000dffc7e 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/packageFixPragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/packageFixPragma.st @@ -1,4 +1,3 @@ menu pragmas packageFixPragma - - ^ 'nautilusPackageFixMenu' \ No newline at end of file + ^ 'nautilusGlobalPackageFixMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/packageMenuBuilder.st b/Nautilus.package/AbstractNautilusUI.class/instance/packageMenuBuilder.st index e658d1cc9b..c48ba811c7 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/packageMenuBuilder.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/packageMenuBuilder.st @@ -1,4 +1,4 @@ -menu pragmas +menu builder packageMenuBuilder ^ PragmaMenuBuilder withAllPragmaKeywords: {self packageFixPragma. self packagePragma} model: self \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/packagePragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/packagePragma.st index b09b673152..a07105cea5 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/packagePragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/packagePragma.st @@ -1,4 +1,3 @@ menu pragmas packagePragma - - ^ 'nautilusPackageMenu' \ No newline at end of file + ^ 'nautilusGlobalPackageMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/packagesMenu.shifted..st b/Nautilus.package/AbstractNautilusUI.class/instance/packagesMenu.shifted..st index be756d350f..79d7ef9303 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/packagesMenu.shifted..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/packagesMenu.shifted..st @@ -1,4 +1,3 @@ -menu pragmas +menu builder packagesMenu: aMenu shifted: aBoolean - - ^ aMenu becomeForward: (self packageMenuBuilder menu) \ No newline at end of file + ^ aMenu addAllFrom: (self packageMenuBuilder menu) \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/setPackageShorcutsTo..st b/Nautilus.package/AbstractNautilusUI.class/instance/setPackageShorcutsTo..st deleted file mode 100644 index 6193c5ddbe..0000000000 --- a/Nautilus.package/AbstractNautilusUI.class/instance/setPackageShorcutsTo..st +++ /dev/null @@ -1,4 +0,0 @@ -shortcuts -setPackageShorcutsTo: aList - - aList attachKeymapCategory: #NautilusPackageShortcuts targetting: self. \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/setShortcuts.to..st b/Nautilus.package/AbstractNautilusUI.class/instance/setShortcuts.to..st new file mode 100644 index 0000000000..daef2a0dbb --- /dev/null +++ b/Nautilus.package/AbstractNautilusUI.class/instance/setShortcuts.to..st @@ -0,0 +1,7 @@ +shortcuts +setShortcuts: groupSymbol to: anObject + self setGlobalShorcutsTo: anObject. + "anObject + attachKeymapCategory: groupSymbol + targetting: self." + \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/setShortcutsTo..st b/Nautilus.package/AbstractNautilusUI.class/instance/setShortcutsTo..st new file mode 100644 index 0000000000..9d984da583 --- /dev/null +++ b/Nautilus.package/AbstractNautilusUI.class/instance/setShortcutsTo..st @@ -0,0 +1,4 @@ +shortcuts +setShortcutsTo: anObject + self setGlobalShorcutsTo: anObject. + \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/shiftedSourceCodeMenu..st b/Nautilus.package/AbstractNautilusUI.class/instance/shiftedSourceCodeMenu..st deleted file mode 100644 index a91e53a8b3..0000000000 --- a/Nautilus.package/AbstractNautilusUI.class/instance/shiftedSourceCodeMenu..st +++ /dev/null @@ -1,18 +0,0 @@ -menus -shiftedSourceCodeMenu: aBuilder - - | donorMenu items | - items := OrderedCollection new. - donorMenu := SmalltalkEditor shiftedYellowButtonMenu. - donorMenu submorphs doWithIndex: [:each :order | - (each isKindOf: MenuLineMorph) - ifTrue: [ items last withSeparatorAfter ] - ifFalse: [ - items add: ((aBuilder item: each contents asSymbol) - selector: each selector; - target: each target; - parent: #'Extended search...'; - arguments: each arguments; - order: order). - each icon ifNotNil: [:ic | items last icon: ic ]]]. - (items last: 2) doWithIndex: [:e :i | e order: (9998 + i) ] \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/showGroups..st b/Nautilus.package/AbstractNautilusUI.class/instance/showGroups..st index f38a063aec..04d45fcb54 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/showGroups..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/showGroups..st @@ -3,11 +3,11 @@ showGroups: aBoolean self okToChange ifFalse: [ ^ self ]. - self setGlobalShorcutsTo: list2. + self setShortcuts: #NautilusClassShortcuts to: list2. aBoolean ifTrue: [ list enabled: true ]. - self setGlobalShorcutsTo: list. + self setShortcuts: #NautilusGroupShortcuts to: list. listElements := nil. self showPackages diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenu.shifted..st b/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenu.shifted..st index 674d37020a..43514ba6bd 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenu.shifted..st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenu.shifted..st @@ -1,5 +1,5 @@ -menu pragmas +menu builder sourceCodeMenu: aMenu shifted: shifted " Morphic's menus are filled up when pragma's one are returned from a method, so I have to substitute the morphic menu by the pragma one " - ^ aMenu becomeForward: (self sourceCodeMenuBuilder menu) \ No newline at end of file + ^ aMenu addAllFrom: (self sourceCodeMenuBuilder menu) \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenuBuilder.st b/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenuBuilder.st index 2c66b26fa4..8196a4247f 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenuBuilder.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodeMenuBuilder.st @@ -1,4 +1,4 @@ -menu pragmas +menu builder sourceCodeMenuBuilder ^ PragmaMenuBuilder pragmaKeyword: self sourceCodePragma model: self \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodePragma.st b/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodePragma.st index ab9a40cfd4..50787c5e99 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodePragma.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/sourceCodePragma.st @@ -1,4 +1,3 @@ menu pragmas sourceCodePragma - - ^ 'nautilusSourceCodeMenu' \ No newline at end of file + ^ 'nautilusGlobalSourceCodeMenu' \ No newline at end of file diff --git a/Nautilus.package/AbstractNautilusUI.class/methodProperties.json b/Nautilus.package/AbstractNautilusUI.class/methodProperties.json index a006d2845e..e2137050ba 100644 --- a/Nautilus.package/AbstractNautilusUI.class/methodProperties.json +++ b/Nautilus.package/AbstractNautilusUI.class/methodProperties.json @@ -1,9 +1,9 @@ { "class" : { - "buildAddGroupsShortcutsOn:" : "BenjaminVanRyseghem 6/28/2012 14:56", + "buildAddGroupsShortcutsOn:" : "EstebanLorenzano 1/30/2013 14:22", "buildAddShortcutsOn:" : "BenjaminVanRyseghem 6/28/2012 14:52", - "buildAnalyzeSubMenu:" : "BenjaminVanRyseghem 7/13/2012 14:10", - "buildBrowseShortcutsOn:" : "CamilloBruni 1/16/2013 00:26", + "buildAnalyzeSubMenu:" : "EstebanLorenzano 1/31/2013 18:45", + "buildBrowseShortcutsOn:" : "EstebanLorenzano 1/30/2013 14:23", "buildButtonsShortcutsOn:" : "CamilloBruni 9/14/2012 01:28", "buildClassShortcutsOn:" : "BenjaminVanRyseghem 4/6/2012 16:43", "buildCommentShortcutsOn:" : "BenjaminVanRyseghem 8/1/2012 19:13", @@ -22,30 +22,30 @@ "buildRenameShortcutsOn:" : "BenjaminVanRyseghem 6/28/2012 14:53", "buildRunTestKeymappingsOn:" : "BenjaminVanRyseghem 6/24/2012 18:05", "buildSourceCodeShortcutsOn:" : "BenjaminVanRyseghem 6/28/2012 14:58", - "classesFixMenu:" : "tbn 7/6/2012 12:23", + "classesFixMenu:" : "EstebanLorenzano 1/31/2013 18:45", "classesIconsCache:" : "", - "classesMenu:" : "StephaneDucasse 10/18/2012 17:09", - "debugMenu:" : "", - "groupsFixMenu:" : "BenjaminVanRyseghem 6/28/2012 14:52", + "classesMenu:" : "EstebanLorenzano 1/31/2013 18:46", + "debugMenu:" : "EstebanLorenzano 1/31/2013 18:46", + "groupsFixMenu:" : "EstebanLorenzano 1/31/2013 18:46", "groupsIconsCache" : "", "groupsIconsCache:" : "", - "groupsMenu:" : "CamilloBruni 10/7/2012 22:04", + "groupsMenu:" : "EstebanLorenzano 1/31/2013 18:46", "icon" : "", "icon:" : "", "iconClass" : "", "initialize" : "BenjaminVanRyseghem 4/25/2012 11:07", "nextFocusKey" : "BenjaminVanRyseghem 6/24/2012 17:55", "on:" : "", - "packagesFixMenu:" : "BenjaminVanRyseghem 6/28/2012 14:54", + "packagesFixMenu:" : "EstebanLorenzano 1/31/2013 18:46", "packagesIconsCache" : "", "packagesIconsCache:" : "", - "packagesMenu:" : "BenjaminVanRyseghem 8/3/2012 16:11", + "packagesMenu:" : "EstebanLorenzano 1/31/2013 18:46", "previousFocusKey" : "BenjaminVanRyseghem 4/25/2012 11:08", "resetIcon" : "", "resetIconCaches" : "", - "shiftedSourceCodeMenu:" : "tbn 7/6/2012 12:27", - "sourceCodeMenu:" : "BenjaminVanRyseghem 8/3/2012 18:35", - "sourceCodeMenuExtra:" : "BenjaminVanRyseghem 6/28/2012 14:58" }, + "shiftedSourceCodeMenu:" : "EstebanLorenzano 2/1/2013 10:59", + "sourceCodeMenu:" : "EstebanLorenzano 1/31/2013 18:46", + "sourceCodeMenuExtra:" : "EstebanLorenzano 1/31/2013 18:46" }, "instance" : { "aGroupHasBeenAdded:" : "", "aGroupHasBeenRegistered:" : "", @@ -104,12 +104,12 @@ "buildCodePanelWithCommentOnRight" : "StephaneDucasse 12/19/2012 15:53", "buildCodePanelWithCommentOnTop" : "StephaneDucasse 12/19/2012 15:54", "buildCodePanelWithoutComment" : "StephaneDucasse 12/19/2012 15:56", - "buildCommentButton" : "BenjaminVanRyseghem 8/1/2012 21:04", + "buildCommentButton" : "EstebanLorenzano 1/30/2013 14:40", "buildCommentPane" : "BenjaminVanRyseghem 8/1/2012 19:13", - "buildFirstColumn:" : "StephaneDucasse 12/19/2012 16:01", + "buildFirstColumn:" : "EstebanLorenzano 1/30/2013 14:41", "buildGetterFor:" : "", "buildGroupHierarchyFor:" : "", - "buildGroupsButton" : "BenjaminVanRyseghem 6/22/2012 16:17", + "buildGroupsButton" : "EstebanLorenzano 1/30/2013 14:43", "buildHierarchyFor:" : "", "buildHierarchyForClasses:" : "", "buildHierarchyForClasses:fromPackage:" : "", @@ -117,9 +117,9 @@ "buildInitializerFor:" : "", "buildInstanceButton" : "BenjaminVanRyseghem 12/20/2012 12:27", "buildLeftPlugins" : "", - "buildList" : "CamilloBruni 9/14/2012 00:47", - "buildList2" : "CamilloBruni 9/13/2012 14:37", - "buildNewSourceTextArea" : "BenjaminVanRyseghem 8/6/2012 01:53", + "buildList" : "EstebanLorenzano 1/30/2013 14:44", + "buildList2" : "EstebanLorenzano 1/30/2013 14:45", + "buildNewSourceTextArea" : "EstebanLorenzano 1/30/2013 14:37", "buildPackageHierarchyFor:" : "", "buildRightPlugins" : "", "buildSecondColumn:" : "StephaneDucasse 12/19/2012 16:04", @@ -142,33 +142,33 @@ "categorizeAllUncategorizedMethods" : "", "categorizeMethod" : "", "categoryMenuBuilder" : "", - "categoryPragma" : "", + "categoryPragma" : "EstebanLorenzano 1/30/2013 17:30", "changed:" : "BenjaminVanRyseghem 6/13/2012 21:36", "changedLabels" : "BenjaminVanRyseghem 3/23/2012 18:57", "classAdded:" : "GuillermoPolito 8/3/2012 13:21", "classCommented:" : "GuillermoPolito 8/3/2012 13:21", "classDefinitionModified:" : "BenjaminVanRyseghem 8/6/2012 19:55", - "classFixPragma" : "", + "classFixPragma" : "EstebanLorenzano 1/30/2013 17:30", "classIconFor:" : "BenjaminVanRyseghem 1/2/2013 12:05", "classLabel" : "BenjaminVanRyseghem 1/6/2013 16:02", "classMenuBuilder" : "", - "classPragma" : "", + "classPragma" : "EstebanLorenzano 1/30/2013 17:30", "classRecategorized:" : "EstebanLorenzano 1/15/2013 16:32", "classRemoved:" : "GuillermoPolito 8/2/2012 00:31", "classRenamed:" : "GuillermoPolito 8/3/2012 13:22", "classReorganized:" : "GuillermoPolito 8/3/2012 13:22", "classWidget" : "", - "classesMenu:shifted:" : "", + "classesMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "clearUserEditFlag" : "", "close" : "CamilloBruni 9/21/2012 13:47", - "codePaneMenu:shifted:" : "", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "codeTextMorph" : "", "commentButtonAction" : "", "commentButtonLabel" : "", "commentButtonState" : "", "commentLabel" : "", "commentTextArea" : "BenjaminVanRyseghem 8/1/2012 19:10", - "commonPragma" : "", + "commonPragma" : "EstebanLorenzano 1/30/2013 17:30", "compileAClassFrom:notifying:" : "", "compileAMethodFromCategory:withSource:notifying:" : "", "compileSource:notifying:" : "", @@ -234,16 +234,16 @@ "giveFocusTo:" : "", "giveFocusToPackage" : "BenjaminVanRyseghem 6/22/2012 17:57", "giveFocusToSourceCode" : "BenjaminVanRyseghem 6/22/2012 18:01", - "groupFixPragma" : "", + "groupFixPragma" : "EstebanLorenzano 1/30/2013 17:30", "groupIconFor:" : "CamilloBruni 10/7/2012 22:04", "groupMenuBuilder" : "", - "groupPragma" : "", + "groupPragma" : "EstebanLorenzano 1/30/2013 17:30", "groupsButtonAction" : "", "groupsButtonLabel" : "", "groupsButtonState" : "", "groupsLabel" : "", "groupsManager" : "", - "groupsMenu:shifted:" : "", + "groupsMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "guessTypeForName:" : "BenjaminVanRyseghem 4/18/2012 13:16", "hierarchyClass" : "", "hierarchyClass:" : "", @@ -285,7 +285,7 @@ "methodHierarchy" : "", "methodMenuBuilder" : "", "methodModified:" : "", - "methodPragma" : "", + "methodPragma" : "EstebanLorenzano 1/30/2013 17:30", "methodRecategorized:" : "", "methodRemoved:" : "", "methodsForCategories:" : "", @@ -313,14 +313,14 @@ "openSuperclass" : "CamilloBruni 1/11/2013 14:07", "packageChanged:" : "", "packageCreated:" : "BenjaminVanRyseghem 12/20/2012 15:06", - "packageFixPragma" : "", + "packageFixPragma" : "EstebanLorenzano 1/30/2013 17:23", "packageIconFor:" : "", "packageLabel" : "", "packageMenuBuilder" : "", - "packagePragma" : "", + "packagePragma" : "EstebanLorenzano 1/30/2013 17:24", "packageRenamed:" : "", "packageUnregistred:" : "", - "packagesMenu:shifted:" : "", + "packagesMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "popUpTestsResult:" : "", "putSourceTextAreaLimit" : "", "rebuildIconicButtonFrom:" : "", @@ -404,18 +404,18 @@ "setCommentShorcutsTo:" : "BenjaminVanRyseghem 8/1/2012 19:13", "setGlobalShorcutsTo:" : "BenjaminVanRyseghem 6/24/2012 13:41", "setGroupShorcutsTo:" : "", - "setPackageShorcutsTo:" : "BenjaminVanRyseghem 6/22/2012 16:21", - "setSourceCodeShorcutsTo:" : "BenjaminVanRyseghem 4/3/2012 13:29", + "setShortcuts:to:" : "EstebanLorenzano 1/30/2013 15:19", + "setShortcutsTo:" : "EstebanLorenzano 1/30/2013 14:32", + "setSourceCodeShorcutsTo:" : "EstebanLorenzano 1/30/2013 14:37", "setStylerClass:" : "", "setWindowTitle" : "BenjaminVanRyseghem 8/3/2012 16:18", - "shiftedSourceCodeMenu:" : "", "shoutAboutToStyle:" : "", "showByteCode" : "", "showComment" : "", "showComment:" : "BenjaminVanRyseghem 8/3/2012 18:48", "showDecompile" : "", "showGroups" : "", - "showGroups:" : "BenjaminVanRyseghem 6/22/2012 16:30", + "showGroups:" : "EstebanLorenzano 1/30/2013 14:46", "showGroupsSilently:" : "", "showHierarchy" : "", "showHierarchy:" : "BenjaminVanRyseghem 6/22/2012 16:42", @@ -432,10 +432,10 @@ "sourceCode:" : "", "sourceCodeContainer" : "", "sourceCodeFrom:" : "BenjaminVanRyseghem 8/4/2012 01:07", - "sourceCodeMenu:shifted:" : "", + "sourceCodeMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "sourceCodeMenuBuilder" : "", "sourceCodePanel" : "BenjaminVanRyseghem 6/14/2012 17:33", - "sourceCodePragma" : "", + "sourceCodePragma" : "EstebanLorenzano 1/30/2013 17:30", "sourceCodeSymbol" : "", "sourceTextArea" : "", "switchToByteCodeButton" : "", diff --git a/Nautilus.package/CategoryWidget.class/class/categoriesMenu..st b/Nautilus.package/CategoryWidget.class/class/categoriesMenu..st index 7ae2fd54e7..fb0167cfd1 100644 --- a/Nautilus.package/CategoryWidget.class/class/categoriesMenu..st +++ b/Nautilus.package/CategoryWidget.class/class/categoriesMenu..st @@ -1,24 +1,29 @@ menu categoriesMenu: aBuilder - + | target | + target := aBuilder model. - (aBuilder item: #'Find Method... (f, m)') + (aBuilder item: #'Find Method...') + keyText: 'f, m'; action: [ target findMethod ]; order: 0; help: 'Search for a method by name'. - (aBuilder item: #'Add protocol... (n, t)') + (aBuilder item: #'Add protocol...') + keyText: 'n, t'; action: [ target addCategory ]; order: 100; withSeparatorAfter. - (aBuilder item: #'Browse full (b, f)') + (aBuilder item: #'Browse full') + keyText: 'b, f'; action: [ target fullBrowse ]; order: 200; withSeparatorAfter. - (aBuilder item: #'Categorize all uncategorized (h, C)') + (aBuilder item: #'Categorize all uncategorized') + keyText: 'h, C'; action: [ target categorizeAllUncategorizedMethods ]; order: 1100. @@ -29,18 +34,21 @@ categoriesMenu: aBuilder target selectedCategory ifNil: [ ^ target ]. - (aBuilder item: #'Rename... (r, m)') + (aBuilder item: #'Rename...') + keyText: 'r, m'; action: [ target renameCategory ]; order: 1300; enabledBlock: [ target enableCategorySingleSelection ]. - (aBuilder item: #'Remove... (x, m)') + (aBuilder item: #'Remove...') + keyText: 'x, m'; action: [ target removeCategories ]; order: 1400; icon: (target iconClass iconNamed: #removeIcon); withSeparatorAfter. - (aBuilder item: #'Add in group.. (n, e, m)') + (aBuilder item: #'Add in group...') + keyText: 'n, e, m'; action: [ target addProtocolsInGroup ]; order: 1500. diff --git a/Nautilus.package/CategoryWidget.class/methodProperties.json b/Nautilus.package/CategoryWidget.class/methodProperties.json index 22862ef99b..0fd9dfc041 100644 --- a/Nautilus.package/CategoryWidget.class/methodProperties.json +++ b/Nautilus.package/CategoryWidget.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "buildProtocolShortcutsOn:" : "BenjaminVanRyseghem 4/6/2012 16:57", - "categoriesMenu:" : "BenjaminVanRyseghem 8/3/2012 16:13" }, + "categoriesMenu:" : "EstebanLorenzano 1/30/2013 17:45" }, "instance" : { "buildCategoriesList" : "CamilloBruni 9/14/2012 00:45", "categoriesLabel" : "", diff --git a/Nautilus.package/MethodWidget.class/class/elementsMenu..st b/Nautilus.package/MethodWidget.class/class/elementsMenu..st index a1398de4fd..fa67dadb53 100644 --- a/Nautilus.package/MethodWidget.class/class/elementsMenu..st +++ b/Nautilus.package/MethodWidget.class/class/elementsMenu..st @@ -1,11 +1,12 @@ menu elementsMenu: aBuilder - + | selectedMethods selectedMethod tmp target | target := aBuilder model. selectedMethods := target selectedMethods. selectedMethod := target selectedMethod. - (aBuilder item: #'Find Method... (f,m )') + (aBuilder item: #'Find Method...') + keyText: 'f, m'; action: [ target findMethod ]; order: 0; help: 'Search for a method by name'. @@ -18,7 +19,8 @@ elementsMenu: aBuilder ifFalse: [ 'Add breakpoint'] ifTrue: [ 'Remove breakpoint'] )]. - tmp := ((aBuilder item: #'Browse full (b, f)') + tmp := ((aBuilder item: #'Browse full') + keyText: 'b, f'; action: [ target fullBrowse ]; order: 200; yourself). @@ -27,49 +29,58 @@ elementsMenu: aBuilder tmp withSeparatorAfter. ^ target ]. - (aBuilder item: #'Generate test and jump (h, j)') + (aBuilder item: #'Generate test and jump') + keyText: 'h, j'; action: [ target generateTestMethodsAndFocus: true ]; order: 300. - (aBuilder item: #'Generate test (h, J)') + (aBuilder item: #'Generate test') + keyText: 'h, J'; action: [ target generateTestMethodsAndFocus: false ]; order: 400; withSeparatorAfter. (target selectedMethods allSatisfy: [:meth | meth isTestMethod ]) ifTrue: [ - (aBuilder item: #'Run tests (j, m)') + (aBuilder item: #'Run tests') + keyText: 'j, m'; action: [ target runTestForMethods: selectedMethods notifying: true ]; order: 1000 ]. target selectedMethod correspondingTestMethod notNil ifTrue: [ - (aBuilder item: #'Debug tests (d)') + (aBuilder item: #'Debug tests') + keyText: 'd'; action: [ target debugTest ]; order: 1001 ]. - (aBuilder item: #'Senders of...(b, n)') + (aBuilder item: #'Senders of...') + keyText: 'b, n'; action: [ target browseSendersOfMessages ]; order: 1100; enabledBlock: [ target enableMethodSingleSelection ]. - (aBuilder item: #'Implementors of... (b, m)') + (aBuilder item: #'Implementors of...') + keyText: 'b, m'; action: [ target browseMessages ]; order: 1200; enabledBlock: [ target enableMethodSingleSelection ]. - (aBuilder item: #'Inheritance (b, i)') + (aBuilder item: #'Inheritance') + keyText: 'b, i'; action: [ target methodHierarchy ]; order: 1300; enabledBlock: [ target enableMethodSingleSelection ]. - (aBuilder item: #'Versions (b, v)') + (aBuilder item: #'Versions') + keyText: 'b, v'; action: [ target browseVersions ]; order: 1400; enabledBlock: [ target enableMethodSingleSelection ]; withSeparatorAfter. - (aBuilder item: #'Categorize method (m, m)') + (aBuilder item: #'Categorize method') + keyText: 'm, m'; action: [ target categorizeMethod ]; order: 1500. @@ -77,13 +88,15 @@ elementsMenu: aBuilder action: [ target moveMethodToPackage ]; order: 1600. - (aBuilder item: #'Remove... (x, m)') + (aBuilder item: #'Remove...') + keyText: 'x, m'; action: [ target removeMethods ]; order: 1700; icon: (target iconClass iconNamed: #removeIcon); withSeparatorAfter. - (aBuilder item: #'Add in group.. (n, e, m)') + (aBuilder item: #'Add in group...') + keyText: 'n, e, m'; action: [ target addMethodsInGroup ]; order: 1800. diff --git a/Nautilus.package/MethodWidget.class/methodProperties.json b/Nautilus.package/MethodWidget.class/methodProperties.json index 3b380a83d0..49d80580bf 100644 --- a/Nautilus.package/MethodWidget.class/methodProperties.json +++ b/Nautilus.package/MethodWidget.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "buildMethodShortcutsOn:" : "BenjaminVanRyseghem 4/6/2012 16:57", - "elementsMenu:" : "BenjaminVanRyseghem 6/28/2012 15:12" }, + "elementsMenu:" : "EstebanLorenzano 1/30/2013 17:20" }, "instance" : { "buildMethodsList" : "CamilloBruni 9/14/2012 00:42", "deselectMethod:" : "", diff --git a/Nautilus.package/NautilusMonticello.class/class/packagesChangesMenu..st b/Nautilus.package/NautilusMonticello.class/class/packagesChangesMenu..st index 169fcb54da..fc8414f805 100644 --- a/Nautilus.package/NautilusMonticello.class/class/packagesChangesMenu..st +++ b/Nautilus.package/NautilusMonticello.class/class/packagesChangesMenu..st @@ -1,6 +1,6 @@ monticello menus packagesChangesMenu: aBuilder - + | package mcpackage target | target := aBuilder model. (package := target selectedPackage) ifNil: [ ^ target ]. diff --git a/Nautilus.package/NautilusMonticello.class/class/packagesCommitsMenu..st b/Nautilus.package/NautilusMonticello.class/class/packagesCommitsMenu..st index 3eb8e7de3d..c77e6b07e2 100644 --- a/Nautilus.package/NautilusMonticello.class/class/packagesCommitsMenu..st +++ b/Nautilus.package/NautilusMonticello.class/class/packagesCommitsMenu..st @@ -1,6 +1,6 @@ monticello menus packagesCommitsMenu: aBuilder - + | package mcpackage target | target := aBuilder model. (package := target selectedPackage) ifNil: [ ^ target ]. diff --git a/Nautilus.package/NautilusMonticello.class/class/packagesCreateMenu..st b/Nautilus.package/NautilusMonticello.class/class/packagesCreateMenu..st index 11e2837095..8e63006ff7 100644 --- a/Nautilus.package/NautilusMonticello.class/class/packagesCreateMenu..st +++ b/Nautilus.package/NautilusMonticello.class/class/packagesCreateMenu..st @@ -1,6 +1,6 @@ monticello menus packagesCreateMenu: aBuilder - + | package mcpackage target | target := aBuilder model. (package := target selectedPackage) ifNil: [ ^ target ]. diff --git a/Nautilus.package/NautilusMonticello.class/class/packagesOpenMenu..st b/Nautilus.package/NautilusMonticello.class/class/packagesOpenMenu..st index da5fc51802..3fa61e1d21 100644 --- a/Nautilus.package/NautilusMonticello.class/class/packagesOpenMenu..st +++ b/Nautilus.package/NautilusMonticello.class/class/packagesOpenMenu..st @@ -1,6 +1,6 @@ monticello menus packagesOpenMenu: aBuilder - + | package mcpackage target last group | target := aBuilder model. (package := target selectedPackage) ifNil: [ ^ target ]. diff --git a/Nautilus.package/NautilusMonticello.class/class/packagesSliceMenu..st b/Nautilus.package/NautilusMonticello.class/class/packagesSliceMenu..st index 9f5a88f23d..8e1f16f345 100644 --- a/Nautilus.package/NautilusMonticello.class/class/packagesSliceMenu..st +++ b/Nautilus.package/NautilusMonticello.class/class/packagesSliceMenu..st @@ -1,6 +1,6 @@ monticello menus packagesSliceMenu: aBuilder - + | target | target := aBuilder model. (aBuilder item: #'Create Slice and commit it') diff --git a/Nautilus.package/NautilusMonticello.class/methodProperties.json b/Nautilus.package/NautilusMonticello.class/methodProperties.json index fd5a997005..4b37876236 100644 --- a/Nautilus.package/NautilusMonticello.class/methodProperties.json +++ b/Nautilus.package/NautilusMonticello.class/methodProperties.json @@ -3,11 +3,11 @@ "default" : "", "iconClass" : "", "new" : "", - "packagesChangesMenu:" : "", - "packagesCommitsMenu:" : "", - "packagesCreateMenu:" : "", - "packagesOpenMenu:" : "", - "packagesSliceMenu:" : "" }, + "packagesChangesMenu:" : "EstebanLorenzano 1/30/2013 15:52", + "packagesCommitsMenu:" : "EstebanLorenzano 1/30/2013 15:52", + "packagesCreateMenu:" : "EstebanLorenzano 1/30/2013 15:52", + "packagesOpenMenu:" : "EstebanLorenzano 1/30/2013 15:52", + "packagesSliceMenu:" : "EstebanLorenzano 1/30/2013 15:52" }, "instance" : { "addRepositoryTo:" : "", "addSliceFor:" : "", diff --git a/Nautilus.package/NautilusUI.class/instance/addAll..st b/Nautilus.package/NautilusUI.class/instance/addAll..st index 38846f0fb2..7ccfa58c0f 100644 --- a/Nautilus.package/NautilusUI.class/instance/addAll..st +++ b/Nautilus.package/NautilusUI.class/instance/addAll..st @@ -21,7 +21,7 @@ addAll: aWindow "navigationRow := self buildNavigationRow: aWindow height: topHeight." self buildColumns: aWindow height: topHeight"+navigationRow". - self setGlobalShorcutsTo: aWindow. + self setShortcuts: #NautilusSourceCodeShortcuts to: aWindow. self buildMiddlePlugins ifNotNil: [:middle | middleHeight := middle height+4. @@ -31,7 +31,7 @@ addAll: aWindow middle color: Color transparent]. sourceCodePanel := PanelMorph new. - self setGlobalShorcutsTo: sourceCodePanel. + self setShortcuts: #NautilusSourceCodeShortcuts to: sourceCodePanel. sourceCodePanel changeProportionalLayout. sourceCodePanel @@ -43,7 +43,7 @@ addAll: aWindow hResizing: #spaceFill; vResizing: #spaceFill. sourceCodeContainer := PanelMorph new. - self setGlobalShorcutsTo: sourceCodeContainer. + self setShortcuts: #NautilusSourceCodeShortcuts to: sourceCodeContainer. sourceCodeContainer changeTableLayout; listDirection: #leftToRight. diff --git a/Nautilus.package/NautilusUI.class/instance/buildBottomPlugins.st b/Nautilus.package/NautilusUI.class/instance/buildBottomPlugins.st index dc0193b29e..4fb53622a9 100644 --- a/Nautilus.package/NautilusUI.class/instance/buildBottomPlugins.st +++ b/Nautilus.package/NautilusUI.class/instance/buildBottomPlugins.st @@ -6,7 +6,7 @@ buildBottomPlugins bottom ifEmpty: [ ^ nil ]. bottom size = 1 ifTrue: [ ^ bottom first display ]. container := Morph new. - self setGlobalShorcutsTo: container. + self setShortcuts: #NautilusSourceCodeShortcuts to: container. container color: Color transparent; changeTableLayout; diff --git a/Nautilus.package/NautilusUI.class/instance/buildMiddlePlugins.st b/Nautilus.package/NautilusUI.class/instance/buildMiddlePlugins.st index 24e051c579..1fd78cadd6 100644 --- a/Nautilus.package/NautilusUI.class/instance/buildMiddlePlugins.st +++ b/Nautilus.package/NautilusUI.class/instance/buildMiddlePlugins.st @@ -6,7 +6,7 @@ buildMiddlePlugins middle ifEmpty: [ ^ nil ]. middle size = 1 ifTrue: [ ^ middle first display ]. container := Morph new. - self setGlobalShorcutsTo: container. + self setShortcuts: #NautilusSourceCodeShortcuts to: container. container color: Color transparent; changeTableLayout; diff --git a/Nautilus.package/NautilusUI.class/instance/buildNavigationList.st b/Nautilus.package/NautilusUI.class/instance/buildNavigationList.st index d7bd6bec8d..c308ef8fcd 100644 --- a/Nautilus.package/NautilusUI.class/instance/buildNavigationList.st +++ b/Nautilus.package/NautilusUI.class/instance/buildNavigationList.st @@ -13,5 +13,6 @@ buildNavigationList ghostText: 'History Navigator'; yourself. - self setGlobalShorcutsTo: navigation. + self setShortcuts: #NautilusSourceCodeShortcuts to: navigation. + ^ navigation \ No newline at end of file diff --git a/Nautilus.package/NautilusUI.class/methodProperties.json b/Nautilus.package/NautilusUI.class/methodProperties.json index 7b72eadfeb..ce2f64d0db 100644 --- a/Nautilus.package/NautilusUI.class/methodProperties.json +++ b/Nautilus.package/NautilusUI.class/methodProperties.json @@ -3,7 +3,7 @@ "buildHistoryShortcutsOn:" : "CamilloBruni 10/4/2012 11:13", "initializeCache" : "BenjaminVanRyseghem 4/8/2012 13:11" }, "instance" : { - "addAll:" : "SeanDeNigris 1/27/2013 21:44", + "addAll:" : "EstebanLorenzano 1/30/2013 14:49", "addCategory" : "CamilloBruni 9/17/2012 21:17", "addMethod" : "BenjaminVanRyseghem 6/22/2012 17:00", "addMethodsInGroup" : "BenjaminVanRyseghem 4/14/2012 12:17", @@ -11,13 +11,13 @@ "addProtocolsInGroup" : "", "addProtocolsInGroup:" : "", "allLabel" : "", - "buildBottomPlugins" : "BenjaminVanRyseghem 6/22/2012 16:13", + "buildBottomPlugins" : "EstebanLorenzano 1/30/2013 14:48", "buildCategoryWidget" : "BenjaminVanRyseghem 4/8/2012 13:04", "buildColumns:height:" : "StephaneDucasse 12/19/2012 16:12", "buildFourthColumn:" : "", "buildMethodWidget" : "BenjaminVanRyseghem 4/8/2012 13:09", - "buildMiddlePlugins" : "BenjaminVanRyseghem 6/22/2012 16:14", - "buildNavigationList" : "CamilloBruni 10/4/2012 10:49", + "buildMiddlePlugins" : "EstebanLorenzano 1/30/2013 14:50", + "buildNavigationList" : "EstebanLorenzano 1/30/2013 14:50", "buildTestSelectorFor:" : "", "buildTestSuiteFor:" : "BenjaminVanRyseghem 5/2/2012 10:33", "buildThirdColumn:" : "", diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/classRefactoringSubmenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/classRefactoringSubmenu..st index ef49f16a9a..9ae431cb6f 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/classRefactoringSubmenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/classRefactoringSubmenu..st @@ -1,11 +1,12 @@ menu classRefactoringSubmenu: aBuilder - + | target | target := aBuilder model. target selectedClass ifNil: [^target]. - (aBuilder item: #'Rename... (r, c)') + (aBuilder item: #'Rename...') + keyText: 'r, c'; action: [ target renameClassWithRefactoringEngine: target selectedClass theNonMetaClass ]; parent: #'Class Refactoring'; order: 0. @@ -17,7 +18,8 @@ classRefactoringSubmenu: aBuilder order: 100; withSeparatorAfter. - (aBuilder item: #'Generate Accessors (h, a)') + (aBuilder item: #'Generate Accessors') + keyText: 'h, a'; action: [ target refactor generateAccessors ]; parent: #'Class Refactoring'; order: 200. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/classVarRefactoringSubmenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/classVarRefactoringSubmenu..st index 975f60fa17..5b44e42479 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/classVarRefactoringSubmenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/classVarRefactoringSubmenu..st @@ -1,6 +1,6 @@ menu classVarRefactoringSubmenu: aBuilder - + | target selectedClass | target := aBuilder model. selectedClass := target selectedClass. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/codeRewritingClassSubmenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/codeRewritingClassSubmenu..st index e5c3b4a214..eefc26ff9e 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/codeRewritingClassSubmenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/codeRewritingClassSubmenu..st @@ -1,6 +1,6 @@ menu codeRewritingClassSubmenu: aBuilder - + | target | target := aBuilder model. target selectedClass ifNil: [^target]. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/groupRefactoringMenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/groupRefactoringMenu..st index 0661acd245..4e86ab95f9 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/groupRefactoringMenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/groupRefactoringMenu..st @@ -1,6 +1,6 @@ menu groupRefactoringMenu: aBuilder - + | target | target := aBuilder model. (aBuilder item: #'Rewrite Code') diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/instVarRefactoringSubmenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/instVarRefactoringSubmenu..st index 886d842127..ada39695d4 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/instVarRefactoringSubmenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/instVarRefactoringSubmenu..st @@ -1,6 +1,6 @@ menu instVarRefactoringSubmenu: aBuilder - + | target selectedClass | target := aBuilder model. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/methodRefactoringSubMenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/methodRefactoringSubMenu..st index 828558d706..c71a7be30a 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/methodRefactoringSubMenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/methodRefactoringSubMenu..st @@ -1,6 +1,6 @@ menu methodRefactoringSubMenu: aBuilder - + | target selectedMethod selectedMethods | target := aBuilder model. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/packageRefactoringMenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/packageRefactoringMenu..st index b4a02304a1..7a9abb7ae1 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/packageRefactoringMenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/packageRefactoringMenu..st @@ -1,6 +1,6 @@ menu packageRefactoringMenu: aBuilder - + | target | target := aBuilder model. (aBuilder item: #'Rewrite Code') diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringClassMenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringClassMenu..st index b5a0d8bb8e..d37909c839 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringClassMenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringClassMenu..st @@ -1,6 +1,6 @@ menu refactoringClassMenu: aBuilder - + | target | target := aBuilder model. target selectedClass ifNil: [^target]. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringMethodMenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringMethodMenu..st index 122b09d3f1..3eae7ab4bf 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringMethodMenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/refactoringMethodMenu..st @@ -1,6 +1,6 @@ menu refactoringMethodMenu: aBuilder - + | target | target := aBuilder model. target selectedMethod ifNil:[ ^ target ]. @@ -8,7 +8,8 @@ refactoringMethodMenu: aBuilder (aBuilder item: #'Refactoring') order: -100. - (aBuilder item: #'Rename method (r, m)') + (aBuilder item: #'Rename method') + keyText: 'r, m'; action: [ | scroll | scroll := target methodWidget vScrollValue. target refactor renameMethodFor: target selectedMethod. diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenu..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenu..st index f964463b39..2145d9167d 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenu..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenu..st @@ -1,6 +1,6 @@ menu sourceCodeRefactoringMenu: aBuilder - + | target | target := aBuilder model. (aBuilder item: #'Create cascade') diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenuHolder..st b/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenuHolder..st index ff6e9b893e..52c28a1dec 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenuHolder..st +++ b/NautilusRefactoring.package/NautilusRefactoring.class/class/sourceCodeRefactoringMenuHolder..st @@ -1,14 +1,14 @@ menu sourceCodeRefactoringMenuHolder: aBuilder - + | target | target := aBuilder model. (aBuilder item: #'Format') - order: 9996; + order: 1100; action: [ target refactor formatSourceCode ]. (aBuilder item: #'Source code refactoring') - order: 9997; + order: 1101; arguments: {}; withSeparatorAfter. \ No newline at end of file diff --git a/NautilusRefactoring.package/NautilusRefactoring.class/methodProperties.json b/NautilusRefactoring.package/NautilusRefactoring.class/methodProperties.json index cea34e76b2..3179c7c425 100644 --- a/NautilusRefactoring.package/NautilusRefactoring.class/methodProperties.json +++ b/NautilusRefactoring.package/NautilusRefactoring.class/methodProperties.json @@ -3,19 +3,19 @@ "buildRefactoringMethodShortcutsOn:" : "BenjaminVanRyseghem 6/24/2012 22:29", "buildRefactoringShortcutsOn:" : "BenjaminVanRyseghem 6/27/2012 13:27", "buildSourceCodeShortcutsOn:" : "BenjaminVanRyseghem 1/25/2013 17:49", - "classRefactoringSubmenu:" : "StephaneDucasse 10/18/2012 17:07", - "classVarRefactoringSubmenu:" : "BenjaminVanRyseghem 5/13/2012 17:56", - "codeRewritingClassSubmenu:" : "BenjaminVanRyseghem 5/13/2012 17:54", - "groupRefactoringMenu:" : "StephaneDucasse 10/18/2012 17:15", - "instVarRefactoringSubmenu:" : "BenjaminVanRyseghem 5/13/2012 17:57", - "methodRefactoringSubMenu:" : "BenjaminVanRyseghem 5/13/2012 17:59", + "classRefactoringSubmenu:" : "EstebanLorenzano 1/30/2013 17:12", + "classVarRefactoringSubmenu:" : "EstebanLorenzano 1/30/2013 15:53", + "codeRewritingClassSubmenu:" : "EstebanLorenzano 1/30/2013 15:53", + "groupRefactoringMenu:" : "EstebanLorenzano 1/30/2013 15:55", + "instVarRefactoringSubmenu:" : "EstebanLorenzano 1/30/2013 15:53", + "methodRefactoringSubMenu:" : "EstebanLorenzano 1/30/2013 15:54", "model:" : "", - "packageRefactoringMenu:" : "StephaneDucasse 10/18/2012 17:15", + "packageRefactoringMenu:" : "EstebanLorenzano 1/30/2013 15:52", "promptOnRefactoring" : "", - "refactoringClassMenu:" : "BenjaminVanRyseghem 5/13/2012 17:53", - "refactoringMethodMenu:" : "BenjaminVanRyseghem 6/28/2012 15:13", - "sourceCodeRefactoringMenu:" : "", - "sourceCodeRefactoringMenuHolder:" : "CamilloBruni 11/2/2012 15:55" }, + "refactoringClassMenu:" : "EstebanLorenzano 1/30/2013 15:53", + "refactoringMethodMenu:" : "EstebanLorenzano 1/30/2013 17:20", + "sourceCodeRefactoringMenu:" : "EstebanLorenzano 1/30/2013 15:56", + "sourceCodeRefactoringMenuHolder:" : "EstebanLorenzano 1/31/2013 11:36" }, "instance" : { "abstractClassVarFrom:" : "", "abstractInstVarFrom:" : "", diff --git a/Polymorph-Widgets.package/Morph.extension/instance/navigationKey..st b/Polymorph-Widgets.package/Morph.extension/instance/navigationKey..st index 8185c92544..c4c5fc9c27 100644 --- a/Polymorph-Widgets.package/Morph.extension/instance/navigationKey..st +++ b/Polymorph-Widgets.package/Morph.extension/instance/navigationKey..st @@ -2,6 +2,8 @@ navigationKey: event "Check for tab key activity and change focus as appropriate. Check for menu key to do popup." + + event isUserInterrupt ifTrue: [ ^ true ]. (event keyCharacter = Character escape and: [ event anyModifierKeyPressed]) ifTrue: [ diff --git a/Polymorph-Widgets.package/Morph.extension/methodProperties.json b/Polymorph-Widgets.package/Morph.extension/methodProperties.json index 19a5ea042f..dca469cf68 100644 --- a/Polymorph-Widgets.package/Morph.extension/methodProperties.json +++ b/Polymorph-Widgets.package/Morph.extension/methodProperties.json @@ -38,7 +38,7 @@ "myDependents:" : "gvc 9/7/2006 15:55", "navigateFocusBackward" : "MarcusDenker 12/11/2009 07:40", "navigateFocusForward" : "MarcusDenker 12/11/2009 07:40", - "navigationKey:" : "GuillermoPolito 4/22/2012 17:20", + "navigationKey:" : "SeanDeNigris 1/29/2013 11:23", "nextMorphAcrossInWindow" : "gvc 1/11/2007 11:32", "nextMorphInWindow" : "gvc 1/11/2007 11:34", "nextMorphWantingFocus" : "gvc 1/14/2009 17:53", diff --git a/RecentSubmissions.package/MessageListBrowser.class/instance/msgPaneMenu.shifted..st b/RecentSubmissions.package/MessageListBrowser.class/instance/msgPaneMenu.shifted..st index b34ecbd672..19fcebf3a3 100644 --- a/RecentSubmissions.package/MessageListBrowser.class/instance/msgPaneMenu.shifted..st +++ b/RecentSubmissions.package/MessageListBrowser.class/instance/msgPaneMenu.shifted..st @@ -1,26 +1,8 @@ menus msgPaneMenu: aMenu shifted: shifted - ^aMenu addList: #( - ('find...(f)' find) - ('find again (g)' findAgain) - ('set search string (h)' setSearchString) - - - ('do again (j)' again) - ('undo (z)' undo) - - - ('copy (c)' copySelection) - ('cut (x)' cut) - ('paste (v)' paste) - ('paste...' pasteRecent) - - - ('do it (d)' doIt) - ('print it (p)' printIt) - ('inspect it (i)' inspectIt) - ('explore it (I)' exploreIt) - ('debug it' debugIt) - - - ('accept (s)' accept) - ('cancel (l)' cancel) - ('implementors (m)' implementorsOfIt) - ('methods containing (E)' methodSourceContainingIt) - ('senders (n)' sendersOfIt)) \ No newline at end of file + | donorMenu | + + donorMenu := shifted + ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] + ifFalse: [SmalltalkEditor yellowButtonMenu]. + ^ aMenu addAllFrom: donorMenu \ No newline at end of file diff --git a/RecentSubmissions.package/MessageListBrowser.class/methodProperties.json b/RecentSubmissions.package/MessageListBrowser.class/methodProperties.json index 28b849370c..c2f3e121ff 100644 --- a/RecentSubmissions.package/MessageListBrowser.class/methodProperties.json +++ b/RecentSubmissions.package/MessageListBrowser.class/methodProperties.json @@ -57,7 +57,7 @@ "menu:shifted:" : "AlainPlantec 2/13/2011 17:20", "model" : "BenjaminVanRyseghem 11/29/2010 10:22", "model:" : "AlainPlantec 2/13/2011 17:27", - "msgPaneMenu:shifted:" : "MarcusDenker 10/7/2012 11:41", + "msgPaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "open" : "BenjaminVanRyseghem 11/1/2011 07:37", "originalIndex:" : "BenjaminVanRyseghem 11/29/2010 11:17", "originalList" : "BenjaminVanRyseghem 11/29/2010 11:11", diff --git a/ScriptLoader20.package/ScriptLoader.class/instance/commentForCurrentUpdate.st b/ScriptLoader20.package/ScriptLoader.class/instance/commentForCurrentUpdate.st index 7b47e4ef62..ea86a0b8bd 100644 --- a/ScriptLoader20.package/ScriptLoader.class/instance/commentForCurrentUpdate.st +++ b/ScriptLoader20.package/ScriptLoader.class/instance/commentForCurrentUpdate.st @@ -1,10 +1,10 @@ public commentForCurrentUpdate - ^ '- Issue 7347: Spec-Widgets. Thanks Andrei Chis. - http://code.google.com/p/pharo/issues/detail?id=7347 + ^ 'Issue 7381: enhance menus + http://code.google.com/p/pharo/issues/detail?id=7381 -- Issue 7149: Selection is wrong in senders and Implementors. Thanks Alexandre Bergel and Milton Mamani. - http://code.google.com/p/pharo/issues/detail?id=7149 - -- Issue 7348: Enhancing SmallLintRules - http://code.google.com/p/pharo/issues/detail?id=7348' \ No newline at end of file +Issue 7374: OrderedIdentityDictionary in a more general package + http://code.google.com/p/pharo/issues/detail?id=7374 + +Issue 7115: cmd . in workspace erase the line + http://code.google.com/p/pharo/issues/detail?id=7115' \ No newline at end of file diff --git a/ScriptLoader20.package/ScriptLoader.class/instance/script481.st b/ScriptLoader20.package/ScriptLoader.class/instance/script481.st new file mode 100644 index 0000000000..bb0174e952 --- /dev/null +++ b/ScriptLoader20.package/ScriptLoader.class/instance/script481.st @@ -0,0 +1,239 @@ +pharo - scripts +script481 + + ^ 'AST-Core-MarcusDenker.113.mcz +AST-Semantic-StephaneDucasse.21.mcz +AST-Tests-Core-MarcusDenker.19.mcz +AST-Tests-Semantic-StephaneDucasse.5.mcz +AndreasProfiler-EstebanLorenzano.5.mcz +Announcements-Core-MarcusDenker.35.mcz +Announcements-Help-MarcusDenker.5.mcz +Announcements-Tests-Core-StephaneDucasse.11.mcz +Announcements-View-MarcusDenker.11.mcz +AsmJit-Core-CamilloBruni.2.mcz +AsmJit-Extension-StephaneDucasse.6.mcz +AsmJit-Instructions-CamilloBruni.3.mcz +AsmJit-Operands-CamilloBruni.3.mcz +AsmJit-StackManagement-CamilloBruni.2.mcz +AsmJit-x86-IgorStasenko.3.mcz +Balloon-MarcusDenker.89.mcz +BalloonTests-MarcusDenker.1.mcz +CI-Core-EstebanLorenzano.57.mcz +CI-Loader-MarcusDenker.1.mcz +CodeImport-MarcusDenker.12.mcz +CodeImport-Tests-MarcusDenker.8.mcz +Collections-Abstract-MarcusDenker.196.mcz +Collections-Arithmetic-StephaneDucasse.6.mcz +Collections-Arrayed-EstebanLorenzano.69.mcz +Collections-Atomic-MarcusDenker.5.mcz +Collections-Native-MarcusDenker.6.mcz +Collections-Sequenceable-EstebanLorenzano.130.mcz +Collections-Stack-MarcusDenker.7.mcz +Collections-Streams-MarcusDenker.127.mcz +Collections-Strings-MarcusDenker.240.mcz +Collections-Support-MarcusDenker.49.mcz +Collections-Text-EstebanLorenzano.82.mcz +Collections-Traits-MarcusDenker.11.mcz +Collections-Unordered-MarcusDenker.144.mcz +Collections-Weak-MarcusDenker.66.mcz +CollectionsTests-MarcusDenker.583.mcz +Compatibility-MarcusDenker.10.mcz +Compiler-MarcusDenker.367.mcz +CompilerTests-MarcusDenker.131.mcz +Compression-MarcusDenker.118.mcz +CompressionTests-MarcusDenker.21.mcz +ConfigurationCommandLineHandler-Core-MarcusDenker.8.mcz +ConfigurationCommandLineHandler-Tests-MarcusDenker.2.mcz +Deprecated20-MarcusDenker.28.mcz +EmergencyEvaluator-MarcusDenker.28.mcz +EventModel-StephaneDucasse.1.mcz +FamFam-Icons-EstebanLorenzano.15.mcz +FileSystem-AnsiStreams-MarcusDenker.7.mcz +FileSystem-Core-MarcusDenker.63.mcz +FileSystem-Disk-MarcusDenker.46.mcz +FileSystem-Memory-MarcusDenker.20.mcz +FileSystem-Tests-AnsiStreams-MarcusDenker.6.mcz +FileSystem-Tests-Core-MarcusDenker.39.mcz +FileSystem-Tests-Disk-EstebanLorenzano.11.mcz +FileSystem-Tests-Memory-MarcusDenker.4.mcz +FileSystem-Zip-EstebanLorenzano.6.mcz +Files-MarcusDenker.ducasse.287.mcz +FreeType-MarcusDenker.609.mcz +FreeTypeTests-StephaneDucasse.3.mcz +Fuel-MarcusDenker.717.mcz +FuelCommandLineHandler-MarcusDenker.17.mcz +FuelMetalevel-MarcusDenker.62.mcz +FuelMetalevelTests-MarcusDenker.52.mcz +FuelTests-MarcusDenker.286.mcz +Gofer-Core-MarcusDenker.191.mcz +Gofer-Tests-MarcusDenker.157.mcz +Graphics-Display Objects-MarcusDenker.102.mcz +Graphics-Files-MarcusDenker.37.mcz +Graphics-Fonts-MarcusDenker.67.mcz +Graphics-Primitives-StephaneDucasse.99.mcz +Graphics-Resources-StephaneDucasse.16.mcz +Graphics-Tests-StephaneDucasse.30.mcz +Graphics-Transformations-StephaneDucasse.7.mcz +GroupManager-EstebanLorenzano.39.mcz +GroupManagerUI-EstebanLorenzano.14.mcz +Growl-MarcusDenker.13.mcz +HelpSystem-Core-StephaneDucasse.89.mcz +HelpSystem-Tests-StephaneDucasse.19.mcz +HistoryCollection-MarcusDenker.16.mcz +HudsonBuildTools20-EstebanLorenzano.21.mcz +Kernel-StephaneDucasse.1293.mcz +KernelTests-MarcusDenker.468.mcz +KeyChain-StephaneDucasse.29.mcz +Keymapping-Core-EstebanLorenzano.138.mcz +Keymapping-Pragmas-MarcusDenker.39.mcz +Keymapping-Settings-MarcusDenker.63.mcz +Keymapping-Shortcuts-MarcusDenker.63.mcz +Keymapping-Tests-MarcusDenker.69.mcz +Keymapping-Tools-Spec-MarcusDenker.16.mcz +Manifest-Core-StephaneDucasse.99.mcz +Manifest-CriticBrowser-EstebanLorenzano.40.mcz +Manifest-Resources-Tests-EstebanLorenzano.9.mcz +Manifest-Tests-MarcusDenker.23.mcz +MenuRegistration-EstebanLorenzano.47.mcz +Metacello-Base-MarcusDenker.20.mcz +Metacello-Core-MarcusDenker.494.mcz +Metacello-MC-StephaneDucasse.666.mcz +Metacello-Platform.pharo20-MarcusDenker.29.mcz +Metacello-ToolBox-MarcusDenker.135.mcz +Monticello-EstebanLorenzano.747.mcz +MonticelloConfigurations-StephaneDucasse.61.mcz +MonticelloGUI-MarcusDenker.212.mcz +MonticelloMocks-EstebanLorenzano.2.mcz +Morphic-EstebanLorenzano.1340.mcz +MorphicTests-MarcusDenker.64.mcz +Multilingual-Encodings-MarcusDenker.39.mcz +Multilingual-Languages-MarcusDenker.30.mcz +Multilingual-Tests-MarcusDenker.23.mcz +Multilingual-TextConversion-MarcusDenker.44.mcz +NECompletion-StephaneDucasse.78.mcz +NOCompletion-MarcusDenker.32.mcz +NativeBoost-Core-MarcusDenker.98.mcz +NativeBoost-Examples-StephaneDucasse.17.mcz +NativeBoost-Mac-IgorStasenko.8.mcz +NativeBoost-Pools-IgorStasenko.12.mcz +NativeBoost-Tests-StephaneDucasse.45.mcz +NativeBoost-Unix-IgorStasenko.12.mcz +NativeBoost-Win32-StephaneDucasse.33.mcz +Nautilus-EstebanLorenzano.405.mcz +NautilusCommon-EstebanLorenzano.109.mcz +NautilusRefactoring-EstebanLorenzano.68.mcz +Network-Kernel-StephaneDucasse.83.mcz +Network-MIME-MarcusDenker.52.mcz +Network-Mail-StephaneDucasse.14.mcz +Network-Protocols-MarcusDenker.88.mcz +Network-RFC822-StephaneDucasse.4.mcz +Network-URI-MarcusDenker.41.mcz +Network-UUID-MarcusDenker.22.mcz +Network-Url-MarcusDenker.82.mcz +NetworkTests-MarcusDenker.79.mcz +NewClassOrganizer-MarcusDenker.7.mcz +NewList-MarcusDenker.22.mcz +NonInteractiveTranscript-MarcusDenker.5.mcz +PackageInfo-MarcusDenker.91.mcz +Polymorph-EventEnhancements-MarcusDenker.13.mcz +Polymorph-Geometry-LaurentLaffont.8.mcz +Polymorph-TaskbarIcons-MarcusDenker.12.mcz +Polymorph-Tools-Diff-StephaneDucasse.86.mcz +Polymorph-Widgets-EstebanLorenzano.762.mcz +RPackage-Core-EstebanLorenzano.202.mcz +RPackage-SystemIntegration-MarcusDenker.157.mcz +RPackage-Tests-MarcusDenker.105.mcz +RecentSubmissions-EstebanLorenzano.180.mcz +Refactoring-Changes-EstebanLorenzano.33.mcz +Refactoring-Core-MarcusDenker.169.mcz +Refactoring-Critics-StephaneDucasse.28.mcz +Refactoring-Environment-StephaneDucasse.12.mcz +Refactoring-Pharo-Platform-EstebanLorenzano.2.mcz +Refactoring-Spelling-MarcusDenker.36.mcz +Refactoring-Tests-Changes-StephaneDucasse.18.mcz +Refactoring-Tests-Core-StephaneDucasse.63.mcz +Refactoring-Tests-Critics-MarcusDenker.8.mcz +Refactoring-Tests-Environment-StephaneDucasse.5.mcz +Regex-Core-MarcusDenker.22.mcz +Regex-Help-StephaneDucasse.2.mcz +Regex-Tests-Core-StephaneDucasse.3.mcz +Ring-Core-Containers-MarcusDenker.19.mcz +Ring-Core-Kernel-MarcusDenker.90.mcz +Ring-Monticello-StephaneDucasse.12.mcz +Ring-Tests-Containers-MarcusDenker.9.mcz +Ring-Tests-Kernel-MarcusDenker.44.mcz +Ring-Tests-Monticello-MarcusDenker.10.mcz +SUnit-Core-StephaneDucasse.64.mcz +SUnit-Help-MarcusDenker.4.mcz +SUnit-Tests-MarcusDenker.21.mcz +SUnit-UI-StephaneDucasse.52.mcz +SUnit-UITesting-MarcusDenker.4.mcz +SUnit-Utilities-EstebanLorenzano.7.mcz +Settings-Compiler-StephaneDucasse.3.mcz +Settings-Display-MarcusDenker.7.mcz +Settings-FreeType-MarcusDenker.7.mcz +Settings-Graphics-MarcusDenker.14.mcz +Settings-Kernel-StephaneDucasse.3.mcz +Settings-Monticello-MarcusDenker.6.mcz +Settings-Network-StephaneDucasse.16.mcz +Settings-Polymorph-StephaneDucasse.45.mcz +Settings-System-MarcusDenker.21.mcz +Settings-Tools-StephaneDucasse.39.mcz +Shout-StephaneDucasse.158.mcz +ShoutTests-MarcusDenker.17.mcz +Spec-Bindings-StephaneDucasse.22.mcz +Spec-Builder-MarcusDenker.21.mcz +Spec-Core-EstebanLorenzano.78.mcz +Spec-Examples-MarcusDenker.16.mcz +Spec-Layout-MarcusDenker.27.mcz +Spec-Tests-MarcusDenker.18.mcz +Spec-Tools-EstebanLorenzano.86.mcz +Spec-Widgets-EnhSpecSelectionSmallLint.86.mcz +StartupPreferences-MarcusDenker.72.mcz +System-Announcements-MarcusDenker.40.mcz +System-Applications-MarcusDenker.44.mcz +System-Changes-MarcusDenker.196.mcz +System-Clipboard-StephaneDucasse.23.mcz +System-CommandLine-MarcusDenker.71.mcz +System-FilePackage-MarcusDenker.72.mcz +System-FileRegistry-MarcusDenker.19.mcz +System-Finalization-StephaneDucasse.17.mcz +System-Hashing-MarcusDenker.20.mcz +System-History-MarcusDenker.5.mcz +System-Installers-EstebanLorenzano.22.mcz +System-Localization-MarcusDenker.67.mcz +System-Object Events-StephaneDucasse.11.mcz +System-Platforms-MarcusDenker.27.mcz +System-PragmaCollector-MarcusDenker.11.mcz +System-Serial Port-MarcusDenker.20.mcz +System-Settings-StephaneDucasse.268.mcz +System-Sound-StephaneDucasse.10.mcz +System-Support-StephaneDucasse.767.mcz +System-Text-EstebanLorenzano.216.mcz +System-Tools-StephaneDucasse.93.mcz +SystemProgress-MarcusDenker.5.mcz +Tests-MarcusDenker.495.mcz +Text-EstebanLorenzano.49.mcz +TextTests-MarcusDenker.3.mcz +Tools-EstebanLorenzano.1024.mcz +ToolsTest-MarcusDenker.denker.30.mcz +Traits-MarcusDenker.449.mcz +Transcript-MarcusDenker.6.mcz +UI-MarcusDenker.5.mcz +UIManager-MarcusDenker.98.mcz +Unicode-Initialization-MarcusDenker.4.mcz +UpdateStreamer-Core-MarcusDenker.6.mcz +UpdateStreamer-Tests-MarcusDenker.2.mcz +Zinc-Character-Encoding-Core-SvenVanCaekenberghe.2.mcz +Zinc-Character-Encoding-Tests-SvenVanCaekenberghe.2.mcz +Zinc-FileSystem-MarcusDenker.8.mcz +Zinc-HTTP-MarcusDenker.338.mcz +Zinc-Patch-HTTPSocket-MarcusDenker.4.mcz +Zinc-Resource-Meta-Core-SvenVanCaekenberghe.3.mcz +Zinc-Resource-Meta-Tests-SvenVanCaekenberghe.3.mcz +Zinc-Tests-SvenVanCaekenberghe.170.mcz +Zinc-Zodiac-SvenVanCaekenberghe.23.mcz +Zodiac-Core-SvenVanCaekenberghe.27.mcz +Zodiac-Extra-NorbertHartl.6.mcz +Zodiac-Tests-SvenVanCaekenberghe.10.mcz' +findTokens: String lf , String cr \ No newline at end of file diff --git a/ScriptLoader20.package/ScriptLoader.class/instance/update20503.st b/ScriptLoader20.package/ScriptLoader.class/instance/update20503.st new file mode 100644 index 0000000000..737d544093 --- /dev/null +++ b/ScriptLoader20.package/ScriptLoader.class/instance/update20503.st @@ -0,0 +1,13 @@ +pharo - updates +update20503 + "self new update20503" + self withUpdateLog: 'Issue 7381: enhance menus + http://code.google.com/p/pharo/issues/detail?id=7381 + +Issue 7374: OrderedIdentityDictionary in a more general package + http://code.google.com/p/pharo/issues/detail?id=7374 + +Issue 7115: cmd . in workspace erase the line + http://code.google.com/p/pharo/issues/detail?id=7115'. + self loadTogether: self script481 merge: false. + self flushCaches. diff --git a/ScriptLoader20.package/ScriptLoader.class/methodProperties.json b/ScriptLoader20.package/ScriptLoader.class/methodProperties.json index 866f6392e4..588782f7ee 100644 --- a/ScriptLoader20.package/ScriptLoader.class/methodProperties.json +++ b/ScriptLoader20.package/ScriptLoader.class/methodProperties.json @@ -42,7 +42,7 @@ "checkImageIsUptodate" : "CamilloBruni 5/10/2012 15:58", "checkImageIsUptodateSilently" : "CamilloBruni 5/10/2012 15:56", "cleanRepositories" : "StephaneDucasse 11/13/2010 22:31", - "commentForCurrentUpdate" : "EnhSpecSelectionSmallLint 1/31/2013 17:07", + "commentForCurrentUpdate" : "EstebanLorenzano 2/1/2013 11:47", "compileNewUpdateMethod" : "StephaneDucasse 4/4/2010 14:36", "compileNewUpdateMethodSilentlyPreLoad:postLoad:" : "MarcusDenker 2/28/2012 20:13", "compileScriptMethodWithCurrentPackages:" : "StephaneDucasse 4/4/2010 13:26", @@ -543,6 +543,7 @@ "script479" : "MarcusDenker 1/31/2013 15:04", "script48" : "MarcusDenker 5/7/2012 17:52", "script480" : "EnhSpecSelectionSmallLint 1/31/2013 17:07", + "script481" : "EstebanLorenzano 2/1/2013 11:49", "script49" : "MarcusDenker 5/8/2012 09:59", "script5" : "EstebanLorenzano 4/25/2012 17:08", "script50" : "EstebanLorenzano 5/8/2012 15:46", @@ -1105,6 +1106,7 @@ "update20500" : "MarcusDenker 1/31/2013 10:22", "update20501" : "MarcusDenker 1/31/2013 15:04", "update20502" : "EnhSpecSelectionSmallLint 1/31/2013 17:07", + "update20503" : "EstebanLorenzano 2/1/2013 11:49", "updateUpdatesList:" : "SeanDeNigris 7/12/2012 08:44", "updatesListFile" : "SeanDeNigris 7/12/2012 08:44", "updatesListFileName" : "StephaneDucasse 2/10/2011 15:40", diff --git a/Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu1..st b/Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu1..st new file mode 100644 index 0000000000..ac687c8ad4 --- /dev/null +++ b/Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu1..st @@ -0,0 +1,36 @@ +menu +changeSetMenu1: aBuilder + + + + | target | + + target := aBuilder model. + + target selectedChangeSet ifNotNil: [ + (aBuilder item: #'Make changes go to me') + keyText: 'm'; + selector: #setCurrentChangeSet. + (aBuilder item: #'New change set...') + keyText: 'n'; + selector: #newSet ]. + + (aBuilder item: #'Find...') + keyText: 'f'; + selector: #findChangeSet. + + target selectedChangeSet ifNotNil: [ + aBuilder withSeparatorAfter. + (aBuilder item: #'Rename change set') + keyText: 'r'; + selector: #rename. + (aBuilder item: #'File out') + keyText: 'o'; + selector: #fileOut. + (aBuilder item: #'Browse methods') + keyText: 'b'; + selector: #browseChangeSet. + (aBuilder item: #'Browse change set') + keyText: 'B'; + selector: #openChangeSetBrowser ]. + \ No newline at end of file diff --git a/Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu2..st b/Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu2..st new file mode 100644 index 0000000000..8a752e15b0 --- /dev/null +++ b/Spec-Tools.package/ChangeSorterApplication.class/class/changeSetMenu2..st @@ -0,0 +1,38 @@ +menu +changeSetMenu2: aBuilder + + + + | target cs | + + target := aBuilder model. + cs := target selectedChangeSet. + cs ifNil: [ ^self ]. + + cs hasPreamble + ifTrue: [ + (aBuilder item: #'Edit preamble') + keyText: 'p'; + selector: #addPreamble. + (aBuilder item: #'Remove preamble') + selector: #removePreamble ] + ifFalse: [ + (aBuilder item: #'Add preamble') + keyText: 'p'; + selector: #addPreamble ]. + + cs hasPreamble + ifTrue: [ + (aBuilder item: #'Edit postscript...') + selector: #editPostscript. + (aBuilder item: #'Remove postscript') + selector: #removePostscript ] + ifFalse: [ + (aBuilder item: #'Add postscript...') + selector: #editPostscript ]. + + aBuilder withSeparatorAfter. + (aBuilder item: #'Destroy change set') + keyText: 'x'; + selector: #remove. + \ No newline at end of file diff --git a/Spec-Tools.package/ChangeSorterApplication.class/class/classListMenu..st b/Spec-Tools.package/ChangeSorterApplication.class/class/classListMenu..st new file mode 100644 index 0000000000..dcd8d245d9 --- /dev/null +++ b/Spec-Tools.package/ChangeSorterApplication.class/class/classListMenu..st @@ -0,0 +1,24 @@ +menu +classListMenu: aBuilder + + + + | target | + + target := aBuilder model. + + (aBuilder item: #'Delete class from change set') + keyText: 'd'; + selector: #forgetClass. + (aBuilder item: #'Remove class from system') + keyText: 'x'; + selector: #removeClass; + withSeparatorAfter. + + (aBuilder item: #'Browse full') + keyText: 'b'; + selector: #browseMethodFull; + withSeparatorAfter. + + (aBuilder item: #'FileOut') + selector: #fileOutClass. diff --git a/Spec-Tools.package/ChangeSorterApplication.class/class/messageListMenu..st b/Spec-Tools.package/ChangeSorterApplication.class/class/messageListMenu..st new file mode 100644 index 0000000000..2cd06ad276 --- /dev/null +++ b/Spec-Tools.package/ChangeSorterApplication.class/class/messageListMenu..st @@ -0,0 +1,33 @@ +menu +messageListMenu: aBuilder + + + + | target | + + target := aBuilder model. + + (aBuilder item: #'Delete method from changeSet') + keyText: 'd'; + selector: #forgetMessage. + (aBuilder item: #'Remove method from system') + keyText: 'x'; + selector: #removeMessage; + withSeparatorAfter. + + (aBuilder item: #'Browse full') + keyText: 'b'; + selector: #browseMethodFull; + withSeparatorAfter. + + (aBuilder item: #'FileOut') + selector: #fileOutMessage. + (aBuilder item: #'Senders of...') + keyText: 'n'; + selector: #browseSendersOfMessages. + (aBuilder item: #'Implementors of...') + keyText: 'm'; + selector: #browseImplementorsOfMessages. + (aBuilder item: #'Versions') + keyText: 'v'; + selector: #browseVersions. diff --git a/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu.shifted..st b/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu.shifted..st index f7f4dbacd8..ad6acd93ad 100644 --- a/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu.shifted..st +++ b/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu.shifted..st @@ -2,7 +2,6 @@ menu changeSetMenu: aMenu shifted: isShifted "Set up aMenu to hold commands for the change-set-list pane. This could be for a single or double changeSorter" - isShifted ifTrue: [^ self shiftedChangeSetMenu: aMenu]. self changeSetMenu1: aMenu shifted: isShifted. self changeSetMenu2: aMenu shifted: isShifted. diff --git a/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu1.shifted..st b/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu1.shifted..st index 92bf202aff..4b34bbf59b 100644 --- a/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu1.shifted..st +++ b/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu1.shifted..st @@ -6,28 +6,4 @@ changeSetMenu1: aMenu shifted: isShifted title: 'Change Set'; target: self. - self selectedChangeSet - ifNotNil:[ - aMenu - add: 'Make changes go to me (m)' - action: #setCurrentChangeSet; - addLine; - add: 'New change set... (n)' - action: #newSet ]. - aMenu - add: 'Find...(f)' - action: #findChangeSet. - - self selectedChangeSet - ifNotNil:[ - aMenu - addLine; - add: 'Rename change set (r)' - action: #rename; - add: 'File out (o)' - action: #fileOut; - add: 'Browse methods (b)' - action: #browseChangeSet; - add: 'Browse change set (B)' - action: #openChangeSetBrowser; - addLine ] \ No newline at end of file + aMenu addAllFromPragma: 'changeSorterChangeSetList1Menu' target: self. \ No newline at end of file diff --git a/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu2.shifted..st b/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu2.shifted..st index 95909d6204..2045948cb7 100644 --- a/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu2.shifted..st +++ b/Spec-Tools.package/ChangeSorterApplication.class/instance/changeSetMenu2.shifted..st @@ -1,22 +1,7 @@ menu changeSetMenu2: aMenu shifted: isShifted "Set up aMenu to hold commands for the change-set-list pane. This could be for a single or double changeSorter" - | cs | - - cs := self selectedChangeSet. - self selectedChangeSet - ifNotNil:[ - (cs notNil and: [ cs hasPreamble ]) - ifTrue: [ - aMenu add: 'Edit preamble (p)' action: #addPreamble. - aMenu add: 'Remove preamble' action: #removePreamble ] - ifFalse: [ aMenu add: 'Add preamble (p)' action: #addPreamble ]. - (cs notNil and: [ cs hasPostscript ]) - ifTrue: [ - aMenu add: 'Edit postscript...' action: #editPostscript. - aMenu add: 'Remove postscript' action: #removePostscript ] - ifFalse: [ aMenu add: 'Add postscript...' action: #editPostscript ]. - - aMenu addLine. - aMenu add: 'Destroy change set (x)' action: #remove ]. \ No newline at end of file + aMenu addAllFromPragma: 'changeSorterChangeSetList2Menu' target: self. + + ^aMenu diff --git a/Spec-Tools.package/ChangeSorterApplication.class/instance/classMenu.shifted..st b/Spec-Tools.package/ChangeSorterApplication.class/instance/classMenu.shifted..st index 5c52703c43..48df8004e8 100644 --- a/Spec-Tools.package/ChangeSorterApplication.class/instance/classMenu.shifted..st +++ b/Spec-Tools.package/ChangeSorterApplication.class/instance/classMenu.shifted..st @@ -5,14 +5,6 @@ classMenu: aMenu shifted: shifted self selectedClass ifNil: [ ^ nil ]. aMenu title: 'Class list'. - aMenu target: self. - aMenu addList: #( - - - ('Delete class from change set (d)' forgetClass) - ('Remove class from system (x)' removeClass) - - - ('Browse full (b)' browseMethodFull) - - - ('FileOut' fileOutClass)). - - ^ aMenu \ No newline at end of file + aMenu addAllFromPragma: 'changeSorterClassListMenu' target: self. + + ^aMenu \ No newline at end of file diff --git a/Spec-Tools.package/ChangeSorterApplication.class/instance/messageMenu.shifted..st b/Spec-Tools.package/ChangeSorterApplication.class/instance/messageMenu.shifted..st index 19dc97961c..a487070453 100644 --- a/Spec-Tools.package/ChangeSorterApplication.class/instance/messageMenu.shifted..st +++ b/Spec-Tools.package/ChangeSorterApplication.class/instance/messageMenu.shifted..st @@ -6,15 +6,6 @@ messageMenu: aMenu shifted: shifted aMenu title: 'Message list'. aMenu target: self. - aMenu addList: #( - ('Delete method from changeSet (d)' forgetMessage) - ('Remove method from system (x)' removeMessage) - - - ('Browse full (b)' browseMethodFull) - - - ('FileOut' fileOutMessage) - - - ('Senders of... (n)' browseSendersOfMessages) - ('Implementors of... (m)' browseImplementorsOfMessages) - ('Versions (v)' browseVersions)). - ^ aMenu + aMenu addAllFromPragma:'changeSorterMessageListMenu' target: self. + + ^aMenu \ No newline at end of file diff --git a/Spec-Tools.package/ChangeSorterApplication.class/methodProperties.json b/Spec-Tools.package/ChangeSorterApplication.class/methodProperties.json index 22052dbbb7..561f57f723 100644 --- a/Spec-Tools.package/ChangeSorterApplication.class/methodProperties.json +++ b/Spec-Tools.package/ChangeSorterApplication.class/methodProperties.json @@ -1,6 +1,10 @@ { "class" : { + "changeSetMenu1:" : "EstebanLorenzano 1/31/2013 18:29", + "changeSetMenu2:" : "EstebanLorenzano 1/31/2013 18:29", + "classListMenu:" : "EstebanLorenzano 1/31/2013 18:29", "defaultSpec" : "BenjaminVanRyseghem 7/31/2012 16:09", + "messageListMenu:" : "EstebanLorenzano 1/31/2013 18:30", "registerToolsOn:" : "StephaneDucasse 7/4/2012 19:48" }, "instance" : { "addPreamble" : "", @@ -9,15 +13,15 @@ "browseMethodFull" : "", "browseSendersOfMessages" : "", "browseVersions" : "", - "changeSetMenu1:shifted:" : "", - "changeSetMenu2:shifted:" : "", - "changeSetMenu:shifted:" : "", + "changeSetMenu1:shifted:" : "EstebanLorenzano 1/31/2013 19:25", + "changeSetMenu2:shifted:" : "EstebanLorenzano 1/31/2013 19:25", + "changeSetMenu:shifted:" : "EstebanLorenzano 1/31/2013 14:36", "changeSetShortcuts:from:" : "", "changeSets" : "BenjaminVanRyseghem 12/19/2012 20:39", "changesListModel" : "", "changesMenu:" : "", "changesShortcuts:" : "", - "classMenu:shifted:" : "", + "classMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:25", "classShortcuts:from:" : "", "classesListModel" : "", "classesMenu:" : "", @@ -36,7 +40,7 @@ "initializeAnnouncements" : "StephaneDucasse 11/2/2012 16:05", "initializePresenter" : "BenjaminVanRyseghem 6/12/2012 18:22", "initializeWidgets" : "StephaneDucasse 11/2/2012 16:05", - "messageMenu:shifted:" : "", + "messageMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:25", "methodShortcuts:from:" : "", "methodsListModel" : "", "methodsMenu:" : "", diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/class/changesListMenu..st b/Spec-Tools.package/DualChangeSorterApplication.class/class/changesListMenu..st new file mode 100644 index 0000000000..c91d1985f1 --- /dev/null +++ b/Spec-Tools.package/DualChangeSorterApplication.class/class/changesListMenu..st @@ -0,0 +1,24 @@ +menu +changesListMenu: aBuilder + + + + | target src dest | + + self flag: #todo. "I do not like how I'm getting the parameters (an Array), but looks the faster way now :( + And I need src and dest parameters because it is called in two sides of change sorter" + target := aBuilder model first. + src := aBuilder model second. + dest := aBuilder model third. + + src selectedChangeSet ifNil:[ ^self ]. + + (aBuilder item: #'Copy all to the other change set') + keyText: 'c'; + action: [ target copyAllFrom: src to: dest ]. + (aBuilder item: #'Submerge into the other change set') + action: [ target submerge: src into: dest ]. + (aBuilder item: #'Subtract the other change set') + keyText: '-'; + action: [ target subtractFrom: src to: dest ]; + withSeparatorAfter. \ No newline at end of file diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/class/classListMenu..st b/Spec-Tools.package/DualChangeSorterApplication.class/class/classListMenu..st new file mode 100644 index 0000000000..0daa89ba32 --- /dev/null +++ b/Spec-Tools.package/DualChangeSorterApplication.class/class/classListMenu..st @@ -0,0 +1,18 @@ +menu +classListMenu: aBuilder + + + + | target src dest | + + self flag: #todo. "I do not like how I'm getting the parameters (an Array), but looks the faster way now :( + And I need src and dest parameters because it is called in two sides of change sorter" + target := aBuilder model first. + src := aBuilder model second. + dest := aBuilder model third. + + (aBuilder item: #'Copy class to the other change set') + keyText: 'c'; + action: [ target copyClassFrom: src to: dest ]. + (aBuilder item: #'Move class to the other change set') + action: [ target moveClassFrom: src to: dest ]. diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/class/messageListMenu..st b/Spec-Tools.package/DualChangeSorterApplication.class/class/messageListMenu..st new file mode 100644 index 0000000000..1a554cc413 --- /dev/null +++ b/Spec-Tools.package/DualChangeSorterApplication.class/class/messageListMenu..st @@ -0,0 +1,18 @@ +menu +messageListMenu: aBuilder + + + + | target src dest | + + self flag: #todo. "I do not like how I'm getting the parameters (an Array), but looks the faster way now :( + And I need src and dest parameters because it is called in two sides of change sorter" + target := aBuilder model first. + src := aBuilder model second. + dest := aBuilder model third. + + (aBuilder item: #'Copy method to the other change set') + action: [ target copyMethodFrom: src to: dest ]. + (aBuilder item: #'Move method to the other change set') + action: [ target moveMethodFrom: src to: dest ]; + withSeparatorAfter. diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/instance/changesMenu.shifted.from.to..st b/Spec-Tools.package/DualChangeSorterApplication.class/instance/changesMenu.shifted.from.to..st index b0e762e7fb..2942e97691 100644 --- a/Spec-Tools.package/DualChangeSorterApplication.class/instance/changesMenu.shifted.from.to..st +++ b/Spec-Tools.package/DualChangeSorterApplication.class/instance/changesMenu.shifted.from.to..st @@ -1,26 +1,22 @@ menu changesMenu: menu shifted: shifted from: src to: dest - - src changeSetMenu1: menu shifted: shifted. - - src selectedChangeSet - ifNotNil:[ - menu - add: 'Copy all to the other change set (c)' - target: self - selector: #copyAllFrom:to: - argumentList: {src.dest}. - menu - add: 'Submerge into the other change set' - target: self - selector: #submerge:into: - argumentList: {src.dest}. - menu - add: 'Subtract the other change set (-)' - target: self - selector: #subtractFrom:to: - argumentList: {src.dest}. - menu addLine] . + | menuSrc1 menuSrc2 menuDest | - src changeSetMenu2: menu shifted: shifted. - ^ menu \ No newline at end of file + menuSrc1 := menu copy. + src changeSetMenu1: menuSrc1 shifted: shifted. + + menuSrc2 := menu copy. + src changeSetMenu1: menuSrc2 shifted: shifted. + + menuDest := (PragmaMenuBuilder + pragmaKeyword: 'dualChangeSorteChangesListMenu' + model: {self. src. dest}) + menu. + + menu addAllFrom: (MenuMorph new + addAllMorphs: menuSrc1 submorphs; + addAllMorphs: menuDest submorphs; + addAllMorphs: menuSrc2 submorphs; + yourself). + + ^menu \ No newline at end of file diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/instance/classMenu.shifted.from.to..st b/Spec-Tools.package/DualChangeSorterApplication.class/instance/classMenu.shifted.from.to..st index 7a391eb1d2..aedafbbc0d 100644 --- a/Spec-Tools.package/DualChangeSorterApplication.class/instance/classMenu.shifted.from.to..st +++ b/Spec-Tools.package/DualChangeSorterApplication.class/instance/classMenu.shifted.from.to..st @@ -1,20 +1,21 @@ menu -classMenu: aMenu shifted: shifted from: src to: dest +classMenu: menu shifted: shifted from: src to: dest "Fill aMenu with items appropriate for the class list" + | menuSrc menuDual | + + src selectedClass ifNil: [ ^nil ]. + + menuSrc := menu copy. + src classMenu: menuSrc shifted: shifted. - src selectedClass ifNil: [ ^ nil ]. - aMenu target: self. - aMenu - add: 'Copy class to the other change set(c)' - target: self - selector: #copyClassFrom:to: - argumentList: {src.dest}. - aMenu - add: 'Move class to the other change set' - target: self - selector: #moveClassFrom:to: - argumentList: {src.dest}. - aMenu addLine. - - src classMenu: aMenu shifted: shifted. - ^ aMenu \ No newline at end of file + menuDual := (PragmaMenuBuilder + pragmaKeyword: 'dualChangeSorterClassListMenu' + model: {self. src. dest}) + menu. + + menu addAllFrom: (MenuMorph new + addAllMorphs: menuDual submorphs; + addAllMorphs: menuSrc submorphs; + yourself). + + ^menu diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/instance/messageMenu.shifted.from.to..st b/Spec-Tools.package/DualChangeSorterApplication.class/instance/messageMenu.shifted.from.to..st index bceddbfe12..49077f6925 100644 --- a/Spec-Tools.package/DualChangeSorterApplication.class/instance/messageMenu.shifted.from.to..st +++ b/Spec-Tools.package/DualChangeSorterApplication.class/instance/messageMenu.shifted.from.to..st @@ -1,22 +1,22 @@ menu -messageMenu: aMenu shifted: shifted from: src to: dest +messageMenu: menu shifted: shifted from: src to: dest "Fill aMenu with items appropriate for the message list; could be for a single or double changeSorter" - + | menuSrc menuDual | + src selectedSelector ifNil: [ ^ nil ]. - aMenu target: self. + menu target: self. - aMenu - add: 'Copy method to the other change set' - target: self - selector: #copyMethodFrom:to: - argumentList: {src.dest}. - aMenu - add: 'Move method to the other change set' - target: self - selector: #moveMethodFrom:to: - argumentList: {src.dest}. - aMenu addLine. - - src messageMenu: aMenu shifted: shifted. + menuSrc := menu copy. + src messageMenu: menuSrc shifted: shifted. - ^ aMenu \ No newline at end of file + menuDual := (PragmaMenuBuilder + pragmaKeyword: 'dualChangeSorterMessageListMenu' + model: {self. src. dest}) + menu. + + menu addAllFrom: (MenuMorph new + addAllMorphs: menuDual submorphs; + addAllMorphs: menuSrc submorphs; + yourself). + + ^menu \ No newline at end of file diff --git a/Spec-Tools.package/DualChangeSorterApplication.class/methodProperties.json b/Spec-Tools.package/DualChangeSorterApplication.class/methodProperties.json index a184272604..49a3171b29 100644 --- a/Spec-Tools.package/DualChangeSorterApplication.class/methodProperties.json +++ b/Spec-Tools.package/DualChangeSorterApplication.class/methodProperties.json @@ -1,16 +1,19 @@ { "class" : { + "changesListMenu:" : "EstebanLorenzano 1/31/2013 18:33", + "classListMenu:" : "EstebanLorenzano 1/31/2013 18:33", "defaultSpec" : "BenjaminVanRyseghem 7/31/2012 16:16", "menuCommandOn:" : "MarcusDenker 10/13/2012 14:37", + "messageListMenu:" : "EstebanLorenzano 1/31/2013 18:34", "registerToolsOn:" : "StephaneDucasse 7/4/2012 19:48", "title" : "StephaneDucasse 11/2/2012 13:59" }, "instance" : { "changeSet:to:shortcuts:from:" : "BenjaminVanRyseghem 6/13/2012 12:00", "changeSorterLeft" : "", "changeSorterRight" : "", - "changesMenu:shifted:from:to:" : "BenjaminVanRyseghem 6/13/2012 12:25", + "changesMenu:shifted:from:to:" : "EstebanLorenzano 1/31/2013 19:24", "checkThatSidesDiffer:" : "", - "classMenu:shifted:from:to:" : "tbn 7/5/2012 14:14", + "classMenu:shifted:from:to:" : "EstebanLorenzano 1/31/2013 19:24", "copyAllFrom:to:" : "BenjaminVanRyseghem 6/13/2012 11:58", "copyClassFrom:to:" : "BenjaminVanRyseghem 6/13/2012 12:13", "copyMethodFrom:to:" : "BenjaminVanRyseghem 6/13/2012 12:18", @@ -20,7 +23,7 @@ "initializeWidgets" : "BenjaminVanRyseghem 6/12/2012 18:22", "menusRegistration" : "BenjaminVanRyseghem 6/13/2012 12:30", "menusRegistrationFrom:to:" : "BenjaminVanRyseghem 6/13/2012 12:29", - "messageMenu:shifted:from:to:" : "SeanDeNigris 7/16/2012 07:50", + "messageMenu:shifted:from:to:" : "EstebanLorenzano 1/31/2013 19:24", "model" : "", "moveClassFrom:to:" : "BenjaminVanRyseghem 6/13/2012 12:14", "moveMethodFrom:to:" : "BenjaminVanRyseghem 6/13/2012 12:19", diff --git a/Spec-Tools.package/MessageBrowser.class/class/messageBrowserListMenu..st b/Spec-Tools.package/MessageBrowser.class/class/messageBrowserListMenu..st new file mode 100644 index 0000000000..0cb5b8bb83 --- /dev/null +++ b/Spec-Tools.package/MessageBrowser.class/class/messageBrowserListMenu..st @@ -0,0 +1,50 @@ +menu +messageBrowserListMenu: aBuilder + + + | target model message | + + target := aBuilder model. + model := target model. + target selectedMessage ifNil: [ ^self ]. + + message := target selectedMessage compiledMethod. + + (aBuilder item: #'Browse full...') + keyText: 'b'; + action: [ + Smalltalk tools browser + fullOnClass: message methodClass + selector: message selector ]. + + (aBuilder item: #'Inspect method...') + keyText: 'i'; + action: [ message inspect ]; + withSeparatorAfter. + + (aBuilder item: #'Remove method...') + keyText: 'x'; + action: [ + model + removeMethod: message + inClass: message methodClass ]. + + (aBuilder item: #'Toggle Breakpoint') + action: [ model toggleBreakOnEntryIn: message ]; + withSeparatorAfter. + + (aBuilder item: #'Senders of...') + keyText: 'n'; + action: [ model browseSendersOfMessagesFrom: message selector ]. + + (aBuilder item: #'Implementors of...') + keyText: 'm'; + action: [ model browseMessagesFrom: message selector ]. + + (aBuilder item: #'Users of...') + keyText: 'N'; + action: [ model browseClassRefsOf: message methodClass ]. + + (aBuilder item: #'Versions...') + keyText: 'v'; + action: [ model browseVersionsFrom: message ]. diff --git a/Spec-Tools.package/MessageBrowser.class/instance/model.st b/Spec-Tools.package/MessageBrowser.class/instance/model.st new file mode 100644 index 0000000000..6a449be9c7 --- /dev/null +++ b/Spec-Tools.package/MessageBrowser.class/instance/model.st @@ -0,0 +1,3 @@ +accessing +model + ^model \ No newline at end of file diff --git a/Spec-Tools.package/MessageBrowser.class/instance/setListMenu.st b/Spec-Tools.package/MessageBrowser.class/instance/setListMenu.st index 5c243162a0..e15c6cf60e 100644 --- a/Spec-Tools.package/MessageBrowser.class/instance/setListMenu.st +++ b/Spec-Tools.package/MessageBrowser.class/instance/setListMenu.st @@ -1,40 +1,4 @@ initialization setListMenu - - listModel menu: [:menu || message | - message := self selectedMessage. - menu - add: 'Browse full... (b)' - target: Smalltalk tools browser - selector: #fullOnClass:selector: - argumentList: {message methodClass. message selector }; - add: 'Inspect method... (i)' - target: message - selector: #inspect; - addLine; - add: 'Remove method... (x)' - target: model - selector: #removeMethod:inClass: - argumentList: {message. message methodClass.}; - add: 'Toggle Breakpoint' - target: model - selector: #toggleBreakOnEntryIn: - argument: message; - addLine; - add: 'Senders of... (n)' - target: model - selector: #browseSendersOfMessagesFrom: - argument: message selector; - add: 'Implementors of... (m)' - target: model - selector: #browseMessagesFrom: - argument: message selector ; - add: 'Users of... (N)' - target: model - selector: #browseClassRefsOf: - argument: message methodClass; - add: 'Versions... (v)' - target: model - selector: #browseVersionsFrom: - argument: message. - menu] \ No newline at end of file + listModel menu: [ :menu | + menu addAllFromPragma:'messageBrowserListMenu' target: self ]. \ No newline at end of file diff --git a/Spec-Tools.package/MessageBrowser.class/methodProperties.json b/Spec-Tools.package/MessageBrowser.class/methodProperties.json index 3409abd81b..b97da1fcf7 100644 --- a/Spec-Tools.package/MessageBrowser.class/methodProperties.json +++ b/Spec-Tools.package/MessageBrowser.class/methodProperties.json @@ -4,6 +4,7 @@ "browseMessages:refreshingBlock:named:" : "", "browseSenders:of:named:" : "", "defaultSpec" : "BenjaminVanRyseghem 6/18/2012 06:09", + "messageBrowserListMenu:" : "EstebanLorenzano 1/31/2013 18:32", "on:named:" : "BenjaminVanRyseghem 5/14/2012 02:00", "on:named:autoSelect:" : "", "openFullProtocolForClass:" : "BenjaminVanRyseghem 6/13/2012 10:51", @@ -43,6 +44,7 @@ "methodModified:" : "GuillermoPolito 8/3/2012 13:34", "methodRecategorized:" : "", "methodRemoved:" : "GuillermoPolito 8/3/2012 13:34", + "model" : "EstebanLorenzano 1/31/2013 12:12", "open" : "BenjaminVanRyseghem 5/14/2012 02:00", "openFullProtocolForClass:" : "BenjaminVanRyseghem 6/13/2012 14:42", "openSubProtocolForClass:" : "BenjaminVanRyseghem 6/13/2012 14:42", @@ -55,7 +57,7 @@ "selectedMessage" : "", "selectedMessage:" : "", "setFocus" : "", - "setListMenu" : "", + "setListMenu" : "EstebanLorenzano 1/31/2013 19:25", "setListShortcuts" : "", "setRefreshingBlockForImplementorsOf:" : "", "setRefreshingBlockForSendersOf:" : "CamilloBruni 8/24/2012 16:47", diff --git a/Text.package/SmalltalkEditor.class/class/smalltalkEditorMenuOn..st b/Text.package/SmalltalkEditor.class/class/smalltalkEditorMenuOn..st index 9c3937044c..df9c83a212 100644 --- a/Text.package/SmalltalkEditor.class/class/smalltalkEditorMenuOn..st +++ b/Text.package/SmalltalkEditor.class/class/smalltalkEditorMenuOn..st @@ -5,29 +5,97 @@ smalltalkEditorMenuOn: aBuilder pragmaKeyword: 'smalltalkEditorMenu' model: nil) menu popUpInWorld " + | uitheme| uitheme := UITheme current. UsersManager default currentUser canEvaluateCode ifTrue: [ - (aBuilder item: #'Do it (d)' translated) selector: #doIt; help: nil; icon: uitheme smallDoItIcon. - (aBuilder item: #'Print it (p)' translated) selector: #printIt; help: nil; icon: uitheme smallPrintItIcon. ]. + (aBuilder item: #'Do it' translated) + keyText: 'd'; + selector: #doIt; + help: nil; + icon: uitheme smallDoItIcon. + (aBuilder item: #'Print it' translated) + keyText: 'p'; + selector: #printIt; + help: nil; + icon: uitheme smallPrintItIcon. ]. UsersManager default currentUser canInspect ifTrue: [ - (aBuilder item: #'Inspect it (i)' translated) selector: #inspectIt; help: nil; icon: uitheme smallInspectItIcon. - (aBuilder item: #'Explore it (I)' translated) selector: #exploreIt; help: nil; icon: uitheme smallInspectItIcon ]. + (aBuilder item: #'Inspect it' translated) + keyText: 'i'; + selector: #inspectIt; + help: nil; + icon: uitheme smallInspectItIcon. + (aBuilder item: #'Explore it' translated) + keyText: 'I'; + selector: #exploreIt; + help: nil; + icon: uitheme smallInspectItIcon ]. UsersManager default currentUser canDebug ifTrue: [ - (aBuilder item: #'Debug it (D)' translated) selector: #debugIt; help: nil; icon: uitheme smallDebugIcon. - (aBuilder item: #'Profile it' translated) selector: #tallyIt; icon: uitheme smallDebugIcon; withSeparatorAfter. ]. - (aBuilder item: #'Find...(f)' translated) selector: #find; help: nil; icon: uitheme smallFindIcon. - (aBuilder item: #'Find again (g)' translated) selector: #findAgain; help: nil; icon: uitheme smallFindIcon. + (aBuilder item: #'Debug it' translated) + keyText: 'D'; + selector: #debugIt; + help: nil; + icon: uitheme smallDebugIcon. + (aBuilder item: #'Profile it' translated) + selector: #tallyIt; + icon: uitheme smallDebugIcon; + withSeparatorAfter. ]. + (aBuilder item: #'Find...' translated) + keyText: 'f'; + selector: #find; + help: nil; + icon: uitheme smallFindIcon. + (aBuilder item: #'Find again' translated) + keyText: 'g'; + selector: #findAgain; + help: nil; + icon: uitheme smallFindIcon. UsersManager default currentUser canBrowse ifTrue: [ - (aBuilder item: #'Extended search...' translated) selector: #shiftedTextPaneMenuRequest; withSeparatorAfter ]. - (aBuilder item: #'Do again (j)' translated) selector: #again; help: nil; icon: uitheme smallRedoIcon. - (aBuilder item: #'Undo (z)' translated) selector: #undo; help: nil; icon: uitheme smallUndoIcon; withSeparatorAfter. - (aBuilder item: #'Copy (c)' translated) selector: #copySelection; help: nil; icon: uitheme smallCopyIcon. - (aBuilder item: #'Cut (x)' translated) selector: #cut; help: nil; icon: uitheme smallCutIcon. - (aBuilder item: #'Paste (v)' translated) selector: #paste; help: nil; icon: uitheme smallPasteIcon. - (aBuilder item: #'Paste...' translated) selector: #pasteRecent; help: nil; icon: uitheme smallCopyIcon; withSeparatorAfter. + (aBuilder item: #'Extended search...' translated) + selector: #shiftedTextPaneMenuRequest; + withSeparatorAfter ]. + (aBuilder item: #'Do again' translated) + keyText: 'j'; + selector: #again; + help: nil; + icon: uitheme smallRedoIcon. + (aBuilder item: #'Undo' translated) + keyText: 'z'; + selector: #undo; + help: nil; + icon: uitheme smallUndoIcon; + withSeparatorAfter. + (aBuilder item: #'Copy' translated) + keyText: 'c'; + selector: #copySelection; + help: nil; + icon: uitheme smallCopyIcon. + (aBuilder item: #'Cut' translated) + keyText: 'x'; + selector: #cut; + help: nil; + icon: uitheme smallCutIcon. + (aBuilder item: #'Paste' translated) + keyText: 'v'; + selector: #paste; + help: nil; + icon: uitheme smallPasteIcon. + (aBuilder item: #'Paste...' translated) + selector: #pasteRecent; + help: nil; + icon: uitheme smallCopyIcon; + withSeparatorAfter. UsersManager default currentUser canEvaluateCode ifTrue: [ - (aBuilder item: #'Accept (s)' translated) selector: #accept; help: nil; icon: uitheme smallOkIcon. - (aBuilder item: #'Cancel (l)' translated) selector: #cancel; help: nil; icon: uitheme smallCancelIcon ]. + (aBuilder item: #'Accept' translated) + keyText: 's'; + selector: #accept; + help: nil; + icon: uitheme smallOkIcon. + (aBuilder item: #'Cancel' translated) + keyText: 'l'; + selector: #cancel; + help: nil; + icon: uitheme + smallCancelIcon ]. \ No newline at end of file diff --git a/Text.package/SmalltalkEditor.class/class/smalltalkEditorShiftedMenuOn..st b/Text.package/SmalltalkEditor.class/class/smalltalkEditorShiftedMenuOn..st index e0b1e165b9..6bf11a9be1 100644 --- a/Text.package/SmalltalkEditor.class/class/smalltalkEditorShiftedMenuOn..st +++ b/Text.package/SmalltalkEditor.class/class/smalltalkEditorShiftedMenuOn..st @@ -5,14 +5,35 @@ smalltalkEditorShiftedMenuOn: aBuilder pragmaKeyword: 'smalltalkEditorShiftedMenu' model: nil) menu popUpInWorld" + - (aBuilder item: #'browse it (b)' translated) selector: #browseIt. - (aBuilder item: #'senders of it (n)' translated) selector: #sendersOfIt. - (aBuilder item: #'implementors of it (m)' translated) selector: #implementorsOfIt. - (aBuilder item: #'references to it (N)' translated) selector: #referencesToIt; withSeparatorAfter. - (aBuilder item: #'selectors containing it (W)' translated) selector: #methodNamesContainingIt. - (aBuilder item: #'case insensitive method literal strings with it (E)' translated) selector: #methodStringsContainingit. - (aBuilder item: #'case sensitive method literal strings with it (E)' translated) selector: #methodCaseSensitiveStringsContainingit. - (aBuilder item: #'method source with it' translated) selector: #methodSourceContainingIt; withSeparatorAfter. - (aBuilder item: #'class names containing it' translated) selector: #classNamesContainingIt. - (aBuilder item: #'class comments with it' translated) selector: #classCommentsContainingIt. + + (aBuilder item: #'browse it' translated) + keyText: 'b'; + selector: #browseIt. + (aBuilder item: #'senders of it' translated) + keyText: 'n'; + selector: #sendersOfIt. + (aBuilder item: #'implementors of it' translated) + keyText: 'm'; + selector: #implementorsOfIt. + (aBuilder item: #'references to it' translated) + keyText: 'N'; + selector: #referencesToIt; + withSeparatorAfter. + (aBuilder item: #'selectors containing it' translated) + keyText: 'W'; + selector: #methodNamesContainingIt. + (aBuilder item: #'case insensitive method literal strings with it' translated) + keyText: 'E'; + selector: #methodStringsContainingit. + (aBuilder item: #'case sensitive method literal strings with it' translated) + keyText: 'E'; + selector: #methodCaseSensitiveStringsContainingit. + (aBuilder item: #'method source with it' translated) + selector: #methodSourceContainingIt; + withSeparatorAfter. + (aBuilder item: #'class names containing it' translated) + selector: #classNamesContainingIt. + (aBuilder item: #'class comments with it' translated) + selector: #classCommentsContainingIt. diff --git a/Text.package/SmalltalkEditor.class/methodProperties.json b/Text.package/SmalltalkEditor.class/methodProperties.json index 1970d60159..a214ad2f62 100644 --- a/Text.package/SmalltalkEditor.class/methodProperties.json +++ b/Text.package/SmalltalkEditor.class/methodProperties.json @@ -6,10 +6,10 @@ "initializeShiftCmdKeyShortcuts" : "MarcusDenker 5/8/2012 10:16", "shiftedYellowButtonMenu" : "AlainPlantec 11/16/2010 22:19", "smalltalkEditorMenuKeyword" : "AlainPlantec 11/16/2010 17:01", - "smalltalkEditorMenuOn:" : "BenjaminVanRyseghem 10/25/2012 15:24", + "smalltalkEditorMenuOn:" : "EstebanLorenzano 1/31/2013 18:42", "smalltalkEditorShiftedMenuKeyword" : "AlainPlantec 11/16/2010 17:00", - "smalltalkEditorShiftedMenuOn:" : "MarcusDenker 10/13/2012 13:02", - "yellowButtonMenu" : "AlainPlantec 11/16/2010 22:23" }, + "smalltalkEditorShiftedMenuOn:" : "EstebanLorenzano 1/31/2013 18:45", + "yellowButtonMenu" : "EstebanLorenzano 1/30/2013 18:24" }, "instance" : { "argAdvance:" : "AlainPlantec 11/8/2010 22:09", "browseClassFrom:" : "CamilloBruni 2/1/2012 19:35", diff --git a/Text.package/TextEditor.class/class/textEditorMenuOn..st b/Text.package/TextEditor.class/class/textEditorMenuOn..st index 2f20c267a7..b1a33eb8df 100644 --- a/Text.package/TextEditor.class/class/textEditorMenuOn..st +++ b/Text.package/TextEditor.class/class/textEditorMenuOn..st @@ -5,21 +5,64 @@ textEditorMenuOn: aBuilder pragmaKeyword: 'textEditorMenu' model: nil) menu popUpInWorld" + + | uitheme | uitheme := UITheme current. - (aBuilder item: #'Find...(f)' translated) selector: #find; help: nil; icon: uitheme smallFindIcon. - (aBuilder item: #'Find again (g)' translated) selector: #findAgain; help: nil; icon: uitheme smallFindIcon. - (aBuilder item: #'Set search string (h)' translated) selector: #setSearchString. - (aBuilder item: #'Do again (j)' translated) selector: #again; help: nil; icon: uitheme smallRedoIcon. - (aBuilder item: #'Undo (z)' translated) selector: #undo; help: nil; icon: uitheme smallUndoIcon; withSeparatorAfter. - (aBuilder item: #'Copy (c)' translated) selector: #copySelection; help: nil; icon: uitheme smallCopyIcon. - (aBuilder item: #'Cut (x)' translated) selector: #cut; help: nil; icon: uitheme smallCutIcon. - (aBuilder item: #'Paste (v)' translated) selector: #paste; help: nil; icon: uitheme smallPasteIcon. - (aBuilder item: #'Paste...' translated) selector: #pasteRecent; help: nil; icon: uitheme smallCopyIcon; withSeparatorAfter. - (aBuilder item: #'Set font... (k)' translated) selector: #offerFontMenu. - (aBuilder item: #'Set style... (K)' translated) selector: #changeStyle. - (aBuilder item: #'Set alignment...' translated) selector: #chooseAlignment; withSeparatorAfter. - (aBuilder item: #'Accept (s)' translated) selector: #accept; help: nil; icon: uitheme smallOkIcon. - (aBuilder item: #'Cancel (l)' translated) selector: #cancel; help: nil; icon: uitheme smallCancelIcon. + (aBuilder item: #'Find...' translated) + keyText: 'f'; + selector: #find; + icon: uitheme smallFindIcon. + (aBuilder item: #'Find again' translated) + keyText: 'g'; + selector: #findAgain; + icon: uitheme smallFindIcon. + (aBuilder item: #'Set search string' translated) + keyText: 'h'; + selector: #setSearchString. + (aBuilder item: #'Do again' translated) + keyText: 'j'; + selector: #again; + icon: uitheme smallRedoIcon. + (aBuilder item: #'Undo' translated) + keyText: 'z'; + selector: #undo; + icon: uitheme smallUndoIcon; + withSeparatorAfter. + + (aBuilder item: #'Copy' translated) + keyText: 'c'; + selector: #copySelection; + icon: uitheme smallCopyIcon. + (aBuilder item: #'Cut' translated) + keyText: 'x'; + selector: #cut; + icon: uitheme smallCutIcon. + (aBuilder item: #'Paste' translated) + keyText: 'v'; + selector: #paste; + icon: uitheme smallPasteIcon. + (aBuilder item: #'Paste...' translated) + selector: #pasteRecent; + icon: uitheme smallCopyIcon; + withSeparatorAfter. + + (aBuilder item: #'Set font...' translated) + keyText: 'k'; + selector: #offerFontMenu. + (aBuilder item: #'Set style...' translated) + keyText: 'K'; + selector: #changeStyle. + (aBuilder item: #'Set alignment...' translated) + selector: #chooseAlignment; + withSeparatorAfter. + (aBuilder item: #'Accept' translated) + keyText: 's'; + selector: #accept; + icon: uitheme smallOkIcon. + (aBuilder item: #'Cancel' translated) + keyText: 'l'; + selector: #cancel; + icon: uitheme smallCancelIcon. \ No newline at end of file diff --git a/Text.package/TextEditor.class/class/textEditorShiftedMenuOn..st b/Text.package/TextEditor.class/class/textEditorShiftedMenuOn..st index e2f346b1a8..6beddb89f5 100644 --- a/Text.package/TextEditor.class/class/textEditorShiftedMenuOn..st +++ b/Text.package/TextEditor.class/class/textEditorShiftedMenuOn..st @@ -5,8 +5,15 @@ textEditorShiftedMenuOn: aBuilder pragmaKeyword: 'textEditorShiftedMenu' model: nil) menu popUpInWorld" + - (aBuilder item: #'set font... (k)' translated) selector: #offerFontMenu. - (aBuilder item: #'set style... (K)' translated) selector: #changeStyle. - (aBuilder item: #'set alignment...' translated) selector: #chooseAlignment. - (aBuilder item: #'more...' translated) selector: #yellowButtonActivity. + (aBuilder item: #'Set font...' translated) + keyText: 'k'; + selector: #offerFontMenu. + (aBuilder item: #'Set style... (K)' translated) + keyText: 'K'; + selector: #changeStyle. + (aBuilder item: #'Set alignment...' translated) + selector: #chooseAlignment. + (aBuilder item: #'More...' translated) + selector: #yellowButtonActivity. diff --git a/Text.package/TextEditor.class/methodProperties.json b/Text.package/TextEditor.class/methodProperties.json index 67f577372e..1d6a08ff21 100644 --- a/Text.package/TextEditor.class/methodProperties.json +++ b/Text.package/TextEditor.class/methodProperties.json @@ -13,8 +13,8 @@ "initializeShiftCmdKeyShortcuts" : "AlainPlantec 11/16/2010 22:00", "shiftCmdActions" : "AlainPlantec 11/8/2010 22:09", "shiftedYellowButtonMenu" : "AlainPlantec 11/16/2010 22:15", - "textEditorMenuOn:" : "FernandoOlivero 4/12/2011 10:40", - "textEditorShiftedMenuOn:" : "AlainPlantec 11/16/2010 22:03", + "textEditorMenuOn:" : "EstebanLorenzano 1/31/2013 18:40", + "textEditorShiftedMenuOn:" : "EstebanLorenzano 1/31/2013 18:35", "useFindReplaceSelection" : "AlainPlantec 11/12/2010 22:35", "useFindReplaceSelection:" : "AlainPlantec 11/13/2010 00:12", "useSecondarySelection" : "AlainPlantec 11/12/2010 11:50", diff --git a/Tools.package/ChangeList.class/class/changeListMenu..st b/Tools.package/ChangeList.class/class/changeListMenu..st new file mode 100644 index 0000000000..3ae62f34f1 --- /dev/null +++ b/Tools.package/ChangeList.class/class/changeListMenu..st @@ -0,0 +1,123 @@ +menu +changeListMenu: aBuilder + + + + | target | + + target := aBuilder model. + + (aBuilder item: #'FileIn selections') + help: 'Import the selected items into the image'; + target: target; + selector: #fileInSelections. + (aBuilder item: #'FileOut selections...') + help: 'Create a new file containing the selected items'; + target: target; + selector: #fileOutSelections; + withSeparatorAfter. + + (aBuilder item: #'Compare to current') + help: 'Open a separate window which shows the text differences between the on-file version and the in-image version'; + target: target; + selector: #compareToCurrentVersion. + (aBuilder item: #'Toggle diffing') + keyText: 'D'; + help: 'Start or stop showing diffs in the code pane'; + target: target; + selector: #toggleDiffing; + withSeparatorAfter. + + (aBuilder item: #'Select conflicts with any changeset') + help: 'Select methods in the file which also occur in any change-set in the system'; + target: target; + selector: #selectAllConflicts. + (aBuilder item: #'Select conflicts with current changeset') + help: 'Select methods in the file which also occur in the current change-set'; + target: target; + selector: #selectConflicts. + (aBuilder item: #'Select conflicts with...') + help: 'Allows you to designate a file or change-set against which to check for code conflicts'; + target: target; + selector: #selectConflictsWith; + withSeparatorAfter. + + (aBuilder item: #'Select unchanged definitions') + help: 'Select class definitions, class comments and methods in the file whose in-image versions are the same as their in-file counterparts'; + target: target; + selector: #selectUnchangedDefinitions. + (aBuilder item: #'Select unchanged methods') + help: 'Select methods in the file whose in-image versions are the same as their in-file counterparts'; + target: target; + selector: #selectUnchangedMethods. + (aBuilder item: #'Select new methods') + help: 'Select methods in the file that do not current occur in the image'; + target: target; + selector: #selectNewMethods. + (aBuilder item: #'Select methods for this class') + help: 'Select all methods in the file that belong to the currently-selected class'; + target: target; + selector: #selectMethodsForThisClass. + (aBuilder item: #'Select methods for classes in image') + help: 'Select all methods in the file that belong to a class that exists in the image'; + target: target; + selector: #selectMethodsForExtantClasses. + (aBuilder item: #'Select changes with contents matching') + help: 'Select all changes in the file whose text includes a pattern'; + target: target; + selector: #selectContentsMatching; + withSeparatorAfter. + + (aBuilder item: #'Select all') + keyText: 'a'; + help: 'Select all the items in the list'; + target: target; + selector: #selectAll. + (aBuilder item: #'Deselect all') + help: 'Deselect all the items in the list'; + target: target; + selector: #deselectAll. + (aBuilder item: #'Invert selections') + help: 'Select every item that is not currently selected, and deselect every item that *is* currently selected'; + target: target; + selector: #invertSelections; + withSeparatorAfter. + + (aBuilder item: #'Browse all versions of single selection') + help: 'Open a version browser showing the versions of the currently selected method'; + target: target; + selector: #browseVersions. + (aBuilder item: #'Browse all versions of selections') + help: 'Open a version browser showing all the versions of all the selected methods'; + target: target; + selector: #browseAllVersionsOfSelections. + (aBuilder item: #'Browse current versions of selections') + help: 'Open a message-list browser showing the current (in-image) counterparts of the selected methods'; + target: target; + selector: #browseCurrentVersionsOfSelections. + (aBuilder item: #'Destroy current methods of selections') + help: 'Remove (*destroy*) the in-image counterparts of all selected methods'; + target: target; + selector: #destroyCurrentCodeOfSelections; + withSeparatorAfter. + + (aBuilder item: #'Remove doIts') + help: 'Remove all items that are doIts rather than methods'; + target: target; + selector: #removeDoIts. + (aBuilder item: #'Remove older versions') + help: 'Remove all but the most recent versions of methods in the list'; + target: target; + selector: #removeOlderMethodVersions. + (aBuilder item: #'Remove up-to-date versions') + help: 'Remove all items whose code is the same as the counterpart in-image code'; + target: target; + selector: #removeExistingMethodVersions. + (aBuilder item: #'Remove selected items') + help: 'Remove the selected items from the change-list'; + target: target; + selector: #removeSelections. + (aBuilder item: #'Remove unselected items') + help: 'Remove all the items not currently selected from the change-list'; + target: target; + selector: #removeNonSelections. diff --git a/Tools.package/ChangeList.class/instance/changeListMenu..st b/Tools.package/ChangeList.class/instance/changeListMenu..st index 1d094cb860..ce3e7690f4 100644 --- a/Tools.package/ChangeList.class/instance/changeListMenu..st +++ b/Tools.package/ChangeList.class/instance/changeListMenu..st @@ -5,40 +5,6 @@ changeListMenu: aMenu aMenu addTitle: 'change list'. aMenu addStayUpItemSpecial. - aMenu addList: #( - - ('FileIn selections' fileInSelections 'Import the selected items into the image') - ('FileOut selections... ' fileOutSelections 'create a new file containing the selected items') - - - ('Compare to current' compareToCurrentVersion 'Open a separate window which shows the text differences between the on-file version and the in-image version.' ) - ('Toggle diffing (D)' toggleDiffing 'Start or stop showing diffs in the code pane.') - - - ('Select conflicts with any changeset' selectAllConflicts 'Select methods in the file which also occur in any change-set in the system') - ('Select conflicts with current changeset' selectConflicts 'Select methods in the file which also occur in the current change-set') - ('Select conflicts with...' selectConflictsWith 'Allows you to designate a file or change-set against which to check for code conflicts.') - - - ('Select unchanged definitions' selectUnchangedDefinitions 'Select class definitions, class comments and methods in the file whose in-image versions are the same as their in-file counterparts' ) - ('Select unchanged methods' selectUnchangedMethods 'Select methods in the file whose in-image versions are the same as their in-file counterparts' ) - ('Select new methods' selectNewMethods 'Select methods in the file that do not current occur in the image') - ('Select methods for this class' selectMethodsForThisClass 'Select all methods in the file that belong to the currently-selected class') - ('Select methods for classes in image' selectMethodsForExtantClasses 'Select all methods in the file that belong to a class that exists in the image') - ('Select changes with contents matching' selectContentsMatching 'Select all changes in the file whose text includes a pattern') - - - - ('Select all (a)' selectAll 'Select all the items in the list') - ('Deselect all' deselectAll 'Deselect all the items in the list') - ('Invert selections' invertSelections 'Select every item that is not currently selected, and deselect every item that *is* currently selected') - - - ('Browse all versions of single selection' browseVersions 'Open a version browser showing the versions of the currently selected method') - ('Browse all versions of selections' browseAllVersionsOfSelections 'Open a version browser showing all the versions of all the selected methods') - ('Browse current versions of selections' browseCurrentVersionsOfSelections 'Open a message-list browser showing the current (in-image) counterparts of the selected methods') - ('Destroy current methods of selections' destroyCurrentCodeOfSelections 'Remove (*destroy*) the in-image counterparts of all selected methods') - - - ('Remove doIts' removeDoIts 'Remove all items that are doIts rather than methods') - ('Remove older versions' removeOlderMethodVersions 'Remove all but the most recent versions of methods in the list') - ('Remove up-to-date versions' removeExistingMethodVersions 'Remove all items whose code is the same as the counterpart in-image code') - ('Remove selected items' removeSelections 'Remove the selected items from the change-list') - ('Remove unselected items' removeNonSelections 'Remove all the items not currently selected from the change-list')). - - ^ aMenu + aMenu addAllFromPragma:'changeListMenu' target: self. + ^aMenu \ No newline at end of file diff --git a/Tools.package/ChangeList.class/methodProperties.json b/Tools.package/ChangeList.class/methodProperties.json index bab8627b4b..41efd39d88 100644 --- a/Tools.package/ChangeList.class/methodProperties.json +++ b/Tools.package/ChangeList.class/methodProperties.json @@ -10,6 +10,7 @@ "browseRecentLogOn:startingFrom:" : "StephaneDucasse 5/28/2011 13:32", "browseRecentLogOnPath:" : "nb 6/17/2003 12:25", "browseStream:" : "sd 11/20/2005 21:28", + "changeListMenu:" : "EstebanLorenzano 1/31/2013 18:28", "fileReaderServicesForFile:suffix:" : "sd 11/20/2005 21:28", "initialize" : "GabrielOmarCotelli 6/4/2009 20:38", "open:name:multiSelect:" : "alain.plantec 5/30/2008 10:41", @@ -31,7 +32,7 @@ "changeList" : "", "changeListButtonSpecs" : "tbn 7/6/2010 16:46", "changeListKey:from:" : "StephaneDucasse 7/23/2010 22:00", - "changeListMenu:" : "tbn 7/29/2010 22:02", + "changeListMenu:" : "EstebanLorenzano 1/31/2013 19:25", "changes:file:" : "sd 11/20/2005 21:26", "compareToCurrentVersion" : "StephaneDucasse 11/6/2011 12:48", "contents" : "sw 9/5/2001 13:52", diff --git a/Tools.package/ClassCommentVersionsBrowser.class/class/classCommentVersionsListMenu..st b/Tools.package/ClassCommentVersionsBrowser.class/class/classCommentVersionsListMenu..st new file mode 100644 index 0000000000..337f9d4d7c --- /dev/null +++ b/Tools.package/ClassCommentVersionsBrowser.class/class/classCommentVersionsListMenu..st @@ -0,0 +1,40 @@ +menu +classCommentVersionsListMenu: aBuilder + + + + | target | + + target := aBuilder model. + + (aBuilder item: #'Compare to current') + help: 'Compare selected version to the current version'; + target: target; + selector: #compareToCurrentVersion. + + (aBuilder item: #'Revert to selected version') + help: 'Resubmit the selected version, so that it becomes the current version'; + target: target; + selector: #fileInSelections. + + (aBuilder item: #'Remove from changes') + help: 'Remove this method from the current change set, if present'; + target: target; + selector: #removeMethodFromChanges. + + (aBuilder item: #'Toggle diffing') + keyText: 'D'; + help: 'Toggle whether or not diffs should be shown here'; + target: target; + selector: #toggleDiffing. + + (aBuilder item: #'Update list') + help: 'Reformulate the list of versions, in case it somehow got out of synch with reality'; + target: target; + selector: #reformulateList. + + (aBuilder item: #'Help...') + help: 'Provide an explanation of the use of this tool'; + target: target; + selector: #offerVersionsHelp. + \ No newline at end of file diff --git a/Tools.package/ClassCommentVersionsBrowser.class/instance/versionsMenu..st b/Tools.package/ClassCommentVersionsBrowser.class/instance/versionsMenu..st index 6ac2108ce5..a45b1ccb37 100644 --- a/Tools.package/ClassCommentVersionsBrowser.class/instance/versionsMenu..st +++ b/Tools.package/ClassCommentVersionsBrowser.class/instance/versionsMenu..st @@ -4,13 +4,7 @@ versionsMenu: aMenu aMenu title: 'Versions'. aMenu addStayUpItemSpecial. - ^ aMenu addList: #( - ('Compare to current' compareToCurrentVersion 'Compare selected version to the current version') - ('Revert to selected version' fileInSelections 'Resubmit the selected version, so that it becomes the current version') - ('Remove from changes' removeMethodFromChanges 'Remove this method from the current change set, if present') - - - ('Toggle diffing (D)' toggleDiffing 'Toggle whether or not diffs should be shown here') - ('Update list' reformulateList 'Reformulate the list of versions, in case it somehow got out of synch with reality') - - - ('Help...' offerVersionsHelp 'Provide an explanation of the use of this tool')) + aMenu addAllFromPragma: 'classCommentVersionsListMenu' target: self. + + ^aMenu \ No newline at end of file diff --git a/Tools.package/ClassCommentVersionsBrowser.class/methodProperties.json b/Tools.package/ClassCommentVersionsBrowser.class/methodProperties.json index 2b7869c33a..12dbb0258b 100644 --- a/Tools.package/ClassCommentVersionsBrowser.class/methodProperties.json +++ b/Tools.package/ClassCommentVersionsBrowser.class/methodProperties.json @@ -1,6 +1,7 @@ { "class" : { "browseCommentOf:" : "nice 1/5/2010 15:59", + "classCommentVersionsListMenu:" : "EstebanLorenzano 1/31/2013 18:29", "commentRecordsOf:" : "sd 11/20/2005 21:28", "patchworkUIThemeColor" : "AlainPlantec 12/16/2009 22:08", "timeStampFor:class:reverseOrdinal:" : "sd 11/20/2005 21:28" }, @@ -16,5 +17,5 @@ "selectedClass" : "asm 8/13/2002 20:59", "shoutAboutToStyle:" : "BenjaminVanRyseghem 7/13/2012 14:14", "updateListsAndCodeIn:" : "sd 11/20/2005 21:26", - "versionsMenu:" : "StephaneDucasse 1/7/2011 17:51", + "versionsMenu:" : "EstebanLorenzano 1/31/2013 19:25", "wantsPrettyDiffOption" : "sw 8/15/2002 22:35" } } diff --git a/Tools.package/Debugger.class/class/menuCodePane..st b/Tools.package/Debugger.class/class/menuCodePane..st new file mode 100644 index 0000000000..a047ed811a --- /dev/null +++ b/Tools.package/Debugger.class/class/menuCodePane..st @@ -0,0 +1,14 @@ +menu +menuCodePane: aBuilder + + + + | target selectionInterval | + + target := aBuilder model first. + selectionInterval := aBuilder model second. + + (aBuilder item: #'Run to here' translated) + order: 0; "Place it on top" + action: [ target runToSelection: selectionInterval ]; + withSeparatorAfter. diff --git a/Tools.package/Debugger.class/class/menuStack..st b/Tools.package/Debugger.class/class/menuStack..st new file mode 100644 index 0000000000..fe1011b7c3 --- /dev/null +++ b/Tools.package/Debugger.class/class/menuStack..st @@ -0,0 +1,43 @@ +menu +menuStack: aBuilder + + + + (aBuilder item: #'Senders of...') + keyText: 'n'; + selector: #browseSendersOfMessages. + (aBuilder item: #'Implementors of...') + keyText: 'm'; + selector: #browseMessages. + (aBuilder item: #'Inheritance') + keyText: 'i'; + selector: #methodHierarchy. + (aBuilder item: #'Versions') + keyText: 'v'; + selector: #browseVersions. + (aBuilder item: #'Inst var refs...') + selector: #browseInstVarRefs. + (aBuilder item: #'Class var refs...') + selector: #browseClassVarRefs. + (aBuilder item: #'Class variables') + selector: #browseClassVariables; + withSeparatorAfter. + + (aBuilder item: #'Class refs') + keyText: 'N'; + selector: #browseClassRefs. + (aBuilder item: #'Browse full') + keyText: 'b'; + selector: #browseMethodFull. + (aBuilder item: #'File out') + selector: #fileOutMessage. + (aBuilder item: #'Inspect instances') + selector: #inspectInstances. + (aBuilder item: #'Inspect subinstances') + selector: #inspectSubInstances; + withSeparatorAfter. + + (aBuilder item: #'Copy to clipboard') + selector: #copyToClipboard. + (aBuilder item: #'File out Stack') + selector: #serializeStack. diff --git a/Tools.package/Debugger.class/class/menuStackAction..st b/Tools.package/Debugger.class/class/menuStackAction..st new file mode 100644 index 0000000000..b3129e6413 --- /dev/null +++ b/Tools.package/Debugger.class/class/menuStackAction..st @@ -0,0 +1,36 @@ +menu +menuStackAction: aBuilder + + + + (aBuilder item: #'FullStack') + keyText: 'f'; + selector: #fullStack. + (aBuilder item: #'Restart') + keyText: 'r'; + selector: #restart. + (aBuilder item: #'Proceed') + keyText: 'p'; + selector: #proceed. + (aBuilder item: #'Step') + keyText: 't'; + selector: #doStep. + (aBuilder item: #'Step through') + keyText: 'T'; + selector: #stepIntoBlock. + (aBuilder item: #'Send') + keyText: 'e'; + selector: #send. + (aBuilder item: #'Where') + keyText: 'w'; + selector: #where. + (aBuilder item: #'Peel to first like this') + selector: #peelToFirst; + withSeparatorAfter. + + (aBuilder item: #'Return entered value') + selector: #returnValue; + withSeparatorAfter. + + (aBuilder item: #'Toggle break on entry') + selector: #toggleBreakOnEntry. diff --git a/Tools.package/Debugger.class/class/menuStackImplement..st b/Tools.package/Debugger.class/class/menuStackImplement..st new file mode 100644 index 0000000000..0d5abc8ff2 --- /dev/null +++ b/Tools.package/Debugger.class/class/menuStackImplement..st @@ -0,0 +1,11 @@ +menu +menuStackImplement: aBuilder + + + + | target | + + target := aBuilder model. + + (aBuilder item: #'Implement in...') + action: [ target populateImplementInMenu: (UIManager default newMenuIn: target for: target) ]. \ No newline at end of file diff --git a/Tools.package/Debugger.class/class/menuStackPostMortemAction..st b/Tools.package/Debugger.class/class/menuStackPostMortemAction..st new file mode 100644 index 0000000000..1be4fbd028 --- /dev/null +++ b/Tools.package/Debugger.class/class/menuStackPostMortemAction..st @@ -0,0 +1,11 @@ +menu +menuStackPostMortemAction: aBuilder + + + + (aBuilder item: #'FullStack') + keyText: 'f'; + selector: #fullStack. + (aBuilder item: #'Where') + keyText: 'w'; + selector: #where. diff --git a/Tools.package/Debugger.class/class/menuStackProceed..st b/Tools.package/Debugger.class/class/menuStackProceed..st new file mode 100644 index 0000000000..9e9b6f6427 --- /dev/null +++ b/Tools.package/Debugger.class/class/menuStackProceed..st @@ -0,0 +1,13 @@ +menu +menuStackProceed: aBuilder + + + + | target | + + target := aBuilder model. + + (aBuilder item: #'Proceed' translated) + selector: #proceed. + (aBuilder item: #'Debug' translated) + selector: #debug. diff --git a/Tools.package/Debugger.class/instance/codePaneMenu.shifted..st b/Tools.package/Debugger.class/instance/codePaneMenu.shifted..st index cd40e72704..d0793b935e 100644 --- a/Tools.package/Debugger.class/instance/codePaneMenu.shifted..st +++ b/Tools.package/Debugger.class/instance/codePaneMenu.shifted..st @@ -1,6 +1,6 @@ code pane menu codePaneMenu: aMenu shifted: shifted - aMenu add: 'run to here' target: self selector: #runToSelection: argument: thisContext sender receiver selectionInterval. - aMenu addLine. - super codePaneMenu: aMenu shifted: shifted. - ^aMenu. \ No newline at end of file + aMenu + addAllFromPragma: 'debuggerCodePaneMenu' + target: {self. thisContext sender receiver selectionInterval}. + ^super codePaneMenu: aMenu shifted: shifted. diff --git a/Tools.package/Debugger.class/instance/contextStackMenu..st b/Tools.package/Debugger.class/instance/contextStackMenu..st index 31007191e5..80a6b6e0ef 100644 --- a/Tools.package/Debugger.class/instance/contextStackMenu..st +++ b/Tools.package/Debugger.class/instance/contextStackMenu..st @@ -7,20 +7,4 @@ contextStackMenu: aMenu ifTrue: [ self postMortemStackActionMenu: aMenu] ifFalse: [ self stackActionMenu: aMenu ]. - ^aMenu addList: #( - ('Senders of... (n)' browseSendersOfMessages) - ('Implementors of... (m)' browseMessages) - ('Inheritance (i)' methodHierarchy) - ('Versions (v)' browseVersions) - ('Inst var refs...' browseInstVarRefs) - ('Class var refs...' browseClassVarRefs) - ('Class variables' browseClassVariables) - - - ('Class refs (N)' browseClassRefs) - ('Browse full (b)' browseMethodFull) - ('File out' fileOutMessage) - ('Inspect instances' inspectInstances) - ('Inspect subinstances' inspectSubInstances) - - - ('Copy to clipboard' copyToClipboard) - ('File out Stack' serializeStack)). \ No newline at end of file + ^aMenu addAllFromPragma: 'debuggerStackMenu' target: self. \ No newline at end of file diff --git a/Tools.package/Debugger.class/instance/debugProceedMenu..st b/Tools.package/Debugger.class/instance/debugProceedMenu..st index 5339112ff9..698fb292f1 100644 --- a/Tools.package/Debugger.class/instance/debugProceedMenu..st +++ b/Tools.package/Debugger.class/instance/debugProceedMenu..st @@ -1,6 +1,3 @@ context stack menu debugProceedMenu: aMenu - ^aMenu addList: { - {'Proceed' translated. #proceed}. - {'Debug' translated. #debug}} - \ No newline at end of file + ^aMenu addAllFromPragma: 'debuggerStackProceedMenu' target: self. \ No newline at end of file diff --git a/Tools.package/Debugger.class/instance/implementStackMenu..st b/Tools.package/Debugger.class/instance/implementStackMenu..st index 2326a03c94..666e320033 100644 --- a/Tools.package/Debugger.class/instance/implementStackMenu..st +++ b/Tools.package/Debugger.class/instance/implementStackMenu..st @@ -1,9 +1,3 @@ context stack menu implementStackMenu: aMenu - ^ aMenu - add: 'Implement in...' - subMenu: (self populateImplementInMenu: (UIManager default newMenuIn: self for: self)) - target: nil - selector: nil - argumentList: #(nil). - \ No newline at end of file + ^ aMenu addAllFromPragma: 'debuggerStackImplementMenu' target: self. \ No newline at end of file diff --git a/Tools.package/Debugger.class/instance/postMortemStackActionMenu..st b/Tools.package/Debugger.class/instance/postMortemStackActionMenu..st index aca4e2ff9c..97987596d2 100644 --- a/Tools.package/Debugger.class/instance/postMortemStackActionMenu..st +++ b/Tools.package/Debugger.class/instance/postMortemStackActionMenu..st @@ -1,6 +1,3 @@ context stack menu postMortemStackActionMenu: aMenu - - ^ aMenu addList: #( - ('FullStack (f)' fullStack) - ('Where (w)' where)). + ^ aMenu addAllFromPragma: 'debuggerStackPostMortemActionMenu' target: self \ No newline at end of file diff --git a/Tools.package/Debugger.class/instance/stackActionMenu..st b/Tools.package/Debugger.class/instance/stackActionMenu..st index 5a4786459e..45cec44699 100644 --- a/Tools.package/Debugger.class/instance/stackActionMenu..st +++ b/Tools.package/Debugger.class/instance/stackActionMenu..st @@ -1,16 +1,4 @@ context stack menu stackActionMenu: aMenu - ^ aMenu addList: #( - ('FullStack (f)' fullStack) - ('Restart (r)' restart) - ('Proceed (p)' proceed) - ('Step (t)' doStep) - ('Step through (T)' stepIntoBlock) - ('Send (e)' send) - ('Where (w)' where) - ('Peel to first like this' peelToFirst) - - - ('Return entered value' returnValue) - - - ('Toggle break on entry' toggleBreakOnEntry)). + ^ aMenu addAllFromPragma: 'debuggerStackActionMenu' target: self \ No newline at end of file diff --git a/Tools.package/Debugger.class/methodProperties.json b/Tools.package/Debugger.class/methodProperties.json index 2fa06c2979..a045e52efb 100644 --- a/Tools.package/Debugger.class/methodProperties.json +++ b/Tools.package/Debugger.class/methodProperties.json @@ -15,6 +15,12 @@ "logDebuggerStackToFile:" : "AlainPlantec 12/6/2009 21:57", "logFileName" : "IgorStasenko 1/21/2011 17:16", "logFileName:" : "IgorStasenko 1/21/2011 17:17", + "menuCodePane:" : "EstebanLorenzano 1/31/2013 18:30", + "menuStack:" : "EstebanLorenzano 1/31/2013 18:30", + "menuStackAction:" : "EstebanLorenzano 1/31/2013 18:31", + "menuStackImplement:" : "EstebanLorenzano 1/31/2013 18:31", + "menuStackPostMortemAction:" : "EstebanLorenzano 1/31/2013 18:31", + "menuStackProceed:" : "EstebanLorenzano 1/31/2013 18:30", "openContext:label:contents:" : "IgorStasenko 3/6/2011 18:39", "openInterrupt:onProcess:" : "EstebanLorenzano 8/17/2012 16:40", "openOn:context:label:contents:fullView:" : "CamilloBruni 9/21/2012 13:53", @@ -44,7 +50,7 @@ "checkContextSelection" : "yo 8/12/2003 16:34", "close" : "CamilloBruni 9/21/2012 14:29", "close:" : "", - "codePaneMenu:shifted:" : "nk 8/6/2003 13:52", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:25", "contents" : "EstebanLorenzano 6/7/2012 17:28", "contents:notifying:" : "CamilloBruni 4/27/2012 10:47", "contentsSelection" : "tk 4/15/1998 18:31", @@ -53,7 +59,7 @@ "contextStackKey:from:" : "sd 11/20/2005 21:27", "contextStackList" : "", "contextStackListWithMultiColumn" : "CamilloBruni 10/20/2012 23:26", - "contextStackMenu:" : "MarcusDenker 10/6/2012 14:28", + "contextStackMenu:" : "EstebanLorenzano 1/31/2013 19:25", "contextVariablesInspector" : "", "copyToClipboard" : "CamilloBruni 10/5/2012 17:21", "createColumnsFor:" : "BenjaminVanRyseghem 11/21/2011 17:35", @@ -62,7 +68,7 @@ "customButtonSpecs" : "CamilloBruni 2/13/2012 19:42", "debug" : "alain.plantec 5/30/2008 11:43", "debugAt:" : "kfr 10/4/2000 22:13", - "debugProceedMenu:" : "MarcusDenker 10/7/2012 11:40", + "debugProceedMenu:" : "EstebanLorenzano 1/31/2013 19:25", "delete" : "CamilloBruni 9/21/2012 14:34", "doItContext" : "", "doItReceiver" : "", @@ -76,7 +82,7 @@ "fullyExpandStack" : "sd 5/15/2010 23:01", "getTextMorph" : "ab 3/23/2005 16:43", "implement:inClass:" : "HernanWilkinson 10/13/2010 10:49", - "implementStackMenu:" : "CamilloBruni 2/13/2012 19:50", + "implementStackMenu:" : "EstebanLorenzano 1/31/2013 19:25", "initialExtent" : "AlainPlantec 1/5/2012 22:40", "interruptedContext" : "", "interruptedProcess" : "StephaneDucasse 2/6/2011 21:52", @@ -103,7 +109,7 @@ "populateImplementInMenu:" : "sd 11/20/2005 21:27", "postMortemCustomeButtonSpecs" : "CamilloBruni 2/13/2012 19:43", "postMortemPreDebugButtonQuads" : "CamilloBruni 2/13/2012 19:44", - "postMortemStackActionMenu:" : "MarcusDenker 10/6/2012 14:30", + "postMortemStackActionMenu:" : "EstebanLorenzano 1/31/2013 19:25", "preDebugButtonQuads" : "CamilloBruni 2/13/2012 22:34", "preDebugNotifierContentsFrom:" : "stephane.ducasse 10/26/2008 15:33", "prepareTestToRunAgain" : "HernanWilkinson 9/30/2010 13:57", @@ -129,7 +135,7 @@ "send" : "CamilloBruni 2/13/2012 20:00", "serializeStack" : "CamilloBruni 10/5/2012 17:43", "shouldDisplayContext:" : "CamilloBruni 4/27/2012 15:20", - "stackActionMenu:" : "MarcusDenker 10/6/2012 14:35", + "stackActionMenu:" : "EstebanLorenzano 1/31/2013 19:25", "step" : "CamilloBruni 2/13/2012 22:33", "stepIntoBlock" : "CamilloBruni 2/13/2012 20:00", "storeLog" : "IgorStasenko 1/21/2011 19:03", diff --git a/Tools.package/DialogItemsChooserUI.class/instance/msgPaneMenu.shifted..st b/Tools.package/DialogItemsChooserUI.class/instance/msgPaneMenu.shifted..st index 1f7694e603..452bcab5c0 100644 --- a/Tools.package/DialogItemsChooserUI.class/instance/msgPaneMenu.shifted..st +++ b/Tools.package/DialogItemsChooserUI.class/instance/msgPaneMenu.shifted..st @@ -1,26 +1,8 @@ private msgPaneMenu: aMenu shifted: shifted - ^aMenu addList: #( - ('find...(f)' find) - ('find again (g)' findAgain) - ('set search string (h)' setSearchString) - - - ('do again (j)' again) - ('undo (z)' undo) - - - ('copy (c)' copySelection) - ('cut (x)' cut) - ('paste (v)' paste) - ('paste...' pasteRecent) - - - ('do it (d)' doIt) - ('print it (p)' printIt) - ('inspect it (i)' inspectIt) - ('explore it (I)' exploreIt) - ('debug it' debugIt) - - - ('accept (s)' accept) - ('cancel (l)' cancel) - ('implementors (m)' implementorsOfIt) - ('methods containing (E)' methodSourceContainingIt) - ('senders (n)' sendersOfIt)) \ No newline at end of file + | donorMenu | + + donorMenu := shifted + ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] + ifFalse: [SmalltalkEditor yellowButtonMenu]. + ^ aMenu addAllFrom: donorMenu \ No newline at end of file diff --git a/Tools.package/DialogItemsChooserUI.class/methodProperties.json b/Tools.package/DialogItemsChooserUI.class/methodProperties.json index 739198d1d0..a5bbbc3901 100644 --- a/Tools.package/DialogItemsChooserUI.class/methodProperties.json +++ b/Tools.package/DialogItemsChooserUI.class/methodProperties.json @@ -44,7 +44,7 @@ "hasUnselectedSelections" : "GaryChambers 2/11/2011 13:58", "initialize" : "BenjaminVanRyseghem 12/2/2010 18:14", "isResizeable" : "bvr 9/19/2010 19:32", - "msgPaneMenu:shifted:" : "MarcusDenker 10/7/2012 11:29", + "msgPaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "newContentMorph" : "GaryChambers 2/11/2011 13:52", "okButtonAction" : "BenjaminVanRyseghem 8/30/2010 3:44", "okButtonLabel" : "BenjaminVanRyseghem 8/30/2010 3:44", diff --git a/Tools.package/DictionaryInspector.class/class/menuDictionaryFieldList..st b/Tools.package/DictionaryInspector.class/class/menuDictionaryFieldList..st new file mode 100644 index 0000000000..713b0025a2 --- /dev/null +++ b/Tools.package/DictionaryInspector.class/class/menuDictionaryFieldList..st @@ -0,0 +1,25 @@ +menu +menuDictionaryFieldList: aBuilder + + + + (aBuilder item: #'Inspect') + selector: #inspectSelection. + (aBuilder item: #'Copy name') + selector: #copyName. + (aBuilder item: #'References') + selector: #selectionReferences. + (aBuilder item: #'Senders of this key') + selector: #sendersOfSelectedKey. + (aBuilder item: #'Refresh view') + selector: #refreshView. + (aBuilder item: #'Add key') + selector: #addEntry; + withSeparatorAfter. + + (aBuilder item: #'Rename key') + selector: #renameEntry. + (aBuilder item: #'Remove') + selector: #removeSelection. + (aBuilder item: #'Basic inspect') + selector: #inspectBasic. diff --git a/Tools.package/DictionaryInspector.class/class/registerToolsOn..st b/Tools.package/DictionaryInspector.class/class/registerToolsOn..st index 987445f51b..2e761ac749 100644 --- a/Tools.package/DictionaryInspector.class/class/registerToolsOn..st +++ b/Tools.package/DictionaryInspector.class/class/registerToolsOn..st @@ -1,4 +1,4 @@ -as yet unclassified +tools registry registerToolsOn: registry "Register ourselves as inspector for Dictionary (and its subclasses)" diff --git a/Tools.package/DictionaryInspector.class/instance/fieldListMenu..st b/Tools.package/DictionaryInspector.class/instance/fieldListMenu..st index 15e268c2fc..cae9ab34dd 100644 --- a/Tools.package/DictionaryInspector.class/instance/fieldListMenu..st +++ b/Tools.package/DictionaryInspector.class/instance/fieldListMenu..st @@ -1,15 +1,3 @@ menu fieldListMenu: aMenu - - ^ aMenu addList: #( - ('inspect' inspectSelection) - ('copy name' copyName) - ('references' selectionReferences) - ('senders of this key' sendersOfSelectedKey) - ('refresh view' refreshView) - ('add key' addEntry) - - - ('rename key' renameEntry) - ('remove' removeSelection) - ('basic inspect' inspectBasic)). - \ No newline at end of file + ^aMenu addAllFromPragma: 'dictionaryInspectorFieldListMenu' target: self. \ No newline at end of file diff --git a/Tools.package/DictionaryInspector.class/methodProperties.json b/Tools.package/DictionaryInspector.class/methodProperties.json index 2d1bde9586..b6a42241b5 100644 --- a/Tools.package/DictionaryInspector.class/methodProperties.json +++ b/Tools.package/DictionaryInspector.class/methodProperties.json @@ -1,5 +1,6 @@ { "class" : { + "menuDictionaryFieldList:" : "EstebanLorenzano 1/31/2013 18:32", "registerToolsOn:" : "IgorStasenko 2/20/2011 15:12" }, "instance" : { "addEntry" : "jb 7/1/2011 10:51", @@ -8,7 +9,7 @@ "contentsIsString" : "di 9/22/1998 21:25", "copyName" : "apb 8/20/2004 21:19", "fieldList" : "apb 8/20/2004 23:06", - "fieldListMenu:" : "MarcusDenker 10/6/2012 14:22", + "fieldListMenu:" : "EstebanLorenzano 1/31/2013 19:25", "initialize" : "PHK 7/21/2004 18:00", "refreshView" : "sd 11/20/2005 21:27", "removeSelection" : "sd 11/20/2005 21:27", diff --git a/Tools.package/FileList.class/class/contentMenu..st b/Tools.package/FileList.class/class/contentMenu..st new file mode 100644 index 0000000000..e2ec73b68f --- /dev/null +++ b/Tools.package/FileList.class/class/contentMenu..st @@ -0,0 +1,74 @@ +menu +contentMenu: aBuilder + + + + (aBuilder item: #'Find...' translated) + keyText: 'f'; + selector: #find; + icon: UITheme current smallFindIcon. + (aBuilder item: #'Find again' translated) + keyText: 'g'; + selector: #findAgain; + icon: UITheme current smallFindIcon. + (aBuilder item: #'Set search string' translated) + keyText: 'h'; + selector: #setSearchString; + withSeparatorAfter. + + (aBuilder item: #'Do again' translated) + keyText: 'j'; + selector: #again; + icon: UITheme current smallRedoIcon. + (aBuilder item: #'Undo' translated) + keyText: 'z'; + selector: #undo; + icon: UITheme current smallUndoIcon; + withSeparatorAfter. + + (aBuilder item: #'Copy' translated) + keyText: 'c'; + selector: #copySelection; + icon: UITheme current smallCopyIcon. + (aBuilder item: #'Cut' translated) + keyText: 'x'; + selector: #cut; + icon: UITheme current smallCutIcon. + (aBuilder item: #'Paste' translated) + keyText: 'v'; + selector: #paste; + icon: UITheme current smallPasteIcon. + (aBuilder item: #'Paste...' translated) + selector: #pasteRecent; + icon: UITheme current smallPasteIcon; + withSeparatorAfter . + + (aBuilder item: #'Do it' translated) + keyText: 'd'; + selector: #doIt; + icon: UITheme current smallDoItIcon. + (aBuilder item: #'Print it' translated) + keyText: 'p'; + selector: #printIt; + icon: UITheme current smallPrintItIcon. + (aBuilder item: #'Inspect it' translated) + keyText: 'i'; + selector: #inspectIt; + icon: UITheme current smallInspectItIcon. + (aBuilder item: #'FileIn selection' translated) + keyText: 'G'; + selector: #fileItIn; + withSeparatorAfter. + + (aBuilder item: #'Accept' translated) + keyText: 's'; + selector: #accept; + icon: UITheme current smallOkIcon. + (aBuilder item: #'Cancel' translated) + keyText: 'l'; + selector: #cancel; + icon: UITheme current smallCancelIcon; + withSeparatorAfter. + + (aBuilder item: #'More...' translated) + selector: #shiftedYellowButtonActivity. diff --git a/Tools.package/FileList.class/instance/fileContentsMenu.shifted..st b/Tools.package/FileList.class/instance/fileContentsMenu.shifted..st index a6ee9c7de8..46974d03ae 100644 --- a/Tools.package/FileList.class/instance/fileContentsMenu.shifted..st +++ b/Tools.package/FileList.class/instance/fileContentsMenu.shifted..st @@ -28,28 +28,6 @@ fileContentsMenu: aMenu shifted: shifted for: self reference extraLines: extraLines]. - aMenu addList: { - {'Find...(f)' translated. #find. nil. #smallFindIcon}. - {'Find again (g)' translated. #findAgain. nil. #smallFindIcon}. - {'Set search string (h)' translated. #setSearchString}. - #-. - {'Do again (j)' translated. #again. nil. #smallRedoIcon}. - {'Undo (z)' translated. #undo. nil. #smallUndoIcon}. - #-. - {'Copy (c)' translated. #copySelection. nil. #smallCopyIcon}. - {'Cut (x)' translated. #cut. nil. #smallCutIcon}. - {'Paste (v)' translated. #paste. nil. #smallPasteIcon}. - {'Paste...' translated. #pasteRecent. nil. #smallPasteIcon}. - #-. - {'Do it (d)' translated. #doIt. nil. #smallDoItIcon}. - {'Print it (p)' translated. #printIt. nil. #smallPrintItIcon}. - {'Inspect it (i)' translated. #inspectIt. nil. #smallInspectItIcon}. - {'FileIn selection (G)' translated. #fileItIn}. - #-. - {'Accept (s)' translated. #accept. nil. #smallOkIcon}. - {'Cancel (l)' translated. #cancel. nil. #smallCancelIcon}. - #-. - {'More...' translated. #shiftedYellowButtonActivity}}. - + aMenu addAllFromPragma: 'fileListContentMenu' target: self. ^ aMenu diff --git a/Tools.package/FileList.class/methodProperties.json b/Tools.package/FileList.class/methodProperties.json index 6e50138572..6831dd70b9 100644 --- a/Tools.package/FileList.class/methodProperties.json +++ b/Tools.package/FileList.class/methodProperties.json @@ -2,6 +2,7 @@ "class" : { "addFullPanesTo:from:" : "StephaneDucasse 12/19/2012 16:36", "allRegisteredServices" : "hfm 11/29/2008 19:35", + "contentMenu:" : "EstebanLorenzano 2/1/2013 11:24", "initialize" : "MarcusDenker 12/12/2009 07:36", "isReaderNamedRegistered:" : "hfm 11/29/2008 19:36", "itemsForDirectory:" : "hfm 11/29/2008 18:58", @@ -51,7 +52,7 @@ "dragTransferTypeForMorph:" : "hfm 11/29/2008 19:21", "dropDestinationDirectory:event:" : "nk 6/15/2003 13:07", "dynamicButtonServices" : "tbn 6/29/2012 10:58", - "fileContentsMenu:shifted:" : "EstebanLorenzano 4/26/2012 14:26", + "fileContentsMenu:shifted:" : "EstebanLorenzano 2/1/2013 11:24", "fileEncoding:" : "AlexisParseghian 3/25/2012 23:26", "fileList" : "hfm 11/29/2008 18:30", "fileListIndex" : "CamilloBruni 2/14/2012 15:00", diff --git a/Tools.package/FinderUI.class/instance/msgPaneMenu.shifted..st b/Tools.package/FinderUI.class/instance/msgPaneMenu.shifted..st index 1f7694e603..452bcab5c0 100644 --- a/Tools.package/FinderUI.class/instance/msgPaneMenu.shifted..st +++ b/Tools.package/FinderUI.class/instance/msgPaneMenu.shifted..st @@ -1,26 +1,8 @@ private msgPaneMenu: aMenu shifted: shifted - ^aMenu addList: #( - ('find...(f)' find) - ('find again (g)' findAgain) - ('set search string (h)' setSearchString) - - - ('do again (j)' again) - ('undo (z)' undo) - - - ('copy (c)' copySelection) - ('cut (x)' cut) - ('paste (v)' paste) - ('paste...' pasteRecent) - - - ('do it (d)' doIt) - ('print it (p)' printIt) - ('inspect it (i)' inspectIt) - ('explore it (I)' exploreIt) - ('debug it' debugIt) - - - ('accept (s)' accept) - ('cancel (l)' cancel) - ('implementors (m)' implementorsOfIt) - ('methods containing (E)' methodSourceContainingIt) - ('senders (n)' sendersOfIt)) \ No newline at end of file + | donorMenu | + + donorMenu := shifted + ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] + ifFalse: [SmalltalkEditor yellowButtonMenu]. + ^ aMenu addAllFrom: donorMenu \ No newline at end of file diff --git a/Tools.package/FinderUI.class/methodProperties.json b/Tools.package/FinderUI.class/methodProperties.json index f2e44ba715..8906e7bdc9 100644 --- a/Tools.package/FinderUI.class/methodProperties.json +++ b/Tools.package/FinderUI.class/methodProperties.json @@ -86,7 +86,7 @@ "keyStroke:" : "StephaneDucasse 3/12/2011 15:07", "labelFont" : "BenjaminVanRyseghem 8/30/2010 3:44", "menu:shifted:" : "BenjaminVanRyseghem 2/26/2011 12:53", - "msgPaneMenu:shifted:" : "MarcusDenker 10/7/2012 11:40", + "msgPaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "open" : "AlainPlantec 2/13/2011 22:03", "openPackageChooser" : "BernardoContreras 12/15/2011 17:55", "packagesSelection" : "BenjaminVanRyseghem 9/16/2010 21:09", diff --git a/Tools.package/Inspector.class/class/menuFieldList..st b/Tools.package/Inspector.class/class/menuFieldList..st new file mode 100644 index 0000000000..bc45bab419 --- /dev/null +++ b/Tools.package/Inspector.class/class/menuFieldList..st @@ -0,0 +1,69 @@ +menu +menuFieldList: aBuilder + + + + | target selection | + + target := aBuilder model. + selection := target selection. + + (aBuilder item: #'Inspect') + keyText: 'i'; + selector: #inspectSelection; + icon: UITheme current smallInspectItIcon. + (aBuilder item: #'Explore') + keyText: 'I'; + selector: #exploreSelection; + icon: UITheme current smallInspectItIcon. + + (((selection isMemberOf: Array) or: [selection isMemberOf: + OrderedCollection]) and: [ selection size > 0]) + ifTrue: [ + (aBuilder item: #'Inspect element...') + selector: #inspectElement ]. + + (selection isKindOf: MorphExtension) + ifTrue: [ + (aBuilder item: #'Inspect property...') + selector: #inspectElement ]. + + aBuilder withSeparatorAfter. + (aBuilder item: #'Method refs to this inst var') + selector: #referencesToSelection. + (aBuilder item: #'Methods storing into this inst var') + selector: #defsOfSelection. + (aBuilder item: #'Explore pointers') + selector: #explorePointers. + (aBuilder item: #'Explore strong pointers') + selector: #exploreStrongPointers; + withSeparatorAfter. + + (aBuilder item: #'Browse full') + keyText: 'b'; + selector: #browseMethodFull. + (aBuilder item: #'Browse class') + selector: #browseClass. + (aBuilder item: #'Browse hierarchy') + keyText: 'h'; + selector: #classHierarchy; + withSeparatorAfter. + + (aBuilder item: #'Inst var refs...') + selector: #browseInstVarRefs. + (aBuilder item: #'Inst var defs...') + selector: #browseInstVarDefs. + (aBuilder item: #'Class var refs...') + selector: #classVarRefs. + (aBuilder item: #'Class variables') + selector: #browseClassVariables. + (aBuilder item: #'Class refs') + keyText: 'N'; + selector: #browseClassRefs; + withSeparatorAfter. + + (aBuilder item: #'Copy name') + keyText: 'c'; + selector: #copyName. + (aBuilder item: #'Basic inspect') + selector: #inspectBasic. diff --git a/Tools.package/Inspector.class/instance/addCollectionItemsTo..st b/Tools.package/Inspector.class/instance/addCollectionItemsTo..st deleted file mode 100644 index a2fc2292c1..0000000000 --- a/Tools.package/Inspector.class/instance/addCollectionItemsTo..st +++ /dev/null @@ -1,13 +0,0 @@ -menu commands -addCollectionItemsTo: aMenu - "If the current selection is an appropriate collection, add items to aMenu that cater to that kind of selection" - - | sel | - ((((sel := self selection) isMemberOf: Array) or: [sel isMemberOf: OrderedCollection]) and: - [sel size > 0]) ifTrue: [ - aMenu addList: #( - ('Inspect element...' inspectElement))]. - - (sel isKindOf: MorphExtension) ifTrue: [ - aMenu addList: #( - ('Inspect property...' inspectElement))]. \ No newline at end of file diff --git a/Tools.package/Inspector.class/instance/codePaneMenu.shifted..st b/Tools.package/Inspector.class/instance/codePaneMenu.shifted..st index bf719a4423..82c54b1748 100644 --- a/Tools.package/Inspector.class/instance/codePaneMenu.shifted..st +++ b/Tools.package/Inspector.class/instance/codePaneMenu.shifted..st @@ -5,6 +5,6 @@ codePaneMenu: aMenu shifted: shifted text pane" | donorMenu | donorMenu := shifted - ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] - ifFalse: [SmalltalkEditor yellowButtonMenu]. + ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] + ifFalse: [SmalltalkEditor yellowButtonMenu]. ^ aMenu addAllFrom: donorMenu \ No newline at end of file diff --git a/Tools.package/Inspector.class/instance/fieldListMenu..st b/Tools.package/Inspector.class/instance/fieldListMenu..st index 2c1f216345..51e6bde75b 100644 --- a/Tools.package/Inspector.class/instance/fieldListMenu..st +++ b/Tools.package/Inspector.class/instance/fieldListMenu..st @@ -3,34 +3,4 @@ fieldListMenu: aMenu "Arm the supplied menu with items for the field-list of the receiver" aMenu addStayUpItemSpecial. - - aMenu addList: #( - ('Inspect (i)' inspectSelection nil #smallInspectItIcon) - ('Explore (I)' exploreSelection nil #smallInspectItIcon)). - - self addCollectionItemsTo: aMenu. - - aMenu addList: #( - - - ('Method refs to this inst var' referencesToSelection) - ('Methods storing into this inst var' defsOfSelection) - ('Explore pointers' explorePointers) - ('Explore strong pointers' exploreStrongPointers) - - - - ('Browse full (b)' browseMethodFull) - ('Browse class' browseClass) - ('Browse hierarchy (h)' classHierarchy) - - - ('Inst var refs...' browseInstVarRefs) - ('Inst var defs...' browseInstVarDefs) - ('Class var refs...' classVarRefs) - ('Class variables' browseClassVariables) - ('Class refs (N)' browseClassRefs) - - - ('Copy name (c)' copyName) - ('Basic inspect' inspectBasic) - ). - ^ aMenu - - + ^aMenu addAllFromPragma: 'inspectorFieldListMenu' target: self. diff --git a/Tools.package/Inspector.class/methodProperties.json b/Tools.package/Inspector.class/methodProperties.json index 2c28f4dbdf..42e8c18f34 100644 --- a/Tools.package/Inspector.class/methodProperties.json +++ b/Tools.package/Inspector.class/methodProperties.json @@ -2,6 +2,7 @@ "class" : { "horizontalDividerProportion" : "al 9/21/2008 19:41", "inspect:" : "PHK 7/22/2004 17:04", + "menuFieldList:" : "EstebanLorenzano 1/31/2013 18:32", "openAsMorphOn:withEvalPane:withLabel:valueViewClass:" : "BenjaminVanRyseghem 10/25/2012 15:30", "openAsMorphOn:withLabel:" : "MarcusDenker 11/2/2012 15:08", "openOn:" : "ar 9/27/2005 18:30", @@ -11,7 +12,6 @@ "verticalDividerProportion" : "sw 1/19/1999 14:38" }, "instance" : { "accept:" : "damiencassou 5/30/2008 16:29", - "addCollectionItemsTo:" : "tbn 7/29/2010 22:07", "baseFieldList" : "", "browseClass" : "BenjaminVanRyseghem 2/8/2012 17:08", "browseClassRefs" : "DiegoFernandez 6/9/2011 19:32", @@ -22,7 +22,7 @@ "classHierarchy" : "DiegoFernandez 6/9/2011 19:07", "classOfSelection" : "tk 4/10/1998 17:53", "classVarRefs" : "sd 11/20/2005 21:27", - "codePaneMenu:shifted:" : "IgorStasenko 2/17/2011 16:03", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "contents" : "GuillermoPolito 8/12/2010 14:52", "contentsIsString" : "di 9/22/1998 21:24", "contentsSelection" : "GuillermoPolito 8/12/2010 14:52", @@ -34,7 +34,7 @@ "exploreSelection" : "sw 9/21/1999 12:16", "exploreStrongPointers" : "IgorStasenko 9/2/2012 17:03", "fieldList" : "", - "fieldListMenu:" : "IgorStasenko 9/2/2012 17:03", + "fieldListMenu:" : "EstebanLorenzano 1/31/2013 19:25", "i1" : "", "i2" : "", "initialExtent" : "al 9/21/2008 19:40", diff --git a/Tools.package/ProcessBrowser.class/class/menuProcessList..st b/Tools.package/ProcessBrowser.class/class/menuProcessList..st new file mode 100644 index 0000000000..bee6b70f4a --- /dev/null +++ b/Tools.package/ProcessBrowser.class/class/menuProcessList..st @@ -0,0 +1,97 @@ +menu +menuProcessList: aBuilder + + + + | target selectedProcess | + + target := aBuilder model. + selectedProcess := target selectedProcess. + + selectedProcess + ifNotNil: [ + | nameAndRules | + nameAndRules := target nameAndRulesForSelectedProcess. + (aBuilder item: #'Inspect') + keyText: 'i'; + selector: #inspectProcess. + (aBuilder item: #'Explore') + keyText: 'I'; + selector: #exploreProcess. + (aBuilder item: #'Inspect Pointers') + keyText: 'P'; + selector: #inspectPointers. + (Smalltalk globals includesKey: #PointerExplorer) + ifTrue: [ + (aBuilder item: #'Explore pointers') + keyText: 'e'; + selector: #explorePointers ]. + + nameAndRules second + ifTrue: [ + (aBuilder item: #'Terminate') + keyText: 't'; + selector: #terminateProcess. + + selectedProcess isSuspended + ifTrue: [ + (aBuilder item: #'Resume') + keyText: 'r'; + selector: #resumeProcess ] + ifFalse: [ + (aBuilder item: #'Suspend') + keyText: 's'; + selector: #suspendProcess ] ]. + + nameAndRules third + ifTrue: [ + (aBuilder item: #'Change priority') + keyText: 'p'; + selector: #changePriority. + (aBuilder item: #'Debug') + keyText: 'd'; + selector: #debugProcess ]. + + (aBuilder item: #'Profile messages') + keyText: 'm'; + selector: #messageTally. + + (selectedProcess suspendingList isKindOf: Semaphore) + ifTrue: [ + (aBuilder item: #'Signal Semaphore') + keyText: 'S'; + selector: #signalSemaphore ]. + + (aBuilder item: #'Full stack') + keyText: 'k'; + selector: #moreStack; + withSeparatorAfter ]. + + (aBuilder item: #'Find context...') + keyText: 'f'; + selector: #findContext. + (aBuilder item: #'Find again') + keyText: 'g'; + selector: #nextContext; + withSeparatorAfter. + + (aBuilder item: (target isAutoUpdating + ifTrue: [ #'Turn off auto-update' ] + ifFalse: [ #'Turn on auto-update' ])) + keyText: 'a'; + selector: #toggleAutoUpdate. + (aBuilder item: #'Update list') + keyText: 'u'; + selector: #updateProcessList. + + Smalltalk globals + at: #CPUWatcher + ifPresent: [ :pw | + aBuilder withSeparatorAfter. + pw isMonitoring + ifTrue: [ + (aBuilder item: #'Stop CPUWatcher') + selector: #stopCPUWatcher ] + ifFalse: [ + (aBuilder item: #'Start CPUWatcher') + selector: #startCPUWatcher ] ]. \ No newline at end of file diff --git a/Tools.package/ProcessBrowser.class/class/menuStackList..st b/Tools.package/ProcessBrowser.class/class/menuStackList..st new file mode 100644 index 0000000000..c34d0c83ec --- /dev/null +++ b/Tools.package/ProcessBrowser.class/class/menuStackList..st @@ -0,0 +1,24 @@ +menu +menuStackList: aBuilder + + + + (aBuilder item: #'Inspect context') + keyText: 'c'; + selector: #inspectContext. + (aBuilder item: #'Explore context') + keyText: 'C'; + selector: #exploreContext; + withSeparatorAfter. + + (aBuilder item: #'Inspect receiver') + keyText: 'i'; + selector: #inspectReceiver. + (aBuilder item: #'Explore receiver') + keyText: 'I'; + selector: #exploreReceiver; + withSeparatorAfter. + + (aBuilder item: #'Browse') + keyText: 'b'; + selector: #browseContext. \ No newline at end of file diff --git a/Tools.package/ProcessBrowser.class/instance/processListMenu..st b/Tools.package/ProcessBrowser.class/instance/processListMenu..st index fc9993420f..deca92678b 100644 --- a/Tools.package/ProcessBrowser.class/instance/processListMenu..st +++ b/Tools.package/ProcessBrowser.class/instance/processListMenu..st @@ -1,61 +1,3 @@ process list processListMenu: menu - | pw | - selectedProcess - ifNotNil: [ - | nameAndRules | - nameAndRules := self nameAndRulesForSelectedProcess. - menu - addList: - {{'Inspect (i)'. - #inspectProcess}. - {'Explore (I)'. - #exploreProcess}. - {'Inspect Pointers (P)'. - #inspectPointers}}. - (Smalltalk globals includesKey: #PointerExplorer) - ifTrue: [ menu add: 'Explore pointers (e)' action: #explorePointers ]. - nameAndRules second - ifTrue: [ - menu add: 'Terminate (t)' action: #terminateProcess. - selectedProcess isSuspended - ifTrue: [ menu add: 'Resume (r)' action: #resumeProcess ] - ifFalse: [ menu add: 'Suspend (s)' action: #suspendProcess ] ]. - nameAndRules third - ifTrue: [ - menu - addList: - {{'Change priority (p)'. - #changePriority}. - {'Debug (d)'. - #debugProcess}} ]. - menu - addList: - {{'Profile messages (m)'. - #messageTally}}. - (selectedProcess suspendingList isKindOf: Semaphore) - ifTrue: [ menu add: 'Signal Semaphore (S)' action: #signalSemaphore ]. - menu add: 'Full stack (k)' action: #moreStack. - menu addLine ]. - menu - addList: - {{'Find context... (f)'. - #findContext}. - {'Find again (g)'. - #nextContext}}. - menu addLine. - menu - add: - (self isAutoUpdating - ifTrue: [ 'Turn off auto-update (a)' ] - ifFalse: [ 'Turn on auto-update (a)' ]) - action: #toggleAutoUpdate. - menu add: 'Update list (u)' action: #updateProcessList. - pw := Smalltalk globals at: #CPUWatcher ifAbsent: [ ]. - pw - ifNotNil: [ - menu addLine. - pw isMonitoring - ifTrue: [ menu add: 'Stop CPUWatcher' action: #stopCPUWatcher ] - ifFalse: [ menu add: 'Start CPUWatcher' action: #startCPUWatcher ] ]. - ^ menu \ No newline at end of file + ^menu addAllFromPragma: 'processBrowserProcessListMenu' target: self \ No newline at end of file diff --git a/Tools.package/ProcessBrowser.class/instance/selectedProcess.st b/Tools.package/ProcessBrowser.class/instance/selectedProcess.st new file mode 100644 index 0000000000..420a99b49e --- /dev/null +++ b/Tools.package/ProcessBrowser.class/instance/selectedProcess.st @@ -0,0 +1,3 @@ +accessing +selectedProcess + ^selectedProcess \ No newline at end of file diff --git a/Tools.package/ProcessBrowser.class/instance/stackListMenu..st b/Tools.package/ProcessBrowser.class/instance/stackListMenu..st index a2b9fa6864..71bec6a6b8 100644 --- a/Tools.package/ProcessBrowser.class/instance/stackListMenu..st +++ b/Tools.package/ProcessBrowser.class/instance/stackListMenu..st @@ -1,11 +1,4 @@ stack list stackListMenu: aMenu selectedContext ifNil: [^ aMenu]. - ^aMenu addList: #( - ('Inspect context (c)' inspectContext) - ('Explore context (C)' exploreContext) - - - ('Inspect receiver (i)' inspectReceiver) - ('Explore receiver (I)' exploreReceiver) - - - ('Browse (b)' browseContext)) \ No newline at end of file + ^aMenu addAllFromPragma: 'processBrowserStackListMenu' target: self \ No newline at end of file diff --git a/Tools.package/ProcessBrowser.class/methodProperties.json b/Tools.package/ProcessBrowser.class/methodProperties.json index d7c896e612..7cfd019ada 100644 --- a/Tools.package/ProcessBrowser.class/methodProperties.json +++ b/Tools.package/ProcessBrowser.class/methodProperties.json @@ -8,6 +8,8 @@ "initialize" : "MarcusDenker 5/20/2011 08:32", "isUIProcess:" : "JuanVuletich 11/1/2010 10:13", "menuCommandOn:" : "AlainPlantec 2/18/2010 11:20", + "menuProcessList:" : "EstebanLorenzano 1/31/2013 18:18", + "menuStackList:" : "EstebanLorenzano 1/31/2013 18:25", "nameAndRulesFor:" : "StephaneDucasse 5/18/2012 18:22", "open" : "alain.plantec 6/1/2008 19:03", "registerToolsOn:" : "IgorStasenko 2/19/2011 03:01", @@ -57,11 +59,12 @@ "processListIndex" : "", "processListIndex:" : "sd 11/20/2005 21:27", "processListKey:from:" : "StephaneDucasse 5/18/2012 18:31", - "processListMenu:" : "tbn 7/29/2010 22:11", + "processListMenu:" : "EstebanLorenzano 1/31/2013 19:25", "processNameList" : "CamilloBruni 5/25/2012 18:19", "resumeProcess" : "nk 3/8/2001 13:23", "selectedClass" : "md 2/17/2006 09:32", "selectedMethod" : "sd 3/25/2012 20:53", + "selectedProcess" : "EstebanLorenzano 1/31/2013 18:20", "selectedSelector" : "md 2/17/2006 12:07", "setUpdateCallbackAfter:" : "sd 11/20/2005 21:27", "signalSemaphore" : "nk 10/29/2000 09:58", @@ -69,7 +72,7 @@ "stackListIndex" : "", "stackListIndex:" : "eem 6/12/2008 12:41", "stackListKey:from:" : "StephaneDucasse 5/18/2012 18:37", - "stackListMenu:" : "MarcusDenker 10/7/2012 11:14", + "stackListMenu:" : "EstebanLorenzano 1/31/2013 19:25", "stackNameList" : "nk 10/28/2000 16:18", "startAutoUpdate" : "sd 11/20/2005 21:27", "startCPUWatcher" : "lr 3/14/2010 21:13", diff --git a/Tools.package/SetInspector.class/class/menuDictionaryFieldList..st b/Tools.package/SetInspector.class/class/menuDictionaryFieldList..st new file mode 100644 index 0000000000..4dcd88e334 --- /dev/null +++ b/Tools.package/SetInspector.class/class/menuDictionaryFieldList..st @@ -0,0 +1,15 @@ +menu +menuDictionaryFieldList: aBuilder + + + + (aBuilder item: #'Inspect') + selector: #inspectSelection. + (aBuilder item: #'Copy name') + selector: #copyName. + (aBuilder item: #'Refresh view') + selector: #update. + (aBuilder item: #'Remove') + selector: #removeSelection. + (aBuilder item: #'Basic inspect') + selector: #inspectBasic. diff --git a/Tools.package/SetInspector.class/instance/fieldListMenu..st b/Tools.package/SetInspector.class/instance/fieldListMenu..st index 486c757928..1c6a65d248 100644 --- a/Tools.package/SetInspector.class/instance/fieldListMenu..st +++ b/Tools.package/SetInspector.class/instance/fieldListMenu..st @@ -1,8 +1,3 @@ menu fieldListMenu: aMenu - ^aMenu addList: #( - ('inspect' inspectSelection) - ('copy name' copyName) - ('refresh view' update) - ('remove' removeSelection) - ('basic inspect' inspectBasic)) + ^aMenu addAllFromPragma: 'setInspectorFieldListMenu' target: self. diff --git a/Tools.package/SetInspector.class/methodProperties.json b/Tools.package/SetInspector.class/methodProperties.json index 571515dad7..4eaa761582 100644 --- a/Tools.package/SetInspector.class/methodProperties.json +++ b/Tools.package/SetInspector.class/methodProperties.json @@ -1,11 +1,12 @@ { "class" : { + "menuDictionaryFieldList:" : "EstebanLorenzano 1/31/2013 18:32", "registerToolsOn:" : "IgorStasenko 2/20/2011 15:15" }, "instance" : { "arrayIndexForSelection" : "PHK 6/29/2004 15:33", "copyName" : "ClementBera 11/15/2012 09:14", "fieldList" : "PHK 6/29/2004 14:50", - "fieldListMenu:" : "MarcusDenker 10/7/2012 11:41", + "fieldListMenu:" : "EstebanLorenzano 1/31/2013 19:25", "removeSelection" : "sd 11/20/2005 21:27", "replaceSelectionValue:" : "PHK 6/29/2004 15:38", "selection" : "ClementBera 11/15/2012 09:15" } } diff --git a/Tools.package/StringHolder.class/instance/codePaneMenu.shifted..st b/Tools.package/StringHolder.class/instance/codePaneMenu.shifted..st index 6b593dcd44..6be92439ba 100644 --- a/Tools.package/StringHolder.class/instance/codePaneMenu.shifted..st +++ b/Tools.package/StringHolder.class/instance/codePaneMenu.shifted..st @@ -5,6 +5,6 @@ codePaneMenu: aMenu shifted: shifted text pane" | donorMenu | donorMenu := shifted - ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] - ifFalse: [SmalltalkEditor yellowButtonMenu]. + ifTrue: [SmalltalkEditor shiftedYellowButtonMenu] + ifFalse: [SmalltalkEditor yellowButtonMenu]. ^ aMenu addAllFrom: donorMenu \ No newline at end of file diff --git a/Tools.package/StringHolder.class/methodProperties.json b/Tools.package/StringHolder.class/methodProperties.json index 58504bab2b..d571032b5f 100644 --- a/Tools.package/StringHolder.class/methodProperties.json +++ b/Tools.package/StringHolder.class/methodProperties.json @@ -25,7 +25,7 @@ "classHierarchy" : "MarcusDenker 2/16/2010 16:31", "classListKey:from:" : "sw 5/8/2000 02:16", "clearUserEditFlag" : "di 4/21/1998 11:30", - "codePaneMenu:shifted:" : "AlainPlantec 11/16/2010 22:25", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "codeTextMorph" : "BenjaminVanRyseghem 1/29/2011 13:20", "contents" : "", "contents:" : "AlexandreBergel 1/16/2009 10:25", diff --git a/Tools.package/SyntaxError.class/methodProperties.json b/Tools.package/SyntaxError.class/methodProperties.json index 5e1c3f2a33..d141f87e56 100644 --- a/Tools.package/SyntaxError.class/methodProperties.json +++ b/Tools.package/SyntaxError.class/methodProperties.json @@ -9,7 +9,7 @@ "browseMethodFull" : "StephaneDucasse 10/15/2011 20:58", "category:" : "sd 11/20/2005 21:27", "checkForUnprintableCharacters:" : "CamilloBruni 2/8/2012 23:29", - "codePaneMenu:shifted:" : "StephaneDucasse 1/29/2011 12:08", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "contents" : "CamilloBruni 2/8/2012 23:47", "contents:" : "GuillermoPolito 8/13/2010 00:57", "contents:notifying:" : "jb 7/1/2011 10:55", diff --git a/Tools.package/TimeProfiler.class/class/fullReportMenuOn..st b/Tools.package/TimeProfiler.class/class/fullReportMenuOn..st index 92d663a1d3..b7570c394d 100644 --- a/Tools.package/TimeProfiler.class/class/fullReportMenuOn..st +++ b/Tools.package/TimeProfiler.class/class/fullReportMenuOn..st @@ -5,10 +5,23 @@ fullReportMenuOn: aBuilder pragmaKeyword: 'TimeProfilerFullReportMenu' model: nil) menu popUpInWorld" + | uitheme | + uitheme := UITheme current. - (aBuilder item: #'Find...(f)' translated) selector: #find; help: nil; icon: uitheme smallFindIcon. - (aBuilder item: #'Find again (g)' translated) selector: #findAgain; help: nil; icon: uitheme smallFindIcon. - (aBuilder item: #'Set search string (h)' translated) selector: #setSearchString. - (aBuilder item: #'Copy (c)' translated) selector: #copySelection; help: nil; icon: uitheme smallCopyIcon. + (aBuilder item: #'Find...' translated) + keyText: 'f'; + selector: #find; + icon: uitheme smallFindIcon. + (aBuilder item: #'Find again' translated) + keyText: 'g'; + selector: #findAgain; + icon: uitheme smallFindIcon. + (aBuilder item: #'Set search string' translated) + keyText: 'h'; + selector: #setSearchString. + (aBuilder item: #'Copy' translated) + keyText: 'c'; + selector: #copySelection; + icon: uitheme smallCopyIcon. diff --git a/Tools.package/TimeProfiler.class/methodProperties.json b/Tools.package/TimeProfiler.class/methodProperties.json index 3564e97706..3289e7eda9 100644 --- a/Tools.package/TimeProfiler.class/methodProperties.json +++ b/Tools.package/TimeProfiler.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "fullReportMenuOn:" : "AlainPlantec 7/22/2011 21:10", + "fullReportMenuOn:" : "EstebanLorenzano 1/31/2013 18:44", "menuCommandOn:" : "EstebanLorenzano 4/26/2012 14:14", "onBlock:" : "AlainPlantec 7/22/2011 22:44", "registerToolsOn:" : "BernardoContreras 8/15/2011 20:17", @@ -11,7 +11,7 @@ "blockCode" : "AlainPlantec 2/18/2010 02:54", "blockCode:notifying:" : "AlainPlantec 7/22/2011 21:52", "browseItem" : "AlexandreBergel 1/29/2013 12:15", - "codePaneMenu:shifted:" : "GuillermoPolito 9/4/2010 17:36", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "compile:for:in:" : "MarcusDenker 4/29/2012 14:13", "contentsSelection" : "AlainPlantec 2/17/2010 22:21", "correctFrom:to:with:" : "AlainPlantec 2/18/2010 01:47", diff --git a/Tools.package/VersionsBrowser.class/class/versionsBrowserListMenu..st b/Tools.package/VersionsBrowser.class/class/versionsBrowserListMenu..st new file mode 100644 index 0000000000..e49dd77138 --- /dev/null +++ b/Tools.package/VersionsBrowser.class/class/versionsBrowserListMenu..st @@ -0,0 +1,60 @@ +menu +versionsBrowserListMenu: aBuilder + + + + | target | + + target := aBuilder model. + target listIndex > 0 ifTrue: [ + target listIndex > 1 ifTrue: [ + (aBuilder item: #'Compare to current') + help: 'Compare selected version to the current version'; + target: target; + selector: #compareToCurrentVersion. + + (aBuilder item: #'Compare to version...') + help: 'Compare selected version to another selected version'; + target: target; + selector: #compareToOtherVersion ]. + + (aBuilder item: #'Revert to selected version') + help: 'Resubmit the selected version, so that it becomes the current version'; + target: target; + selector: #fileInSelections ]. + + (aBuilder item: #'Remove from changes') + help: 'Remove this method from the current change set, if present'; + target: target; + selector: #removeMethodFromChanges; + withSeparatorAfter. + + (aBuilder item: #'Toggle diffing') + keyText: 'D'; + help: 'Toggle whether or not diffs should be shown here'; + target: target; + selector: #toggleDiffing. + + (aBuilder item: #'Update list') + help: 'Reformulate the list of versions, in case it somehow got out of synch with reality'; + target: target; + selector: #reformulateList; + withSeparatorAfter. + + (aBuilder item: #'Senders') + keyText: 'n'; + help: 'Browse all senders of this selector'; + target: target; + selector: #browseSenders. + + (aBuilder item: #'Implementors') + keyText: 'm'; + help: 'Browse all implementors of this selector'; + target: target; + selector: #browseImplementors; + withSeparatorAfter. + + (aBuilder item: #'Help...') + help: 'Provide an explanation of the use of this tool'; + target: target; + selector: #offerVersionsHelp. diff --git a/Tools.package/VersionsBrowser.class/instance/buildDefaultCodePane..st b/Tools.package/VersionsBrowser.class/instance/buildDefaultCodePane..st index e0fcc0aec3..b3ef2d372e 100644 --- a/Tools.package/VersionsBrowser.class/instance/buildDefaultCodePane..st +++ b/Tools.package/VersionsBrowser.class/instance/buildDefaultCodePane..st @@ -6,7 +6,7 @@ buildDefaultCodePane: editString text: #contents accept: nil readSelection: #contentsSelection - menu: #codePaneMenu:hifted:) + menu: #codePaneMenu:shifted:) font: StandardFonts codeFont; hResizing: #spaceFill; vResizing: #spaceFill; diff --git a/Tools.package/VersionsBrowser.class/instance/versionsMenu..st b/Tools.package/VersionsBrowser.class/instance/versionsMenu..st index edd1ccff0c..c3db718797 100644 --- a/Tools.package/VersionsBrowser.class/instance/versionsMenu..st +++ b/Tools.package/VersionsBrowser.class/instance/versionsMenu..st @@ -5,23 +5,6 @@ versionsMenu: aMenu aMenu title: 'Versions' translated. aMenu addStayUpItemSpecial. - listIndex > 0 ifTrue:[ - (list size > 1 ) ifTrue: [ aMenu addTranslatedList: #( - ('Compare to current' compareToCurrentVersion 'Compare selected version to the current version') - ('Compare to version...' compareToOtherVersion 'Compare selected version to another selected version'))]. - "Note: Revert to selected should be visible for lists of length one for having the ability to revert to an accidentally deleted method" - aMenu addTranslatedList: #( - ('Revert to selected version' fileInSelections 'Resubmit the selected version, so that it becomes the current version') )]. + aMenu addAllFromPragma: 'versionsBrowserListMenu' target: self. - aMenu addTranslatedList: #( - ('Remove from changes' removeMethodFromChanges 'Remove this method from the current change set, if present') - - - ('Toggle diffing (D)' toggleDiffing 'Toggle whether or not diffs should be shown here') - ('Update list' reformulateList 'Reformulate the list of versions, in case it somehow got out of synch with reality') - - - ('Senders (n)' browseSenders 'Browse all senders of this selector') - ('Implementors (m)' browseImplementors 'Browse all implementors of this selector') - - - ('Help...' offerVersionsHelp 'Provide an explanation of the use of this tool')). - - ^aMenu \ No newline at end of file + ^aMenu \ No newline at end of file diff --git a/Tools.package/VersionsBrowser.class/methodProperties.json b/Tools.package/VersionsBrowser.class/methodProperties.json index ae7228abfd..7e5c69050f 100644 --- a/Tools.package/VersionsBrowser.class/methodProperties.json +++ b/Tools.package/VersionsBrowser.class/methodProperties.json @@ -6,12 +6,13 @@ "patchworkUIThemeColor" : "AlainPlantec 12/16/2009 22:10", "registerToolsOn:" : "IgorStasenko 2/19/2011 03:03", "timeStampFor:class:reverseOrdinal:" : "sd 11/20/2005 21:28", - "versionCountForSelector:class:" : "sd 11/20/2005 21:28" }, + "versionCountForSelector:class:" : "sd 11/20/2005 21:28", + "versionsBrowserListMenu:" : "EstebanLorenzano 1/31/2013 18:29" }, "instance" : { "addPriorVersionsCountForSelector:ofClass:to:" : "StephaneDucasse 5/28/2011 13:42", "addedChangeRecord" : "nk 1/7/2004 10:10", "addedChangeRecord:" : "sd 11/20/2005 21:27", - "buildDefaultCodePane:" : "MarianoMartinezPeck 4/27/2012 14:21", + "buildDefaultCodePane:" : "EstebanLorenzano 1/31/2013 10:04", "buildDiffCodePane" : "MarianoMartinezPeck 5/2/2012 18:16", "buildDiffMorphFromOldString:toNewString:contextClass:" : "MarianoMartinezPeck 5/2/2012 18:13", "buildMorphicCodePaneWith:" : "MarianoMartinezPeck 4/27/2012 13:47", @@ -34,5 +35,5 @@ "showsVersions" : "sw 10/19/1999 15:04", "updateListsAndCodeIn:" : "sd 11/20/2005 21:27", "versionsHelpString" : "nk 11/25/2003 10:19", - "versionsMenu:" : "MarcusDenker 7/13/2012 23:52", + "versionsMenu:" : "EstebanLorenzano 1/31/2013 19:25", "wantsPrettyDiffOption" : "MarianoMartinezPeck 4/27/2012 13:36" } } diff --git a/Tools.package/Workspace.class/methodProperties.json b/Tools.package/Workspace.class/methodProperties.json index 1dfa178402..c047c316de 100644 --- a/Tools.package/Workspace.class/methodProperties.json +++ b/Tools.package/Workspace.class/methodProperties.json @@ -16,7 +16,7 @@ "bindingOf:" : "sd 3/20/2004 15:20", "browseBindings" : "yann.monclair 7/17/2010 12:37", "buildTextMorph" : "BenjaminVanRyseghem 9/12/2012 14:30", - "codePaneMenu:shifted:" : "StephaneDucasse 1/29/2011 12:09", + "codePaneMenu:shifted:" : "EstebanLorenzano 1/31/2013 19:24", "codeTextMorph" : "MarcusDenker 10/5/2012 15:54", "containingWindow" : "MarcusDenker 10/5/2012 15:53", "contents" : "BenjaminVanRyseghem 9/12/2012 14:31",