hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:bd8ab9274cbd
+:52d0f1ff020d
 'Save the image as resource method in a class'
 #floodFillMaxError
 'Specify the max. allowed deviation from the clicked pixel in a flood-fill operation.\Pixels where the hue/light values differ less than that fraction\will be included in the fill.\The range must be between 0 and 1. With 0, only areas with exactly the same pixel will be filled.\With 1, every other pixel is included.\\When filling gradiented areas, start with small values, such as 0.05, and increase slowly.'
-#gropAll
+#cropAll
 'Crop (cut off) all four sides by the amounts entered into the above fields.'
-#gropBottom
+#cropBottom
 'Cut off the specified number of pixels at the bottom'
-#gropLeft
+#cropLeft
 'Cut off the specified number of pixels at the left'
-#gropRight
+#cropRight
 'Cut off the specified number of pixels at the right'
-#gropTop
+#cropTop
 'Cut off the specified number of pixels at the top'
 #magnificationNumber
 'Shows the current magnification'
 #xfileSaveMethodAs
 'Save as Method...'
 )
-"Modified: / 17-02-2017 / 15:32:45 / cg"
+"Modified: / 19-02-2017 / 15:10:03 / cg"
 !
 helpSpec
 "This resource specification was automatically generated
 by the UIHelpTool of ST/X."
 )
 )
 !
-cropDialogSpec
+cropSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the UIPainter may not be able to read the specification."
 "
-UIPainter new openOnClass:ImageEditor andSelector:#cropDialogSpec
+UIPainter new openOnClass:ImageEditor andSelector:#cropSpec
-ImageEditor new openInterface:#cropDialogSpec
+ImageEditor new openInterface:#cropSpec
 "
 <resource: #canvas>
 ^
 #(FullSpec
