diff -r a22f943ea63d -r c6150678bc9f ImageEditor.st --- a/ImageEditor.st Mon Sep 21 22:55:48 2009 +0200 +++ b/ImageEditor.st Tue Sep 22 15:51:25 2009 +0200 @@ -1732,379 +1732,28 @@ label: '&File' translateLabel: true submenuChannel: menuFile - keepLinkedMenu: true + "/ keepLinkedMenu: true ) (MenuItem label: 'Edit' translateLabel: true submenuChannel: menuEdit - keepLinkedMenu: true + "/ keepLinkedMenu: true ) (MenuItem - enabled: imageIsLoaded label: 'Mode' translateLabel: true submenuChannel: modeMenu ) (MenuItem - enabled: imageIsLoaded label: 'Colors' translateLabel: true - submenu: - (Menu - ( - (MenuItem - label: 'Depth' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - activeHelpKey: colorMap1 - label: '1-Plane' - itemValue: colorMapMode: - translateLabel: true - argument: depth1 - choice: colorMapMode - choiceValue: depth1 - ) - (MenuItem - activeHelpKey: colorMap1M - label: '1-Plane + Mask' - itemValue: colorMapMode: - translateLabel: true - argument: masked1 - choice: colorMapMode - choiceValue: masked1 - ) - (MenuItem - label: '-' - ) - (MenuItem - activeHelpKey: colorMap2 - label: '2-Plane' - itemValue: colorMapMode: - translateLabel: true - argument: depth2 - choice: colorMapMode - choiceValue: depth2 - ) - (MenuItem - activeHelpKey: colorMap2M - label: '2-Plane + Mask' - itemValue: colorMapMode: - translateLabel: true - argument: masked2 - choice: colorMapMode - choiceValue: masked2 - ) - (MenuItem - label: '-' - ) - (MenuItem - activeHelpKey: colorMap4 - label: '4-Plane' - itemValue: colorMapMode: - translateLabel: true - argument: depth4 - choice: colorMapMode - choiceValue: depth4 - ) - (MenuItem - activeHelpKey: colorMap4M - label: '4-Plane + Mask' - itemValue: colorMapMode: - translateLabel: true - argument: masked4 - choice: colorMapMode - choiceValue: masked4 - ) - (MenuItem - label: '-' - ) - (MenuItem - activeHelpKey: colorMap8 - label: '8-Plane' - itemValue: colorMapMode: - translateLabel: true - argument: depth8 - choice: colorMapMode - choiceValue: depth8 - ) - (MenuItem - activeHelpKey: colorMap8M - label: '8-Plane + Mask' - itemValue: colorMapMode: - translateLabel: true - argument: masked8 - choice: colorMapMode - choiceValue: masked8 - ) - (MenuItem - label: '-' - ) - (MenuItem - activeHelpKey: colorMap16 - label: '16-Plane' - itemValue: colorMapMode: - translateLabel: true - argument: depth16 - choice: colorMapMode - choiceValue: depth16 - ) - (MenuItem - activeHelpKey: colorMap16M - label: '16-Plane + Mask' - itemValue: colorMapMode: - translateLabel: true - argument: masked16 - choice: colorMapMode - choiceValue: masked16 - ) - (MenuItem - label: '-' - ) - (MenuItem - activeHelpKey: colorMap24 - label: '24-Plane' - itemValue: colorMapMode: - translateLabel: true - argument: depth24 - choice: colorMapMode - choiceValue: depth24 - ) - (MenuItem - activeHelpKey: colorMap24M - label: '24-Plane + Mask' - itemValue: colorMapMode: - translateLabel: true - argument: masked24 - choice: colorMapMode - choiceValue: masked24 - ) - (MenuItem - label: '-' - ) - (MenuItem - activeHelpKey: colorMap32 - label: '32-Plane (rgba)' - itemValue: colorMapMode: - translateLabel: true - argument: depth32 - choice: colorMapMode - choiceValue: depth32 - ) - ) - nil - nil - ) - ) - (MenuItem - label: 'ColorMap' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - activeHelpKey: compressColormap - enabled: hasColormap - label: 'Compress Colormap' - itemValue: compressColorMap - translateLabel: true - ) - (MenuItem - enabled: hasColormap - label: 'Sort Colormap' - itemValue: sortColorMap - translateLabel: true - ) - (MenuItem - label: 'Reduce Number of Colors by Rounding...' - itemValue: reduceNumberOfColors2 - translateLabel: true - ) - (MenuItem - label: 'Reduce Number of Colors by Masking Bits...' - itemValue: reduceNumberOfColors - translateLabel: true - ) - (MenuItem - label: 'Dither to Depth...' - itemValue: ditherToDepth - translateLabel: true - ) - ) - nil - nil - ) - ) - (MenuItem - label: 'Process' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - label: 'Make GrayScale' - itemValue: makeGrayScaleImage - translateLabel: true - ) - (MenuItem - enabled: hasNoColormap - label: 'Make dithered 8Bit Palette' - itemValue: makeDitheredPaletteImage - translateLabel: true - isVisible: false - ) - (MenuItem - label: 'Make Brighter' - itemValue: makeBrighter - translateLabel: true - ) - (MenuItem - label: 'Make Darker' - itemValue: makeDarker - translateLabel: true - ) - (MenuItem - label: 'Make Inverse' - itemValue: makeInverse - translateLabel: true - ) - (MenuItem - label: '-' - ) - (MenuItem - label: 'Change HLS...' - itemValue: changeHLS - translateLabel: true - ) - (MenuItem - label: 'Colorize...' - itemValue: colorize - translateLabel: true - ) - ) - nil - nil - ) - ) - (MenuItem - label: 'Mask' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - activeHelpKey: copyMask - enabled: hasMask - label: 'Copy Mask' - itemValue: copyMask - translateLabel: true - ) - (MenuItem - activeHelpKey: pasteMask - enabled: hasMask - label: 'Paste Mask' - itemValue: pasteMask - translateLabel: true - ) - (MenuItem - enabled: hasMask - label: 'Clear Masked Pixels' - itemValue: clearMaskedPixels - translateLabel: true - ) - ) - nil - nil - ) - ) - ) - nil - nil - ) + submenuChannel: menuColors ) (MenuItem label: 'Settings' translateLabel: true - submenu: - (Menu - ( - (MenuItem - activeHelpKey: settingsGridMagnification - label: 'Grid Magnification Limit...' - itemValue: doChangeGridMagnification - translateLabel: true - ) - (MenuItem - label: 'Pen' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - label: '1' - itemValue: penWidth: - translateLabel: true - argument: 1 - ) - (MenuItem - label: '5' - itemValue: penWidth: - translateLabel: true - argument: 5 - ) - (MenuItem - label: '10' - itemValue: penWidth: - translateLabel: true - argument: 10 - ) - ) - nil - nil - ) - ) - (MenuItem - label: 'Spray' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - label: '4' - itemValue: spraySpot: - translateLabel: true - argument: 4 - ) - (MenuItem - label: '8' - itemValue: spraySpot: - translateLabel: true - argument: 8 - ) - (MenuItem - label: '16' - itemValue: spraySpot: - translateLabel: true - argument: 16 - ) - (MenuItem - label: '32' - itemValue: spraySpot: - translateLabel: true - argument: 32 - ) - ) - nil - nil - ) - ) - ) - nil - nil - ) + submenuChannel: menuSettings ) (MenuItem label: 'History' @@ -2124,6 +1773,321 @@ ) ! +menuColors + "This resource specification was automatically generated + by the MenuEditor of ST/X." + + "Do not manually edit this!! If it is corrupted, + the MenuEditor may not be able to read the specification." + + " + MenuEditor new openOnClass:ImageEditor andSelector:#menuColors + (Menu new fromLiteralArrayEncoding:(ImageEditor menuColors)) startUp + " + + + + ^ + #(Menu + ( + (MenuItem + enabled: imageIsLoaded + label: 'Depth' + translateLabel: true + submenu: + (Menu + ( + (MenuItem + activeHelpKey: colorMap1 + label: '1-Plane' + itemValue: colorMapMode: + translateLabel: true + argument: depth1 + choice: colorMapMode + choiceValue: depth1 + ) + (MenuItem + activeHelpKey: colorMap1M + label: '1-Plane + Mask' + itemValue: colorMapMode: + translateLabel: true + argument: masked1 + choice: colorMapMode + choiceValue: masked1 + ) + (MenuItem + label: '-' + ) + (MenuItem + activeHelpKey: colorMap2 + label: '2-Plane' + itemValue: colorMapMode: + translateLabel: true + argument: depth2 + choice: colorMapMode + choiceValue: depth2 + ) + (MenuItem + activeHelpKey: colorMap2M + label: '2-Plane + Mask' + itemValue: colorMapMode: + translateLabel: true + argument: masked2 + choice: colorMapMode + choiceValue: masked2 + ) + (MenuItem + label: '-' + ) + (MenuItem + activeHelpKey: colorMap4 + label: '4-Plane' + itemValue: colorMapMode: + translateLabel: true + argument: depth4 + choice: colorMapMode + choiceValue: depth4 + ) + (MenuItem + activeHelpKey: colorMap4M + label: '4-Plane + Mask' + itemValue: colorMapMode: + translateLabel: true + argument: masked4 + choice: colorMapMode + choiceValue: masked4 + ) + (MenuItem + label: '-' + ) + (MenuItem + activeHelpKey: colorMap8 + label: '8-Plane' + itemValue: colorMapMode: + translateLabel: true + argument: depth8 + choice: colorMapMode + choiceValue: depth8 + ) + (MenuItem + activeHelpKey: colorMap8M + label: '8-Plane + Mask' + itemValue: colorMapMode: + translateLabel: true + argument: masked8 + choice: colorMapMode + choiceValue: masked8 + ) + (MenuItem + label: '-' + ) + (MenuItem + activeHelpKey: colorMap16 + label: '16-Plane' + itemValue: colorMapMode: + translateLabel: true + argument: depth16 + choice: colorMapMode + choiceValue: depth16 + ) + (MenuItem + activeHelpKey: colorMap16M + label: '16-Plane + Mask' + itemValue: colorMapMode: + translateLabel: true + argument: masked16 + choice: colorMapMode + choiceValue: masked16 + ) + (MenuItem + label: '-' + ) + (MenuItem + activeHelpKey: colorMap24 + label: '24-Plane' + itemValue: colorMapMode: + translateLabel: true + argument: depth24 + choice: colorMapMode + choiceValue: depth24 + ) + (MenuItem + activeHelpKey: colorMap24M + label: '24-Plane + Mask' + itemValue: colorMapMode: + translateLabel: true + argument: masked24 + choice: colorMapMode + choiceValue: masked24 + ) + (MenuItem + label: '-' + ) + (MenuItem + activeHelpKey: colorMap32 + label: '32-Plane (rgba)' + itemValue: colorMapMode: + translateLabel: true + argument: depth32 + choice: colorMapMode + choiceValue: depth32 + ) + ) + nil + nil + ) + ) + (MenuItem + enabled: imageIsLoaded + label: 'ColorMap' + translateLabel: true + submenu: + (Menu + ( + (MenuItem + activeHelpKey: compressColormap + enabled: hasColormap + label: 'Compress Colormap' + itemValue: compressColorMap + translateLabel: true + ) + (MenuItem + enabled: hasColormap + label: 'Sort Colormap' + itemValue: sortColorMap + translateLabel: true + ) + (MenuItem + label: 'Reduce Number of Colors by Rounding...' + itemValue: reduceNumberOfColors2 + translateLabel: true + ) + (MenuItem + label: 'Reduce Number of Colors by Masking Bits...' + itemValue: reduceNumberOfColors + translateLabel: true + ) + (MenuItem + label: 'Dither to Depth...' + itemValue: ditherToDepth + translateLabel: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: imageIsLoaded + label: 'Invert' + itemValue: doNegativeImage + translateLabel: true + ) + (MenuItem + enabled: imageIsLoaded + label: 'Brighten' + itemValue: doBrightenImage + translateLabel: true + ) + (MenuItem + enabled: imageIsLoaded + label: 'Darken' + itemValue: doDarkenImage + translateLabel: true + ) + ) + nil + nil + ) + ) + (MenuItem + enabled: imageIsLoaded + label: 'Process' + translateLabel: true + submenu: + (Menu + ( + (MenuItem + label: 'Make GrayScale' + itemValue: makeGrayScaleImage + translateLabel: true + ) + (MenuItem + enabled: hasNoColormap + label: 'Make dithered 8Bit Palette' + itemValue: makeDitheredPaletteImage + translateLabel: true + isVisible: false + ) + (MenuItem + label: 'Make Brighter' + itemValue: makeBrighter + translateLabel: true + ) + (MenuItem + label: 'Make Darker' + itemValue: makeDarker + translateLabel: true + ) + (MenuItem + label: 'Make Inverse' + itemValue: makeInverse + translateLabel: true + ) + (MenuItem + label: '-' + ) + (MenuItem + label: 'Change HLS...' + itemValue: changeHLS + translateLabel: true + ) + (MenuItem + label: 'Colorize...' + itemValue: colorize + translateLabel: true + ) + ) + nil + nil + ) + ) + (MenuItem + enabled: imageIsLoaded + label: 'Mask' + translateLabel: true + submenu: + (Menu + ( + (MenuItem + activeHelpKey: copyMask + enabled: hasMask + label: 'Copy Mask' + itemValue: copyMask + translateLabel: true + ) + (MenuItem + activeHelpKey: pasteMask + enabled: hasMask + label: 'Paste Mask' + itemValue: pasteMask + translateLabel: true + ) + (MenuItem + enabled: hasMask + label: 'Clear Masked Pixels' + itemValue: clearMaskedPixels + translateLabel: true + ) + ) + nil + nil + ) + ) + ) + nil + nil + ) +! + menuEdit "This resource specification was automatically generated by the MenuEditor of ST/X." @@ -2152,36 +2116,42 @@ label: '-' ) (MenuItem + enabled: imageIsLoaded activeHelpKey: editResize label: 'Resize...' itemValue: doResizeImage translateLabel: true ) (MenuItem + enabled: imageIsLoaded activeHelpKey: editMagnifyImage label: 'Magnify...' itemValue: doMagnifyImage translateLabel: true ) (MenuItem + enabled: imageIsLoaded activeHelpKey: editMagnifyImage label: 'Magnify By...' itemValue: doMagnifyImageBy translateLabel: true ) (MenuItem + enabled: imageIsLoaded activeHelpKey: editRotate label: 'Rotate...' itemValue: doRotateImage translateLabel: true ) (MenuItem + enabled: imageIsLoaded activeHelpKey: edit3DProjection label: '3D Projection...' itemValue: do3DProjection translateLabel: true ) (MenuItem + enabled: imageIsLoaded label: 'Flip' translateLabel: true submenu: @@ -2192,12 +2162,14 @@ label: 'Flip - Vertical' itemValue: doFlipVertical translateLabel: true + enabled: imageIsLoaded ) (MenuItem activeHelpKey: editFlipHorizontal label: 'Flip - Horizontal' itemValue: doFlipHorizontal translateLabel: true + enabled: imageIsLoaded ) ) nil @@ -2208,24 +2180,7 @@ label: '-' ) (MenuItem - label: 'Invert' - itemValue: doNegativeImage - translateLabel: true - ) - (MenuItem - label: 'Brighten' - itemValue: doBrightenImage - translateLabel: true - ) - (MenuItem - label: 'Darken' - itemValue: doDarkenImage - translateLabel: true - ) - (MenuItem - label: '-' - ) - (MenuItem + enabled: imageIsLoaded label: 'Crop' translateLabel: true submenu: @@ -2279,12 +2234,14 @@ ) ) (MenuItem + enabled: imageIsLoaded activeHelpKey: uncropManual label: 'Uncrop (Add Border)...' itemValue: doUnCropManual translateLabel: true ) (MenuItem + enabled: imageIsLoaded activeHelpKey: shiftManual label: 'Shift...' itemValue: doShiftManual @@ -2294,6 +2251,14 @@ label: '-' ) (MenuItem + activeHelpKey: fileEditMask + enabled: imageIsLoaded + label: 'Edit Mask' + itemValue: doEditMask + translateLabel: true + ) + (MenuItem + enabled: imageIsLoaded label: 'Text...' itemValue: doInsertTextFromUser translateLabel: true @@ -2416,21 +2381,16 @@ label: '-' ) (MenuItem - activeHelpKey: fileShowStoreString - enabled: imageIsLoaded - label: 'Show storeString' - itemValue: doShowStoreString - translateLabel: true - ) - (MenuItem activeHelpKey: fileEditMask enabled: imageIsLoaded label: 'Edit Mask' itemValue: doEditMask translateLabel: true + isVisible: false ) (MenuItem label: '-' + isVisible: false ) (MenuItem activeHelpKey: filePrint @@ -2452,12 +2412,20 @@ isVisible: isStandAlone ) (MenuItem + enabled: imageIsLoaded label: 'Inspect Image' itemValue: doInspectImage translateLabel: true isVisible: isStandAlone ) (MenuItem + activeHelpKey: fileShowStoreString + enabled: imageIsLoaded + label: 'Show storeString' + itemValue: doShowStoreString + translateLabel: true + ) + (MenuItem label: '-' isVisible: isStandAlone ) @@ -2516,6 +2484,99 @@ ) ! +menuSettings + "This resource specification was automatically generated + by the MenuEditor of ST/X." + + "Do not manually edit this!! If it is corrupted, + the MenuEditor may not be able to read the specification." + + " + MenuEditor new openOnClass:ImageEditor andSelector:#menuSettings + (Menu new fromLiteralArrayEncoding:(ImageEditor menuSettings)) startUp + " + + + + ^ + #(Menu + ( + (MenuItem + activeHelpKey: settingsGridMagnification + label: 'Grid Magnification Limit...' + itemValue: doChangeGridMagnification + translateLabel: true + ) + (MenuItem + label: 'Pen' + translateLabel: true + submenu: + (Menu + ( + (MenuItem + label: '1' + itemValue: penWidth: + translateLabel: true + argument: 1 + ) + (MenuItem + label: '5' + itemValue: penWidth: + translateLabel: true + argument: 5 + ) + (MenuItem + label: '10' + itemValue: penWidth: + translateLabel: true + argument: 10 + ) + ) + nil + nil + ) + ) + (MenuItem + label: 'Spray' + translateLabel: true + submenu: + (Menu + ( + (MenuItem + label: '4' + itemValue: spraySpot: + translateLabel: true + argument: 4 + ) + (MenuItem + label: '8' + itemValue: spraySpot: + translateLabel: true + argument: 8 + ) + (MenuItem + label: '16' + itemValue: spraySpot: + translateLabel: true + argument: 16 + ) + (MenuItem + label: '32' + itemValue: spraySpot: + translateLabel: true + argument: 32 + ) + ) + nil + nil + ) + ) + ) + nil + nil + ) +! + menuToolbar "This resource specification was automatically generated by the MenuEditor of ST/X." @@ -5191,7 +5252,7 @@ imageEditView brightenImage. self listOfColors removeAll. self findColorMapMode. - imageEditView removelastUndo + "/ imageEditView removelastUndo ! doBrowseClass @@ -5330,7 +5391,7 @@ imageEditView darkenImage. self listOfColors removeAll. self findColorMapMode. - imageEditView removelastUndo + "/ imageEditView removelastUndo ! doEditMask @@ -5484,7 +5545,7 @@ imageEditView negativeImage. self listOfColors removeAll. self findColorMapMode. - imageEditView removelastUndo + "/ imageEditView removelastUndo ! doResizeImage