--- a/NewLauncher.st Tue Jul 08 15:25:24 2014 +0200
+++ b/NewLauncher.st Tue Jul 08 15:26:07 2014 +0200
@@ -4163,61 +4163,50 @@
label := assoc key.
submenu := Menu new.
- submenu addItem:(MenuItem new
- label: 'Raise Deiconified';
- itemValue: [view raiseDeiconified; setForegroundWindow];
- translateLabel: true).
- submenu addItem:(item := MenuItem new
- label: 'Iconify';
- itemValue: [view collapse];
- translateLabel: true).
+ submenu addItem:(MenuItem
+ label: 'Raise Deiconified'
+ itemValue: [view raiseDeiconified; setForegroundWindow]).
+ submenu addItem:(item := MenuItem
+ label: 'Iconify'
+ itemValue: [view collapse]).
view topView isCollapsed ifTrue:[
item disable
].
- submenu addItem:(MenuItem new
- label: 'Migrate...';
- itemValue: [self migrateWindow:view];
- enabled:(view windowGroup isModal not);
- translateLabel: true).
- submenu addItem:(MenuItem new
- label: 'Bring onto Screen...';
- itemValue: [self bringWindowOntoScreen:view];
- translateLabel: true).
+ submenu addItem:(MenuItem
+ label: 'Migrate...'
+ itemValue: [self migrateWindow:view]
+ enabled:(view windowGroup isModal not) ).
+ submenu addItem:(MenuItem
+ label: 'Bring onto Screen...'
+ itemValue: [self bringWindowOntoScreen:view] ).
submenu addSeparator.
- submenu addItem:(MenuItem new
- label: 'Hardcopy';
- itemValue: [self hardcopyOfView:view];
- translateLabel: true).
- submenu addItem:(MenuItem new
- label: 'Inspect View';
- itemValue: [view inspect];
- translateLabel: true).
- submenu addItem:(MenuItem new
- label: 'Inspect Application';
- itemValue: [view application inspect];
- enabled:(view application notNil);
- translateLabel: true).
+ submenu addItem:(MenuItem
+ label: 'Hardcopy'
+ itemValue: [self hardcopyOfView:view] ).
+ submenu addItem:(MenuItem
+ label: 'Inspect View'
+ itemValue: [view inspect] ).
+ submenu addItem:(MenuItem
+ label: 'Inspect Application'
+ itemValue: [view application inspect]
+ enabled:(view application notNil) ).
submenu addSeparator.
- submenu addItem:(MenuItem new
- label: 'Browse View Class';
- itemValue: [view class browse];
- translateLabel: true).
- submenu addItem:(MenuItem new
- label: 'Browse Application Class';
- itemValue: [view application class browse];
- enabled:(view application notNil);
- translateLabel: true).
- submenu addItem:(MenuItem new
- label: 'Debug Application';
- itemValue: [Debugger openOn:view windowGroup process];
- translateLabel: true).
+ submenu addItem:(MenuItem
+ label: 'Browse View Class'
+ itemValue: [view class browse] ).
+ submenu addItem:(MenuItem
+ label: 'Browse Application Class'
+ itemValue: [view application class browse]
+ enabled:(view application notNil) ).
+ submenu addItem:(MenuItem
+ label: 'Debug Application'
+ itemValue: [Debugger openOn:view windowGroup process] ).
submenu addSeparator.
- submenu addItem:(MenuItem new
- label: 'Close';
- itemValue: [view destroy];
- translateLabel: true).
+ submenu addItem:(MenuItem
+ label: 'Close'
+ itemValue: [view destroy] ).
likeThis :=
allViewsAndLabels
@@ -4242,27 +4231,28 @@
submenu addItem:(MenuItem new
label: (resources string:'Close All like This%1' with:info);
itemValue: [likeThis do:[:eachView | eachView destroy]];
- translateLabel: true;
+ translateLabel: false;
enabled:(likeThis size > 1)).
submenu addItem:(MenuItem new
label: (resources string:'Iconify All like This%1' with:info);
itemValue: [likeThis do:[:eachView | eachView collapse]];
- translateLabel: true;
+ translateLabel: false;
enabled:(likeThis size > 1)).
submenu addItem:(MenuItem new
label: (resources string:'Deiconify All like This%1' with:info);
itemValue: [likeThis do:[:eachView | eachView raiseDeiconified]];
- translateLabel: true;
+ translateLabel: false;
enabled:(likeThis size > 1)).
menu addItem:(MenuItem new
- label: label;
- submenu: submenu;
- itemValue: [view raiseDeiconified; setForegroundWindow];
- translateLabel: false).
+ label: label
+ itemValue: [view raiseDeiconified; setForegroundWindow]
+ translateLabel: false;
+ submenu: submenu
+ ).
].
menu findGuiResourcesIn:self.
@@ -4306,9 +4296,9 @@
menu addItemGroup:
(changeHistory collect:[:change|
MenuItem new
+ label: (change className , ' ' , (change selector ? '???'))
+ itemValue: [UserPreferences systemBrowserClass openInClass:change changeClass selector:change selector]
translateLabel: false;
- label: (change className , ' ' , (change selector ? '???'));
- value: [UserPreferences systemBrowserClass openInClass:change changeClass selector:change selector];
activeHelpKey: #classBrowserOnChangedMethod
]).
].
@@ -4316,9 +4306,8 @@
menu addItemGroup:
{
MenuItem new
- translateLabel: false;
- label: (resources string:'Open Changesbrowser on File...');
- value:
+ label: (resources string:'Open Changesbrowser on File...')
+ itemValue:
[
|file|
@@ -4326,7 +4315,8 @@
file notEmptyOrNil ifTrue:[
UserPreferences current changesBrowserClass openOn:file
]
- ];
+ ]
+ translateLabel: false;
activeHelpKey: #changeBrowserOnFile
}.
@@ -4362,32 +4352,28 @@
menu addItemGroup:
(classHistory collect:[:histEntry|
MenuItem new
+ label: (histEntry className)
+ itemValue: [whichBrowserClass openInClass:histEntry theClass selector:histEntry selector]
translateLabel: false;
- label: (histEntry className);
- itemValue: [whichBrowserClass openInClass:histEntry theClass selector:histEntry selector];
activeHelpKey: #classesSystemBrowserOnClass
]
).
menu addItem: (MenuItem new
- label: 'Find Class...';
+ label: 'Find Class...'
itemValue: [self findClassAndBrowse];
- translateLabel: true;
activeHelpKey: #findClassAndBrowse).
menu addItem: (MenuItem new
- label: 'Implementors Of...';
+ label: 'Implementors Of...'
itemValue: [self browseImplementors];
- translateLabel: true;
activeHelpKey: #browseImplementors).
menu addItem: (MenuItem new
- label: 'Senders Of...';
+ label: 'Senders Of...'
itemValue: [self browseSenders];
- translateLabel: true;
activeHelpKey: #browseSenders).
menu addSeparator.
menu addItem: (MenuItem new
- label: 'Clear History';
- itemValue: [classHistory removeAll];
- translateLabel: true;
+ label: 'Clear History'
+ itemValue: [classHistory removeAll]
enabled:(classHistory notEmpty);
activeHelpKey: #historyEmptyMenu).
@@ -4423,16 +4409,15 @@
|dirNameString|
dirNameString := item path.
MenuItem new
+ label: dirNameString
+ itemValue: [UserPreferences fileBrowserClass openOn:dirNameString]
translateLabel: false;
- label: dirNameString;
- itemValue: [UserPreferences fileBrowserClass openOn:dirNameString];
activeHelpKey: #FileBrowserOnDirectory
]
).
menu addItem: (MenuItem new
- label: 'Clear History';
- itemValue: [dirHistory removeAll];
- translateLabel: true;
+ label: 'Clear History'
+ itemValue: [dirHistory removeAll]
enabled:(dirHistory notEmpty);
activeHelpKey: #historyEmptyMenu).
@@ -4450,32 +4435,31 @@
menu := Menu new receiver: self.
menu addItemGroup:
- (appHistory collect:[:appClassName|
- |item appClass label|
-
- appClass := Smalltalk classNamed:appClassName.
- appClass isNil ifTrue:[
- label := appClassName.
- ] ifFalse:[
- label := appClass nameWithoutPrefix
- ].
- item := MenuItem new
- label: label;
- itemValue: #openApplication: argument: appClassName.
-
- appClass isNil ifTrue:[
- item enabled:false.
- item label:(LabelAndIcon icon:(ToolbarIconLibrary erase16x16Icon2) string:appClassName)
- ].
- item
- ]
+ (appHistory collect:[:appClassName|
+ |item appClass label|
+
+ appClass := Smalltalk classNamed:appClassName.
+ appClass isNil ifTrue:[
+ label := appClassName.
+ ] ifFalse:[
+ label := appClass nameWithoutPrefix
+ ].
+ item := MenuItem
+ label: label
+ itemValue: #openApplication: argument: appClassName.
+
+ appClass isNil ifTrue:[
+ item enabled:false.
+ item label:(LabelAndIcon icon:(ToolbarIconLibrary erase16x16Icon2) string:appClassName)
+ ].
+ item
+ ]
).
menu addItem: (MenuItem new
- label: 'Clear History';
- itemValue: [ ApplicationModel forgetRecentlyOpenedApplications ];
- translateLabel: true;
- enabled:(appHistory notEmpty);
- activeHelpKey: #historyEmptyMenu).
+ label: 'Clear History'
+ itemValue: [ ApplicationModel forgetRecentlyOpenedApplications ]
+ enabled:(appHistory notEmpty);
+ activeHelpKey: #historyEmptyMenu).
menu findGuiResourcesIn:self.
^menu
@@ -5114,14 +5098,14 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.492 2014-07-03 18:46:54 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.493 2014-07-08 13:26:07 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.492 2014-07-03 18:46:54 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.493 2014-07-08 13:26:07 cg Exp $'
!
version_SVN
- ^ '$Id: NewLauncher.st,v 1.492 2014-07-03 18:46:54 cg Exp $'
+ ^ '$Id: NewLauncher.st,v 1.493 2014-07-08 13:26:07 cg Exp $'
! !