-name: cropDialogSpec
+name: cropSpec
 window:
 (WindowSpec
 label: 'Crop Border(s)'
 name: 'Crop Border(s)'
 min: (Point 10 10)
 component:
 (SpecCollection
 collection: (
 (LabelSpec
 label: 'Left:'
-name: 'GropLeftLabel'
+name: 'CropLeftLabel'
 layout: (LayoutFrame 14 0 24 0 90 0 46 0)
-activeHelpKey: gropLeft
+activeHelpKey: cropLeft
 translateLabel: true
 adjust: left
 )
 (InputFieldSpec
-name: 'GropLeftEntryField'
+name: 'CropLeftEntryField'
 layout: (LayoutFrame 95 0 24 0 125 0 46 0)
-activeHelpKey: gropLeft
+activeHelpKey: cropLeft
 tabable: true
-model: gropLeftAmount
+model: cropLeftAmount
 type: number
 acceptChannel: acceptChannel
 acceptOnPointerLeave: false
 )
 (ActionButtonSpec
-label: 'Now'
+label: 'Crop Now'
-name: 'GropLeftNowButton'
+name: 'CropLeftNowButton'
-layout: (LayoutFrame 133 0 21 0 187 0 50 0)
+layout: (LayoutFrame 133 0 21 0 232 0 50 0)
-activeHelpKey: gropLeft
+activeHelpKey: cropLeft
 translateLabel: true
 resizeForLabel: true
 tabable: true
-model: gropLeftNow
+model: cropLeftNow
 autoRepeat: true
 usePreferredWidth: true
 )
 (LabelSpec
 label: 'Right:'
-name: 'GropRightLabel'
+name: 'CropRightLabel'
 layout: (LayoutFrame 14 0 55 0 90 0 77 0)
-activeHelpKey: gropRight
+activeHelpKey: cropRight
 translateLabel: true
 adjust: left
 )
 (InputFieldSpec
-name: 'GropRightEntryField'
+name: 'CropRightEntryField'
 layout: (LayoutFrame 95 0 55 0 125 0 77 0)
-activeHelpKey: gropRight
+activeHelpKey: cropRight
 tabable: true
-model: gropRightAmount
+model: cropRightAmount
 type: number
 acceptChannel: acceptChannel
 acceptOnPointerLeave: false
 )
 (ActionButtonSpec
-label: 'Now'
+label: 'Crop Now'
-name: 'GropRightButton'
+name: 'CropRightButton'
-layout: (LayoutFrame 133 0 51 0 187 0 80 0)
+layout: (LayoutFrame 133 0 51 0 232 0 80 0)
-activeHelpKey: gropRight
+activeHelpKey: cropRight
 translateLabel: true
 resizeForLabel: true
 tabable: true
-model: gropRightNow
+model: cropRightNow
 autoRepeat: true
 usePreferredWidth: true
 )
 (LabelSpec
 label: 'Top:'
-name: 'GropTopLabel'
+name: 'CropTopLabel'
 layout: (LayoutFrame 14 0 85 0 90 0 107 0)
-activeHelpKey: gropTop
+activeHelpKey: cropTop
 translateLabel: true
 adjust: left
 )
 (InputFieldSpec
-name: 'GropTopEntryField'
+name: 'CropTopEntryField'
 layout: (LayoutFrame 95 0 85 0 125 0 107 0)
-activeHelpKey: gropTop
+activeHelpKey: cropTop
 tabable: true
-model: gropTopAmount
+model: cropTopAmount
 type: number
 acceptChannel: acceptChannel
 acceptOnPointerLeave: false
 )
 (ActionButtonSpec
-label: 'Now'
+label: 'Crop Now'
-name: 'GropTopButton'
+name: 'CropTopButton'
-layout: (LayoutFrame 133 0 81 0 187 0 110 0)
+layout: (LayoutFrame 133 0 81 0 232 0 110 0)
-activeHelpKey: gropTop
+activeHelpKey: cropTop
 translateLabel: true
 resizeForLabel: true
 tabable: true
-model: gropTopNow
+model: cropTopNow
 autoRepeat: true
 usePreferredWidth: true
 )
 (LabelSpec
 label: 'Bottom:'
-name: 'GropBottomLabel'
+name: 'CropBottomLabel'
 layout: (LayoutFrame 14 0 115 0 90 0 137 0)
-activeHelpKey: gropBottom
+activeHelpKey: cropBottom
 translateLabel: true
 adjust: left
 )
 (InputFieldSpec
-name: 'GropBottomEntryField'
+name: 'CropBottomEntryField'
 layout: (LayoutFrame 95 0 115 0 125 0 137 0)
-activeHelpKey: gropBottom
+activeHelpKey: cropBottom
 tabable: true
-model: gropBottomAmount
+model: cropBottomAmount
 type: number
 acceptChannel: acceptChannel
 acceptOnPointerLeave: false
 )
 (ActionButtonSpec
-label: 'Now'
+label: 'Crop Now'
-name: 'GropBottomButton'
+name: 'CropBottomButton'
-layout: (LayoutFrame 133 0 111 0 187 0 140 0)
+layout: (LayoutFrame 133 0 111 0 232 0 140 0)
-activeHelpKey: gropBottom
+activeHelpKey: cropBottom
 translateLabel: true
 resizeForLabel: true
 tabable: true
-model: gropBottomNow
+model: cropBottomNow
 autoRepeat: true
 usePreferredWidth: true
 )
 (ActionButtonSpec
 label: 'Crop All'
 name: 'Button4'
 layout: (LayoutFrame 133 0 148 0 237 0 176 0)
-activeHelpKey: gropAll
+activeHelpKey: cropAll
-visibilityChannel: cropBoxIsNotDialog
 translateLabel: true
 resizeForLabel: true
 tabable: true
 model: applyCropAction
 )
 (HorizontalPanelViewSpec
 name: 'HorizontalPanel1'
-layout: (LayoutFrame 0 0.0 -30 1 -16 1.0 0 1)
+layout: (LayoutFrame 0 0.0 -30 1 0 1.0 0 1)
 visibilityChannel: cropBoxIsDialog
 horizontalLayout: fitSpace
 verticalLayout: center
 horizontalSpace: 3
 verticalSpace: 3
 name: 'Button1'
 translateLabel: true
 resizeForLabel: true
 tabable: true
 model: cancel
-extent: (Point 110 28)
+extent: (Point 116 28)
 )
 (ActionButtonSpec
 label: 'Apply'
 name: 'Button3'
 translateLabel: true
 resizeForLabel: true
 tabable: true
 model: applyCropAction
-extent: (Point 111 28)
+extent: (Point 116 28)
 )
 (ActionButtonSpec
 label: 'OK'
 name: 'Button2'
 translateLabel: true
 resizeForLabel: true
 tabable: true
 model: accept
-extent: (Point 111 28)
+extent: (Point 116 28)
 )
 )
 )
-keepSpaceForOSXResizeHandleH: true
-)
-(LabelSpec
-label: 'Floodfill Tolerance:'
-name: 'Label1'
-layout: (LayoutFrame 14 0 192 0 242 0 214 0)
-activeHelpKey: floodFillMaxError
-visibilityChannel: cropBoxIsNotDialog
-translateLabel: true
-adjust: left
-)
-(LabelSpec
-label: 'Hue:'
-name: 'Label2'
-layout: (LayoutFrame 51 0 220 0 127 0 242 0)
-activeHelpKey: floodFillMaxError
-visibilityChannel: cropBoxIsNotDialog
-translateLabel: true
-adjust: left
-)
-(InputFieldSpec
-name: 'EntryField2'
-layout: (LayoutFrame 132 0 220 0 190 0 242 0)
-activeHelpKey: floodFillMaxError
-visibilityChannel: cropBoxIsNotDialog
-tabable: true
-model: floodFillMaxHueError
-type: number
-acceptChannel: acceptChannel
-acceptOnPointerLeave: true
-)
-(LabelSpec
-label: 'Light:'
-name: 'Label3'
-layout: (LayoutFrame 51 0 246 0 127 0 268 0)
-activeHelpKey: floodFillMaxError
-visibilityChannel: cropBoxIsNotDialog
-translateLabel: true
-adjust: left
-)
-(InputFieldSpec
-name: 'EntryField3'
-layout: (LayoutFrame 132 0 246 0 190 0 268 0)
-activeHelpKey: floodFillMaxError
-visibilityChannel: cropBoxIsNotDialog
-tabable: true
-model: floodFillMaxLightError
-type: number
-acceptChannel: acceptChannel
-acceptOnPointerLeave: true
 )
 )
 )
 )
 )
 )
 )
 )
