# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 1512658729 -3600
# Node ID 36cd31bca6a478d70db02ab77c3e5cda6ac73318
# Parent  dce70baa771ef1393628ab0c554c2f1cdf41fb95
#BUGFIX by cg
class: ImageEditor class
changed:
	#helpPairs
	#modeMenu

diff -r dce70baa771e -r 36cd31bca6a4 ImageEditor.st
--- a/ImageEditor.st	Tue Nov 28 19:26:49 2017 +0100
+++ b/ImageEditor.st	Thu Dec 07 15:58:49 2017 +0100
@@ -441,13 +441,13 @@
 'Mask everything outside a Rectangle'
 
 #drawModePaste
-'Paste Mode'
+'Paste-Over Mode (only paste pixels; keep mask as is)'
 
 #drawModePasteUnder
-'Paste-Under Mode'
+'Paste-Under Mode (only paste previously masked pixels)'
 
 #drawModePasteWithMask
-'Paste-with-Mask Mode'
+'Paste-with-Mask Mode (both pixel and mask are pasted)'
 
 #drawModePoint
 'Point Drawing Mode'
@@ -607,7 +607,7 @@
 
 )
 
-    "Modified: / 05-09-2017 / 10:47:35 / cg"
+    "Modified: / 07-12-2017 / 15:32:58 / cg"
 !
 
 helpSpec
@@ -4034,9 +4034,17 @@
             choiceValue: copy
           )
          (MenuItem
+            activeHelpKey: drawModePasteWithMask
+            enabled: imageIsLoadedHolder
+            label: 'Paste with Mask'
+            labelImage: (ResourceRetriever ImageEditor pasteWithMaskIcon 'Paste with Mask')
+            choice: editMode
+            choiceValue: pasteWithMask
+          )
+         (MenuItem
             activeHelpKey: drawModePaste
             enabled: imageIsLoadedHolder
-            label: 'Paste'
+            label: 'Paste Over'
             labelImage: (ResourceRetriever ImageEditor pasteIcon 'Paste')
             choice: editMode
             choiceValue: paste
@@ -4050,14 +4058,6 @@
             choiceValue: pasteUnder
           )
          (MenuItem
-            activeHelpKey: drawModePasteWithMask
-            enabled: imageIsLoadedHolder
-            label: 'Paste with Mask'
-            labelImage: (ResourceRetriever ImageEditor pasteWithMaskIcon 'Paste with Mask')
-            choice: editMode
-            choiceValue: pasteWithMask
-          )
-         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -4073,7 +4073,7 @@
         nil
       )
 
-    "Modified: / 23-02-2017 / 15:53:17 / cg"
+    "Modified: / 07-12-2017 / 15:30:46 / cg"
 !
 
 previewMenu