--- a/MenuEditor.st Mon Sep 21 14:42:20 2009 +0200
+++ b/MenuEditor.st Mon Sep 21 22:44:58 2009 +0200
@@ -939,25 +939,25 @@
#(Menu
(
(MenuItem
- isVisible: isNotEditingSpecOnly
+ isVisible: isNotEditingSpecOnlyAndNotEmbeddedInBrowser
activeHelpKey: fileNew
label: 'New'
itemValue: doNew
translateLabel: true
)
(MenuItem
- isVisible: isNotEditingSpecOnly
+ isVisible: isNotEditingSpecOnlyAndNotEmbeddedInBrowser
label: '-'
)
(MenuItem
- isVisible: isNotEditingSpecOnly
+ isVisible: isNotEditingSpecOnlyAndNotEmbeddedInBrowser
activeHelpKey: fileLoad
label: 'Load...'
itemValue: doLoad
translateLabel: true
)
(MenuItem
- isVisible: isNotEditingSpecOnly
+ isVisible: isNotEditingSpecOnlyAndNotEmbeddedInBrowser
label: '-'
)
(MenuItem
@@ -975,7 +975,7 @@
translateLabel: true
)
(MenuItem
- isVisible: isNotEditingSpecOnly
+ isVisible: isNotEditingSpecOnlyAndNotEmbeddedInBrowser
activeHelpKey: fileSaveAs
label: 'Save As...'
itemValue: doSaveAs
@@ -1298,7 +1298,7 @@
<resource: #menu>
- ^
+ ^
#(Menu
(
(MenuItem
@@ -1313,32 +1313,32 @@
label: '-'
)
(MenuItem
- isVisible: isNotEditingSpecOnly
activeHelpKey: fileLoad
label: 'Load'
itemValue: doLoad
translateLabel: true
isButton: true
+ isVisible: isNotEditingSpecOnly
submenuChannel: menuHistory
labelImage: (ResourceRetriever ToolbarIconLibrary loadFromMethodIcon)
keepLinkedMenu: true
)
(MenuItem
- isVisible: isNotEditingSpecOnly
activeHelpKey: fileSave
label: 'Save'
itemValue: doSave
translateLabel: true
isButton: true
+ isVisible: isNotEditingSpecOnly
labelImage: (ResourceRetriever ToolbarIconLibrary saveAsMethodIcon)
)
- (MenuItem
- isVisible: isEditingSpecOnly
+ (MenuItem
activeHelpKey: fileSaveSpec
label: 'Save'
itemValue: doSave
translateLabel: true
isButton: true
+ isVisible: isEditingSpecOnly
labelImage: (ResourceRetriever XPToolbarIconLibrary saveImageIcon)
)
(MenuItem
@@ -2284,6 +2284,14 @@
]
!
+commonPostOpen
+ "reset keyboardProcessor for menuBar"
+
+ super commonPostOpen.
+ builder keyboardProcessor menuBar:nil.
+ self windowGroup addPreEventHook:self.
+!
+
initialize
"setup aspects, ...
"
@@ -2324,18 +2332,15 @@
postBuildNoteBook:aNoteBook
aNoteBook tabLabelInset:16@4.
-!
-
-postOpenWith:aBuilder
- "reset keyboardProcessor for menuBar"
-
- super postOpenWith: aBuilder.
- aBuilder keyboardProcessor menuBar:nil.
- self windowGroup addPreEventHook:self.
! !
!MenuEditor methodsFor:'menus-dynamic'!
+editMenu
+ self halt.
+ ^ super editMenu
+!
+
submenuTest
"returns a menu on the current editing menu
"
@@ -2487,11 +2492,16 @@
!
isEditingSpecOnly
- ^ masterApplication perform:#isEditingSpecOnly ifNotUnderstood:true "/ false
+ ^ masterApplication notNil
+ and:[ masterApplication perform:#isEditingSpecOnly ifNotUnderstood:false]
!
isNotEditingSpecOnly
^ self isEditingSpecOnly not
+!
+
+isNotEditingSpecOnlyAndNotEmbeddedInBrowser
+ ^ self isNotEditingSpecOnly and:[ self isEmbeddedInBrowser not ]
! !
!MenuEditor methodsFor:'selection'!