+!
+floodFillToleranceSpec
+"This resource specification was automatically generated
+by the UIPainter of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIPainter may not be able to read the specification."
+"
+UIPainter new openOnClass:ImageEditor andSelector:#floodFillToleranceSpec
+ImageEditor new openInterface:#floodFillToleranceSpec
+"
+<resource: #canvas>
+^
+#(FullSpec
+name: floodFillToleranceSpec
+window:
+(WindowSpec
+label: 'Flood Fill Tolerance'
+name: 'Flood Fill Tolerance'
+min: (Point 10 10)
+bounds: (Rectangle 0 0 364 312)
+)
+component:
+(SpecCollection
+collection: (
+(LabelSpec
+label: 'Flood Fill Tolerance:'
+name: 'Label1'
+layout: (LayoutFrame 14 0 10 0 242 0 32 0)
+activeHelpKey: floodFillMaxError
+visibilityChannel: cropBoxIsNotDialog
+translateLabel: true
+adjust: left
+)
+(LabelSpec
+label: 'Hue:'
+name: 'Label2'
+layout: (LayoutFrame 51 0 38 0 127 0 60 0)
+activeHelpKey: floodFillMaxError
+visibilityChannel: cropBoxIsNotDialog
+translateLabel: true
+adjust: left
+)
+(InputFieldSpec
+name: 'EntryField2'
+layout: (LayoutFrame 132 0 38 0 190 0 60 0)
+activeHelpKey: floodFillMaxError
+visibilityChannel: cropBoxIsNotDialog
+tabable: true
+model: floodFillMaxHueError
+type: number
+acceptChannel: acceptChannel
+acceptOnPointerLeave: true
+)
+(LabelSpec
+label: 'Light:'
+name: 'Label3'
+layout: (LayoutFrame 51 0 64 0 127 0 86 0)
+activeHelpKey: floodFillMaxError
+visibilityChannel: cropBoxIsNotDialog
+translateLabel: true
+adjust: left
+)
+(InputFieldSpec
+name: 'EntryField3'
+layout: (LayoutFrame 132 0 64 0 190 0 86 0)
+activeHelpKey: floodFillMaxError
+visibilityChannel: cropBoxIsNotDialog
+tabable: true
+model: floodFillMaxLightError
+type: number
+acceptChannel: acceptChannel
+acceptOnPointerLeave: true
+)
+(HorizontalPanelViewSpec
+name: 'HorizontalPanel1'
+layout: (LayoutFrame 0 0.0 -30 1 0 1.0 0 1)
+visibilityChannel: cropBoxIsDialog
+horizontalLayout: fitSpace
+verticalLayout: center
+horizontalSpace: 3
+verticalSpace: 3
+reverseOrderIfOKAtLeft: true
+component:
+(SpecCollection
+collection: (
+(ActionButtonSpec
+label: 'Cancel'
+name: 'Button1'
+translateLabel: true
+resizeForLabel: true
+tabable: true
+model: cancel
+extent: (Point 116 28)
+)
+(ActionButtonSpec
+label: 'Apply'
+name: 'Button3'
+translateLabel: true
+resizeForLabel: true
+tabable: true
+model: applyCropAction
+extent: (Point 116 28)
+)
+(ActionButtonSpec
+label: 'OK'
+name: 'Button2'
+translateLabel: true
+resizeForLabel: true
+tabable: true
+model: accept
+extent: (Point 116 28)
+)
+)
+)
+)
+)
+)
+)
 !
 shiftDialogSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 )
 )
 !
-uncropDialogSpec
+uncropSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the UIPainter may not be able to read the specification."
 "
-UIPainter new openOnClass:ImageEditor andSelector:#uncropDialogSpec
+UIPainter new openOnClass:ImageEditor andSelector:#uncropSpec
-ImageEditor new openInterface:#uncropDialogSpec
+ImageEditor new openInterface:#uncropSpec
 "
 <resource: #canvas>
 ^
 #(FullSpec
