diff -r a1b6dd87aba4 -r 403172bbe664 ImageEditor.st --- a/ImageEditor.st Sat Jan 18 21:15:14 2020 +0100 +++ b/ImageEditor.st Sun Jan 19 00:44:19 2020 +0100 @@ -14,16 +14,16 @@ "{ NameSpace: Smalltalk }" ResourceSpecEditor subclass:#ImageEditor - instanceVariableNames:'imageEditView colorMapMode editMode mouseKeyColorMode - selectedColorIndex postOpenAction imageSeqNr drawingColormap - lastShiftUsedWrap lastGrabbedScreenArea - allowedToChangeImageDimensionAndDepth savedImage savedFile' - classVariableNames:'DefaultRelativeSizes LastColormapMode LastDirectory - LastSizeString LastURL MaskClipboard LastDepth - LastNumThresholdGrayColors LastMagnifyTo LastMagnifyBy - LastMagnifySmoothing' - poolDictionaries:'' - category:'Interface-UIPainter' + instanceVariableNames:'imageEditView colorMapMode editMode mouseKeyColorMode + selectedColorIndex postOpenAction imageSeqNr drawingColormap + lastShiftUsedWrap lastGrabbedScreenArea + allowedToChangeImageDimensionAndDepth savedImage savedFile' + classVariableNames:'DefaultRelativeSizes LastColormapMode LastDirectory + LastSizeString LastURL MaskClipboard LastDepth + LastNumThresholdGrayColors LastMagnifyTo LastMagnifyBy + LastMagnifySmoothing' + poolDictionaries:'' + category:'Interface-UIPainter' ! !ImageEditor class methodsFor:'documentation'! @@ -2490,31 +2490,25 @@ ^ #(FullSpec name: windowSpec - uuid: 'ea3a8340-1e4a-11b2-83b1-485b39758412' + uuid: '8aeadbb6-3a4a-11ea-a4b6-10ddb1cc5928' window: (WindowSpec label: 'Image Editor' name: 'Image Editor' uuid: 'ea3a8bec-1e4a-11b2-83b1-485b39758412' - min: (Point 800 400) - bounds: (Rectangle 0 0 800 446) - menu: menu + min: (Point 100 100) bounds: (Rectangle 0 0 800 446) menu: menu icon: defaultIcon - ) - component: + ) component: (SpecCollection collection: ( (MenuPanelSpec name: 'menuToolbarView' - layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0) - style: (FontDescription helvetica medium roman 10 #'iso10646-1' nil nil) - uuid: 'ea3a98c6-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0) style: (FontDescription helvetica medium roman 10 #'iso10646-1' nil nil) uuid: 'ea3a98c6-1e4a-11b2-83b1-485b39758412' menu: menuToolbar - ) + ) (VariableHorizontalPanelSpec name: 'mainPanel' - layout: (LayoutFrame 0 0.0 34 0.0 0 1.0 -26 1.0) - uuid: 'ea3a9eca-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0.0 34 0.0 0 1.0 -26 1.0) uuid: 'ea3a9eca-1e4a-11b2-83b1-485b39758412' snapMode: both barLevel: 0 component: @@ -2529,8 +2523,7 @@ collection: ( (VariableVerticalPanelSpec name: 'verticalPanel' - layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) - uuid: 'ea3aa672-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) uuid: 'ea3aa672-1e4a-11b2-83b1-485b39758412' level: 0 snapMode: both component: @@ -2544,42 +2537,37 @@ collection: ( (TabViewSpec name: 'TabHeader1' - layout: (LayoutFrame 0 0 0 0 0 1 36 0) - uuid: 'ea3aab9a-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 0 0 0 1 36 0) uuid: 'ea3aab9a-1e4a-11b2-83b1-485b39758412' model: colorCropTabSelectionIndexHolder menu: colorCropTabLabelList useIndex: true translateLabel: true - ) + ) (ViewSpec name: 'ColorBox' - layout: (LayoutFrame 0 0 36 0 0 1 0 1) - uuid: 'ea3ab0ae-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 36 0 0 1 0 1) uuid: 'ea3ab0ae-1e4a-11b2-83b1-485b39758412' visibilityChannel: colorBoxVisibleHolder component: (SpecCollection collection: ( (MenuPanelSpec name: 'MouseButtonColorToolBar' - layout: (LayoutFrame 0 0.0 0 0 0 1.0 24 0) - uuid: 'ea3ab2d4-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0.0 0 0 0 1.0 24 0) uuid: 'ea3ab2d4-1e4a-11b2-83b1-485b39758412' level: 0 menu: menuMouseButtonColors - ) + ) (LabelSpec label: 'Label' name: 'Label1' - layout: (LayoutFrame -160 1 0 0 -104 1 22 0) - activeHelpKey: drawingAlpha + layout: (LayoutFrame -160 1 0 0 -104 1 22 0) activeHelpKey: drawingAlpha uuid: 'ea3ab590-1e4a-11b2-83b1-485b39758412' visibilityChannel: alphaVisibleHolder translateLabel: true labelChannel: alphaText - ) + ) (InputFieldSpec name: 'EntryField1' - layout: (LayoutFrame -106 1 2 0 -56 1 22 0) - activeHelpKey: drawingAlpha + layout: (LayoutFrame -106 1 2 0 -56 1 22 0) activeHelpKey: drawingAlpha uuid: 'ea3aba90-1e4a-11b2-83b1-485b39758412' visibilityChannel: alphaVisibleHolder model: alphaHolder @@ -2590,29 +2578,25 @@ minValue: 0 maxValue: 100 acceptOnPointerLeave: true - ) + ) (ViewSpec name: 'Box1' - layout: (LayoutFrame -40 1.0 4 0 -26 1.0 18 0) - activeHelpKey: drawingColor1 + layout: (LayoutFrame -40 1.0 4 0 -26 1.0 18 0) activeHelpKey: drawingColor1 uuid: 'ea3ac1c0-1e4a-11b2-83b1-485b39758412' level: -1 backgroundChannel: drawingColor1Holder - ) + ) (ViewSpec name: 'Box2' - layout: (LayoutFrame -25 1.0 4 0 -11 1.0 18 0) - activeHelpKey: drawingColor2 + layout: (LayoutFrame -25 1.0 4 0 -11 1.0 18 0) activeHelpKey: drawingColor2 uuid: 'ea3ac418-1e4a-11b2-83b1-485b39758412' level: -1 backgroundChannel: drawingColor2Holder - ) + ) (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 #'iso10646-1' nil nil) - uuid: 'ea3ac652-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0.0 26 0.0 0 1.0 0 1.0) activeHelpKey: colorMapTable + style: (FontDescription helvetica medium roman 10 #'iso10646-1' nil nil) uuid: 'ea3ac652-1e4a-11b2-83b1-485b39758412' model: selectedColors menu: colorMapMenuHolder hasHorizontalScrollBar: true @@ -2626,51 +2610,43 @@ multipleSelectOk: true verticalSpacing: 1 columnAdaptor: colorColumnAdaptor - ) ) - - ) - ) + ) + ) + ) (ViewSpec name: 'FloodFillBox' - layout: (LayoutFrame 0 0 36 0 0 1 0 1) - uuid: 'ea3acfda-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 36 0 0 1 0 1) uuid: 'ea3acfda-1e4a-11b2-83b1-485b39758412' visibilityChannel: floodFillBoxVisibleHolder component: (SpecCollection collection: ( (UISubSpecification name: 'SubSpecification2' - layout: (LayoutFrame 0 0 0 0 0 1 0 1) - uuid: 'ea3ad21e-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 0 0 0 1 0 1) uuid: 'ea3ad21e-1e4a-11b2-83b1-485b39758412' minorKey: floodFillToleranceSpec - ) ) - - ) - ) + ) + ) + ) (ViewSpec name: 'CropBox' - layout: (LayoutFrame 0 0 36 0 0 1 0 1) - uuid: 'ea3ad552-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 36 0 0 1 0 1) uuid: 'ea3ad552-1e4a-11b2-83b1-485b39758412' visibilityChannel: cropBoxVisibleHolder component: (SpecCollection collection: ( (UISubSpecification name: 'SubSpecification1' - layout: (LayoutFrame 0 0 0 0 0 1 0 1) - uuid: 'ea3ad76e-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 0 0 0 1 0 1) uuid: 'ea3ad76e-1e4a-11b2-83b1-485b39758412' minorKey: cropSpec - ) ) - - ) - ) + ) + ) ) - - ) - ) + ) + ) + ) (ArbitraryComponentSpec name: 'imagePreView' activeHelpKey: previewView @@ -2682,16 +2658,13 @@ miniScrollerVertical: false hasBorder: false component: ImageView - ) ) - - ) - handles: (Any 0.5 1.0) - ) + ) + ) handles: (Any 0.5 1.0) ) - - ) - ) + ) + ) + ) (ViewSpec name: 'rightView' uuid: 'ea3ade8a-1e4a-11b2-83b1-485b39758412' @@ -2700,45 +2673,40 @@ collection: ( (MenuPanelSpec name: 'ToolBar1' - layout: (LayoutFrame 0 0 0 0.0 28 0 0 1.0) - uuid: 'ea3ae0b0-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0 0 0.0 28 0 0 1.0) uuid: 'ea3ae0b0-1e4a-11b2-83b1-485b39758412' level: 1 menu: toolsMenuToolbar verticalLayout: true centerItems: true textDefault: true - ) + ) (ViewSpec name: 'editingView' - layout: (LayoutFrame 28 0.0 0 0.0 0 1.0 0 1.0) - uuid: 'ea3ae3bc-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 28 0.0 0 0.0 0 1.0 0 1.0) uuid: 'ea3ae3bc-1e4a-11b2-83b1-485b39758412' level: 1 component: (SpecCollection collection: ( (ArbitraryComponentSpec name: 'imageEditView' - layout: (LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0) - uuid: 'ea3ae5ec-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0) uuid: 'ea3ae5ec-1e4a-11b2-83b1-485b39758412' hasHorizontalScrollBar: true hasVerticalScrollBar: true hasBorder: false component: ImageEditView - ) + ) (LabelSpec name: 'coordLabel' - layout: (LayoutFrame 2 0.0 -22 1 -83 1.0 0 1.0) - uuid: 'ea3ae8da-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 2 0.0 -22 1 -83 1.0 0 1.0) uuid: 'ea3ae8da-1e4a-11b2-83b1-485b39758412' level: -1 translateLabel: true labelChannel: imageInfoHolder resizeForLabel: false adjust: left - ) + ) (ArrowButtonSpec name: 'magnifyDownButton' - layout: (LayoutFrame -80 1 -22 1 -58 1 0 1) - activeHelpKey: magnifyImageDown + layout: (LayoutFrame -80 1 -22 1 -58 1 0 1) activeHelpKey: magnifyImageDown uuid: 'ea3aebd2-1e4a-11b2-83b1-485b39758412' translateLabel: true model: doMagnifyDown @@ -2746,11 +2714,10 @@ isTriggerOnDown: true autoRepeat: true direction: left - ) + ) (ArrowButtonSpec name: 'magnifyUpButton' - layout: (LayoutFrame -24 1 -22 1 -2 1 0 1) - activeHelpKey: magnifyImageUp + layout: (LayoutFrame -24 1 -22 1 -2 1 0 1) activeHelpKey: magnifyImageUp uuid: 'ea3af26c-1e4a-11b2-83b1-485b39758412' translateLabel: true model: doMagnifyUp @@ -2758,11 +2725,10 @@ isTriggerOnDown: true autoRepeat: true direction: right - ) + ) (InputFieldSpec name: 'magnificationInputField' - layout: (LayoutFrame -57 1 -22 1 -26 1 0 1) - activeHelpKey: magnificationNumber + layout: (LayoutFrame -57 1 -22 1 -26 1 0 1) activeHelpKey: magnificationNumber uuid: 'ea3af62c-1e4a-11b2-83b1-485b39758412' enableChannel: imageIsLoadedHolder model: magnificationHolder @@ -2773,31 +2739,25 @@ minValue: 1 maxValue: 99 acceptOnPointerLeave: true - ) ) - - ) - ) + ) + ) ) - - ) - ) - ) - - ) - handles: (Any 0.47999999999999998 1.0) - ) + ) + ) + ) + ) + ) handles: (Any 0.47999999999999998 1.0) + ) (UISubSpecification name: 'infoBarSubSpec' - layout: (LayoutFrame 0 0.0 -24 1 0 1.0 0 1.0) - uuid: 'ea3afaf0-1e4a-11b2-83b1-485b39758412' + layout: (LayoutFrame 0 0.0 -24 1 0 1.0 0 1.0) uuid: 'ea3afaf0-1e4a-11b2-83b1-485b39758412' majorKey: ToolApplicationModel minorKey: windowSpecForInfoBar - ) - ) - - ) - ) + ) + ) + ) + ) ! ! !ImageEditor class methodsFor:'menu specs'!