--- a/ImageEditor.st	Wed Oct 21 10:58:45 2009 +0200
+++ b/ImageEditor.st	Wed Oct 21 11:00:17 2009 +0200
@@ -1646,19 +1646,20 @@
             label: '-'
           )
          (MenuItem
-            enabled: hasColormap
+            enabled: hasColormapAndColorSelected
             label: 'Cut Color'
             itemValue: cutColorFromColormap
             translateLabel: true
             isVisible: false
           )
          (MenuItem
+            enabled: hasColorSelected
             label: 'Copy Color'
             itemValue: copyColorFromColormap
             translateLabel: true
           )
          (MenuItem
-            enabled: hasColormap
+            enabled: hasColormapAndColorSelected
             label: 'Pick and Paste Color...'
             itemValue: pickAndPasteColor
             translateLabel: true
@@ -1672,25 +1673,25 @@
             label: '-'
           )
          (MenuItem
-            enabled: hasColormap
+            enabled: hasColormapAndColorSelected
             label: 'Edit Color...'
             itemValue: editSelectedColor
             translateLabel: true
           )
          (MenuItem
-            enabled: hasColormap
+            enabled: hasColormapAndColorSelected
             label: 'Brighter'
             itemValue: makeSelectedColorBrighter
             translateLabel: true
           )
          (MenuItem
-            enabled: hasColormap
+            enabled: hasColormapAndColorSelected
             label: 'Darker'
             itemValue: makeSelectedColorDarker
             translateLabel: true
           )
          (MenuItem
-            enabled: hasColormap
+            enabled: hasColormapAndColorSelected
             label: 'Make Gray'
             itemValue: makeSelectedColorGray
             translateLabel: true
@@ -1702,6 +1703,13 @@
             label: 'Inspect Color'
             itemValue: inspectColor
             translateLabel: true
+            enabled: hasColorSelected
+          )
+         (MenuItem
+            enabled: hasColormap
+            label: 'Inspect Colormap'
+            itemValue: inspectColormap
+            translateLabel: true
           )
          )
         nil
@@ -3166,12 +3174,20 @@
     "Created: / 31.7.1998 / 02:02:22 / cg"
 !
 
+hasColorSelected
+    ^ self selectedColorIndexOrNil notNil
+!
+
 hasColormap
     ^ [self image notNil and:[self image colorMap notNil]]
 
     "Created: / 30.9.1998 / 23:53:55 / cg"
 !
 
+hasColormapAndColorSelected
+    ^ self hasColormap and:[self hasColorSelected]
+!
+
 hasNoColormap
     ^ [self image notNil and:[self image colorMap isNil]]
 
@@ -4832,6 +4848,12 @@
     clr inspect
 !
 
+inspectColormap
+    self hasColormap ifTrue:[
+        self image colorMap inspect
+    ].
+!
+
 makeBrighter
     | anyChange|
 
@@ -5122,7 +5144,7 @@
 !
 
 selectedColorIndexOrNil
-    | img clrIndex|
+    |img clrIndex|
 
     img := self image.
     img isNil ifTrue:[