-name: uncropDialogSpec
+name: uncropSpec
 window:
 (WindowSpec
 label: 'Add Border(s)'
 name: 'Add Border(s)'
 min: (Point 10 10)
 max: (Point 800 478)
 bounds: (Rectangle 0 0 261 228)
 )
 component:
 (SpecCollection
 collection: (
 (LabelSpec
 label: 'Left:'
 name: 'Label1'
 layout: (LayoutFrame 14 0 21 0 90 0 43 0)
 translateLabel: true
 adjust: right
 )
 (InputFieldSpec
 name: 'EntryField1'
 layout: (LayoutFrame 95 0 21 0 132 0 43 0)
-model: gropLeftAmount
+model: cropLeftAmount
 type: number
 acceptOnPointerLeave: false
 )
 (LabelSpec
 label: 'Right:'
 name: 'Label2'
 layout: (LayoutFrame 14 0 51 0 90 0 73 0)
 translateLabel: true
 adjust: right
 )
 (InputFieldSpec
 name: 'EntryField2'
 layout: (LayoutFrame 95 0 51 0 132 0 73 0)
-model: gropRightAmount
+model: cropRightAmount
 type: number
 acceptOnPointerLeave: false
 )
 (LabelSpec
 label: 'Top:'
 name: 'Label3'
 layout: (LayoutFrame 14 0 81 0 90 0 103 0)
 translateLabel: true
 adjust: right
 )
 (InputFieldSpec
 name: 'EntryField3'
 layout: (LayoutFrame 95 0 81 0 132 0 103 0)
-model: gropTopAmount
+model: cropTopAmount
 type: number
 acceptOnPointerLeave: false
 )
 (LabelSpec
 label: 'Bottom:'
 name: 'Label4'
 layout: (LayoutFrame 14 0 111 0 90 0 133 0)
 translateLabel: true
 adjust: right
 )
 (InputFieldSpec
 name: 'EntryField4'
 layout: (LayoutFrame 95 0 111 0 132 0 133 0)
-model: gropBottomAmount
+model: cropBottomAmount
 type: number
 acceptOnPointerLeave: false
 )
 (HorizontalPanelViewSpec
 name: 'HorizontalPanel1'
 layout: (LayoutFrame 0 0.0 -30 1 0 1.0 0 1)
 horizontalLayout: fitSpace
 verticalLayout: center
 horizontalSpace: 3
 verticalSpace: 3
 reverseOrderIfOKAtLeft: true
 component:
 (SpecCollection
 collection: (
 (ActionButtonSpec
 label: 'Cancel'
 name: 'Button1'
 translateLabel: true
 model: cancel
-extent: (Point 118 22)
+extent: (Point 124 22)
-)
-(ActionButtonSpec
-label: 'OK'
-name: 'Button2'
-translateLabel: true
-model: accept
-extent: (Point 118 22)
-)
 )
+(ActionButtonSpec
-)
+label: 'OK'
-)
+name: 'Button2'
+translateLabel: true
+model: accept
+extent: (Point 125 22)
+)
+)
+)
 )
+)
-)
 )
