--- a/ImageEditor.st Thu Dec 22 18:41:12 2005 +0100
+++ b/ImageEditor.st Mon Jan 09 09:47:51 2006 +0100
@@ -2347,6 +2347,9 @@
labelImage: (ResourceRetriever ToolbarIconLibrary newImageIcon)
)
(MenuItem
+ label: '-'
+ )
+ (MenuItem
activeHelpKey: fileLoadFromFile
label: 'loadFromFile'
itemValue: doLoadFromFile
@@ -2364,7 +2367,7 @@
labelImage: (ResourceRetriever ToolbarIconLibrary saveImageToFileAsIcon)
)
(MenuItem
- label: ''
+ label: '-'
)
(MenuItem
activeHelpKey: fileLoadFromClass
@@ -2372,7 +2375,7 @@
itemValue: doLoadFromClass
translateLabel: true
isButton: true
- submenuChannel: menuHistory
+ submenuChannel: menuHistory
labelImage: (ResourceRetriever ToolbarIconLibrary loadImageFromMethodIcon)
keepLinkedMenu: true
)
@@ -2386,10 +2389,7 @@
labelImage: (ResourceRetriever ToolbarIconLibrary saveImageAsMethodAsIcon)
)
(MenuItem
- label: ''
- )
- (MenuItem
- label: ''
+ label: '-'
)
(MenuItem
activeHelpKey: editUndo
@@ -3986,7 +3986,7 @@
(aMode asString startsWith:'mask') ifTrue:[
image mask isNil ifTrue:[
- (Dialog confirm:'Generate mask from black ?' default:false) ifTrue:[
+ false "(Dialog confirm:'Generate mask from black ?' default:false)" ifTrue:[
maskThreshold := 0.1.
maskImage := Depth1Image fromImage:(image asThresholdMonochromeImage:maskThreshold).
] ifFalse:[
@@ -4052,7 +4052,7 @@
imageEditView makeUndo.
- self information:('Compress colorMap: %1 colors used.' bindWith:usedColors size).
+"/ self information:('Compress colorMap: %1 colors used.' bindWith:usedColors size).
self withExecuteCursorDo:[
"/ newColorMap := Array new:usedColors size.
--- a/MenuEditor.st Thu Dec 22 18:41:12 2005 +0100
+++ b/MenuEditor.st Mon Jan 09 09:47:51 2006 +0100
@@ -1142,6 +1142,9 @@
labelImage: (ResourceRetriever ToolbarIconLibrary newMenuIcon)
)
(MenuItem
+ label: '-'
+ )
+ (MenuItem
activeHelpKey: fileLoad
label: 'Load'
itemValue: doLoad
@@ -2187,12 +2190,14 @@
index := 1.
(intoItem canAddChildren and:[intoItem isExpanded]) ifFalse:[
- [ intoItem parent canAddChildren ] whileFalse:[
+ intoItem parent notNil ifTrue:[
+ [ intoItem parent canAddChildren ] whileFalse:[
+ intoItem := intoItem parent.
+ ].
+ index := intoItem parent identityIndexOf:intoItem.
+ index := index + 1.
intoItem := intoItem parent.
].
- index := intoItem parent identityIndexOf:intoItem.
- index := index + 1.
- intoItem := intoItem parent.
].
newItem := aBlockOrItem value.