+)
-"Modified: / 13-02-2017 / 14:53:08 / cg"
 !
 windowSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 (ViewSpec
 name: 'ColorAnCropBox'
 component:
 (SpecCollection
 collection: (
+(TabViewSpec
+name: 'TabHeader1'
+layout: (LayoutFrame 0 0 0 0 0 1 36 0)
+model: colorCropTabSelectionIndexHolder
+menu: colorCropTabLabelList
+useIndex: true
+translateLabel: true
+)
+(ViewSpec
+name: 'ColorBox'
+layout: (LayoutFrame 0 0 36 0 0 1 0 1)
+visibilityChannel: colorBoxVisibleHolder
+component:
+(SpecCollection
+collection: (
+(MenuPanelSpec
+name: 'MouseButtonColorToolBar'
+layout: (LayoutFrame 0 0.0 0 0 0 1.0 24 0)
+level: 0
+menu: menuMouseButtonColors
+)
+(DataSetSpec
+name: 'colorDataSetView'
+layout: (LayoutFrame 0 0.0 26 0.0 0 1.0 0 1.0)
+activeHelpKey: colorMapTable
+style: (FontDescription helvetica medium roman 10)
+model: selectedColors
+menu: colorMapMenu
+hasHorizontalScrollBar: true
+hasVerticalScrollBar: true
+miniScrollerHorizontal: true
+miniScrollerVertical: true
+dataList: listOfColors
+has3Dseparators: true
+doubleClickSelector: doubleClickOnColor:
+columnHolder: colorTableColumns
+multipleSelectOk: true
+verticalSpacing: 1
+columnAdaptor: colorColumnAdaptor
+)
+)
+)
+)
+(ViewSpec
+name: 'FloodFillBox'
+layout: (LayoutFrame 0 0 36 0 0 1 0 1)
+visibilityChannel: floodFillBoxVisibleHolder
+component:
+(SpecCollection
+collection: (
+(UISubSpecification
+name: 'SubSpecification2'
+layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+minorKey: floodFillToleranceSpec
+)
+)
+)
+)
 (ViewSpec
 name: 'CropBox'
-layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+layout: (LayoutFrame 0 0 36 0 0 1 0 1)
 visibilityChannel: cropBoxVisibleHolder
 component:
 (SpecCollection
 collection: (
 (UISubSpecification
 name: 'SubSpecification1'
 layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-minorKey: cropDialogSpec
+minorKey: cropSpec
 )
 )
 )
-)
-(MenuPanelSpec
-name: 'MouseButtonColorToolBar'
-layout: (LayoutFrame 0 0.0 0 0 0 1.0 24 0)
-level: 0
-visibilityChannel: colorBoxVisibleHolder
-menu: menuMouseButtonColors
-)
-(DataSetSpec
-name: 'colorDataSetView'
-layout: (LayoutFrame 0 0.0 26 0.0 0 1.0 0 1.0)
-activeHelpKey: colorMapTable
-style: (FontDescription helvetica medium roman 10)
-visibilityChannel: colorBoxVisibleHolder
-model: selectedColors
-menu: colorMapMenu
-hasHorizontalScrollBar: true
-hasVerticalScrollBar: true
-miniScrollerHorizontal: true
-miniScrollerVertical: true
-dataList: listOfColors
-has3Dseparators: true
-doubleClickSelector: doubleClickOnColor:
-columnHolder: colorTableColumns
-multipleSelectOk: true
-verticalSpacing: 1
-columnAdaptor: colorColumnAdaptor
 )
 )
 )
 )
 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:#menuEdit
 (Menu new fromLiteralArrayEncoding:(ImageEditor menuEdit)) startUp
 "
 (MenuItem
 activeHelpKey: editUndo
 enabled: canUndoHolder
 label: 'Undo'
 itemValue: doUndo
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 enabled: imageIsLoadedHolder
 label: 'Copy to Clipboard'
 itemValue: doCopyImageToClipboard
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: editResize
 enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 label: 'Resize...'
 itemValue: doResizeImage
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editMagnifyImage
 enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 label: 'Magnify...'
 itemValue: doMagnifyImage
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editMagnifyImage
 enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 label: 'Magnify By...'
 itemValue: doMagnifyImageBy
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editRotate
 enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 label: 'Rotate...'
 itemValue: doRotateImage
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: edit3DProjection
 enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 label: '3D Projection...'
 itemValue: do3DProjection
-translateLabel: true
 )
 (MenuItem
 enabled: imageIsLoadedAndAllowedToFlipHolder
 label: 'Flip'
-translateLabel: true
 submenu:
 (Menu
 (
 (MenuItem
 activeHelpKey: editFlipVertical
 enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Flip - Vertical'
 itemValue: doFlipVertical
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor flipVerticalIcon 'Flip - Vertical')
 )
 (MenuItem
 activeHelpKey: editFlipHorizontal
 enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Flip - Horizontal'
 itemValue: doFlipHorizontal
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor flipHorizontalIcon 'Flip - Horizontal')
 )
 )
 nil
 nil
 label: '-'
 )
 (MenuItem
 enabled: imageIsLoadedAndAllowedToChangeImageDimension
 label: 'Crop'
-translateLabel: true
 submenu:
 (Menu
 (
 (MenuItem
 activeHelpKey: cropManual
 label: 'Manual...'
 itemValue: doCropManual
-translateLabel: true
+isVisible: false
 )
 (MenuItem
 label: '-'
+isVisible: false
 )
 (MenuItem
 activeHelpKey: cropAll
 label: 'All'
 itemValue: doCropAll
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: cropLeft
 label: 'Left'
 itemValue: doCropLeft
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: cropRight
 label: 'Right'
 itemValue: doCropRight
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: cropTop
 label: 'Top'
 itemValue: doCropTop
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: cropBottom
 label: 'Bottom'
 itemValue: doCropBottom
-translateLabel: true
 )
 )
 nil
 nil
 )
 (MenuItem
 activeHelpKey: uncropManual
 enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 label: 'Uncrop (Add Border)...'
 itemValue: doUnCropManual
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: shiftManual
 enabled: imageIsLoadedAndAllowedToChangeImageDimension
 label: 'Shift...'
 itemValue: doShiftManual
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: fileEditMask
 enabled: hasMaskHolder
 label: 'Edit Mask'
 itemValue: doEditMask
-translateLabel: true
 )
 (MenuItem
 enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Text...'
 itemValue: doInsertTextFromUser
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 enabled: imageIsLoadedHolder
 label: 'Animation Sequence'
-translateLabel: true
 submenu:
 (Menu
 (
 (MenuItem
 enabled: imageHasNextImageHolder
 label: 'Next in Sequence'
 itemValue: nextImageInSequence
-translateLabel: true
 )
 (MenuItem
 enabled: imageHasPreviousImageHolder
 label: 'Previous in Sequence'
 itemValue: previousImageInSequence
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 enabled: imageHasImageSequenceHolder
 label: 'Edit each from Sequence'
 itemValue: editEachImageFromSequence
-translateLabel: true
 )
 )
 nil
 nil
 )
 )
 )
 nil
 nil
 )
-"Modified: / 18-02-2017 / 00:41:45 / cg"
 !
 menuFile
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 ].
 ^ imagePreViewSubViews first
 ! !
+!ImageEditor methodsFor:'actions'!
+applyCropAction
+self cropLeft:(self cropLeftAmount value) right:(self cropRightAmount value)
+top:(self cropTopAmount value) bottom:(self cropBottomAmount value)
+"Created: / 17-02-2017 / 14:34:35 / cg"
+"Modified: / 19-02-2017 / 15:11:41 / cg"
+!
+cropBottomNow
+self cropLeft:0 right:0 top:0 bottom:(self cropBottomAmount value)
+"Created: / 19-02-2017 / 15:07:36 / cg"
+!
+cropLeft:left right:right top:top bottom:bottom
+|img|
+img := imageEditView image.
+img isNil ifTrue:[^ self].
+true "firstChange" ifTrue:[
+imageEditView makeUndo.
+"/ firstChange := false.
+].
+imageEditView
+makeSubImageX:left y:top
+width:(img width - left - right)
+height:(img height - top - bottom).
+self updateImagePreView.
+self updateInfoLabel
+"Created: / 19-02-2017 / 15:07:58 / cg"
+!
+cropLeftNow
+self cropLeft:(self cropLeftAmount value) right:0 top:0 bottom:0
+"Created: / 19-02-2017 / 15:08:06 / cg"
+!
+cropRightNow
+self cropLeft:0 right:(self cropRightAmount value) top:0 bottom:0
+"Created: / 19-02-2017 / 15:08:12 / cg"
+!
+cropTopNow
+self cropLeft:0 right:0 top:(self cropTopAmount value) bottom:0
+"Created: / 19-02-2017 / 15:08:29 / cg"
+! !
 !ImageEditor methodsFor:'aspects'!
 activityInfoHolder
 ^ self infoLabelHolder
 ^ self
 "Created: / 26.7.1998 / 12:17:03 / cg"
 !
+colorCropTabLabelList
+^ resources array:(self colorCropTabSpecList collect:#first)
+"Created: / 19-02-2017 / 14:58:25 / cg"
+!
+colorCropTabSelectionIndexHolder
+|holder|
+(holder := builder bindingAt:#colorCropTabSelectionIndexHolder) isNil ifTrue:[
+builder aspectAt:#colorCropTabSelectionIndexHolder put:(holder := 1 asValue).
+holder onChangeSend:#colorCropTabSelectionIndexChanged to:self.
+].
+^ holder
+"Created: / 19-02-2017 / 14:59:11 / cg"
+!
+colorCropTabSpecList
+^ #(
+('Colors' colors)
+('Crop'   crop)
+('Fill'   fill)
+)
+"Created: / 19-02-2017 / 15:34:33 / cg"
+!
+colorCropTabSymbolList
+^ self colorCropTabSpecList collect:#second
+"Created: / 19-02-2017 / 15:34:54 / cg"
+!
+cropBottomAmount
+^ builder valueAspectFor:'cropBottomAmount' initialValue:1
+"Created: / 19-02-2017 / 15:09:09 / cg"
+!
 cropBoxIsDialog
-^ true
+^ false
 "Created: / 03-02-2017 / 11:23:50 / cg"
+"Modified: / 19-02-2017 / 15:24:07 / cg"
 !
 cropBoxIsNotDialog
 ^ self cropBoxIsDialog not
 builder aspectAt:#cropBoxVisibleHolder put:(holder := false asValue).
 ].
 ^ holder
 "Created: / 03-02-2017 / 11:20:13 / cg"
+!
+cropLeftAmount
+^ builder valueAspectFor:'cropLeftAmount' initialValue:1
+"Created: / 19-02-2017 / 15:09:23 / cg"
+!
+cropRightAmount
+^ builder valueAspectFor:'cropRightAmount' initialValue:1
+"Created: / 19-02-2017 / 15:09:29 / cg"
+!
+cropTopAmount
+^ builder valueAspectFor:'cropTopAmount' initialValue:1
+"Created: / 19-02-2017 / 15:09:35 / cg"
+!
+floodFillBoxVisibleHolder
+|holder|
+(holder := builder bindingAt:#floodFillBoxVisibleHolder) isNil ifTrue:[
+builder aspectAt:#floodFillBoxVisibleHolder put:(holder := false asValue).
+].
+^ holder
+"Created: / 19-02-2017 / 15:28:40 / cg"
 !
 floodFillMaxHueError
 |holder|
 ^ holder
 "Modified: / 04-07-2010 / 10:15:14 / cg"
 !
-imageIsLoadedAndAllowedToChangeImageDimension
-"returns whether an image is loaded as value holder"
-^ [
-self imageIsLoadedHolder value
-and:[ self allowedToChangeImageDimension ]
-]
-"Created: / 16-02-2017 / 01:58:41 / cg"
-!
-imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
-"returns whether an image is loaded as value holder"
-^ [
-self imageIsLoadedHolder value
-and:[ self allowedToChangeImageDimensionAndDepth ]
-]
-"Modified: / 04-07-2010 / 10:15:43 / cg"
-!
-imageIsLoadedAndClassDefined
-"returns whether an image is loaded as value holder"
-^ [self hasClassAndSelectorDefinedHolder value
-and:[self imageIsLoadedHolder value]]
-"Created: / 31-07-1998 / 02:04:18 / cg"
-"Modified: / 04-07-2010 / 10:15:48 / cg"
-!
-imageIsLoadedAndNotReadonlyHolder
-"returns whether an image is loaded and editable as value holder"
-^ BlockValue
-with:[:loaded | loaded and:[ self readOnly not ]]
-argument:(self imageIsLoadedHolder)
-"Modified: / 16-02-2017 / 12:11:31 / cg"
-!
-imageIsLoadedHolder
-"returns whether an image is loaded as value holder"
-|holder|
-(holder := builder bindingAt:#imageIsLoaded) isNil ifTrue:[
-builder aspectAt:#imageIsLoaded put:(holder :=  false asValue).
-].
-^ holder
-"Created: / 04-07-2010 / 10:15:38 / cg"
-!
 listOfColors
 "returns the list of colors"
 |list|
 self obsoleteMethodWarning:'stupid method name - use #magnificationHolder'.
 ^ self magnificationHolder
 ! !
 !ImageEditor methodsFor:'change & update'!
+colorCropTabSelectionIndexChanged
+|selIndex sym|
+selIndex := self colorCropTabSelectionIndexHolder value.
+sym := self colorCropTabSymbolList at:selIndex.
+self colorBoxVisibleHolder value:(sym == #colors).
+self cropBoxVisibleHolder value:(sym == #crop).
+self floodFillBoxVisibleHolder value:(sym == #fill).
+"Created: / 19-02-2017 / 15:01:05 / cg"
+!
 findColorMapMode
 "finds the colorMapMode for a new image"
 |image newListOfColors colorMapModeKey drawColor1 drawColor2 someOrAllUsedColors|
 ^ self imageIsLoadedAndNotReadonlyHolder
 "Created: / 16-02-2017 / 01:44:47 / cg"
 !
+imageIsLoadedAndAllowedToChangeImageDimension
+"returns whether an image is loaded as value holder"
+^ [
+self imageIsLoadedHolder value
+and:[ self allowedToChangeImageDimension ]
+]
+"Created: / 16-02-2017 / 01:58:41 / cg"
+!
+imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
+"returns whether an image is loaded as value holder"
+^ [
+self imageIsLoadedHolder value
+and:[ self allowedToChangeImageDimensionAndDepth ]
+]
+"Modified: / 04-07-2010 / 10:15:43 / cg"
+!
 imageIsLoadedAndAllowedToFlipHolder
 ^ self imageIsLoadedAndNotReadonlyHolder
 "Created: / 16-02-2017 / 01:57:02 / cg"
+!
+imageIsLoadedAndClassDefined
+"returns whether an image is loaded as value holder"
+^ [self hasClassAndSelectorDefinedHolder value
+and:[self imageIsLoadedHolder value]]
+"Created: / 31-07-1998 / 02:04:18 / cg"
+"Modified: / 04-07-2010 / 10:15:48 / cg"
+!
+imageIsLoadedAndNotReadonlyHolder
+"returns whether an image is loaded and editable as value holder"
+^ BlockValue
+with:[:loaded | loaded and:[ self readOnly not ]]
+argument:(self imageIsLoadedHolder)
+"Modified: / 16-02-2017 / 12:11:31 / cg"
+!
+imageIsLoadedHolder
+"returns whether an image is loaded as value holder"
+|holder|
+(holder := builder bindingAt:#imageIsLoaded) isNil ifTrue:[
+builder aspectAt:#imageIsLoaded put:(holder :=  false asValue).
+].
+^ holder
+"Created: / 04-07-2010 / 10:15:38 / cg"
 ! !
 !ImageEditor methodsFor:'menu item visibility'!
 isNotStandAloneAndMethodSaveAndLoadMenuItemsVisible
 !
 doCropManual
 "let user specify borders and cut them off"
-|bindings left top right bottom img firstChange gropAction acceptChannel|
+|bindings left top right bottom img firstChange cropAction acceptChannel|
 acceptChannel := TriggerValue new.
 firstChange := true.
-gropAction :=
+cropAction :=
 [:lV :rV :tV :bV | |l r t b|
 acceptChannel value:true.
 l := lV value.
 r := rV value.
 self updateInfoLabel
 ].
 ].
 bindings := IdentityDictionary new.
-bindings at:#gropLeftAmount put:(left := 1 asValue).
+bindings at:#cropLeftAmount put:(left := 1 asValue).
-bindings at:#gropRightAmount put:(right := 1 asValue).
+bindings at:#cropRightAmount put:(right := 1 asValue).
-bindings at:#gropTopAmount put:(top := 1 asValue).
+bindings at:#cropTopAmount put:(top := 1 asValue).
-bindings at:#gropBottomAmount put:(bottom := 1 asValue).
+bindings at:#cropBottomAmount put:(bottom := 1 asValue).
 bindings at:#acceptChannel put:acceptChannel.
-bindings at:#gropLeftNow   put:[ gropAction value:left value:0 value:0 value:0 ].
+bindings at:#cropLeftNow   put:[ cropAction value:left value:0 value:0 value:0 ].
-bindings at:#gropRightNow  put:[ gropAction value:0 value:right value:0 value:0 ].
+bindings at:#cropRightNow  put:[ cropAction value:0 value:right value:0 value:0 ].
-bindings at:#gropTopNow    put:[ gropAction value:0 value:0 value:top value:0 ].
+bindings at:#cropTopNow    put:[ cropAction value:0 value:0 value:top value:0 ].
-bindings at:#gropBottomNow put:[ gropAction value:0 value:0 value:0 value:bottom ].
+bindings at:#cropBottomNow put:[ cropAction value:0 value:0 value:0 value:bottom ].
-bindings at:#applyCropAction   put:[ gropAction value:left value:right value:top value:bottom ].
+bindings at:#applyCropAction   put:[ cropAction value:left value:right value:top value:bottom ].
+bindings at:#cropBoxIsDialog   put:true.
-(self openDialogInterface:#cropDialogSpec withBindings:bindings)
+(self openDialogInterface:#cropSpec withBindings:bindings)
 ifFalse:[
 firstChange ~~ true ifTrue:[
 imageEditView undo.
 self updateImagePreView.
 ]
 ].
 "Created: / 07-09-1998 / 18:16:07 / cg"
-"Modified: / 17-02-2017 / 14:33:19 / cg"
+"Modified: / 19-02-2017 / 15:43:50 / cg"
 !
 doCropRight
 "find a right border and cut it off"
 !
 doUnCropManual
 "let user specify borders and add them"
-|bindings left top right bottom img|
+|bindings leftAmount topAmount rightAmount bottomAmount img|
 bindings := IdentityDictionary new.
-bindings at:#gropLeftAmount put:(left := 1 asValue).
+bindings at:#cropLeftAmount put:(leftAmount := 1 asValue).
-bindings at:#gropRightAmount put:(right := 1 asValue).
+bindings at:#cropRightAmount put:(rightAmount := 1 asValue).
-bindings at:#gropTopAmount put:(top := 1 asValue).
+bindings at:#cropTopAmount put:(topAmount := 1 asValue).
-bindings at:#gropBottomAmount put:(bottom := 1 asValue).
+bindings at:#cropBottomAmount  put:(bottomAmount := 1 asValue).
-(self openDialogInterface:#uncropDialogSpec withBindings:bindings)
+bindings at:#cropBoxIsDialog   put:true.
+(self openDialogInterface:#uncropSpec withBindings:bindings)
 ifTrue:[
-left := left value.
+leftAmount := leftAmount value.
-right := right value.
+rightAmount := rightAmount value.
-top := top value.
+topAmount := topAmount value.
-bottom := bottom value.
+bottomAmount := bottomAmount value.
 img := imageEditView image.
 imageEditView
-makeBorderedImageX:left y:top
+makeBorderedImageX:leftAmount y:topAmount
-width:(img width + left + right)
+width:(img width + leftAmount + rightAmount)
-height:(img height + top + bottom).
+height:(img height + topAmount + bottomAmount).
 self updateInfoLabel
 ].
 "Created: / 07-09-1998 / 18:16:07 / cg"
-"Modified: / 13-02-2017 / 14:51:35 / cg"
+"Modified: / 19-02-2017 / 15:31:00 / cg"
 !
 doUndo
 "reverses last edit action"

changeset 3413	52d0f1ff020d
parent 3412	bd8ab9274cbd
child 3415	b93299ad5142