--- a/MenuView.st	Fri Aug 02 20:20:55 2002 +0200
+++ b/MenuView.st	Tue Aug 06 10:42:55 2002 +0200
@@ -1365,24 +1365,29 @@
     "/ this is somewhat complicated: we have the symbolic key at hand,
     "/ but want to show the untranslated (inverse keyBoardMapped) key & modifier
     "/
-
     s := self shortKeyStringFor:aSymbolicKey.
     s isNil ifTrue:[^ self].
 
     l := self visibleLineToAbsoluteLine:visLineNr.
+
+    disabledEtchedFgColor notNil ifTrue:[
+        (self isInSelection:l) ifFalse:[
+            s := s asText emphasisAllAdd:(#etchColor -> disabledEtchedFgColor)
+        ]
+    ].
     isSubMenuEntry := (subMenus notNil and:[(subMenus at:l) notNil]).
 
     isSubMenuEntry ifFalse:[
-	"/ this aligns them along their left
-	x := width - textStartLeft - self shortKeyInset.
+        "/ this aligns them along their left
+        x := width - textStartLeft - self shortKeyInset.
     ] ifTrue:[
-	"/ this aligns them at the right
-	x := width - leftMargin - (font widthOf:s).
-	x := x - 16    "/ should query for the arrow size here ...
+        "/ this aligns them at the right
+        x := width - leftMargin - (font widthOf:s).
+        x := x - 16    "/ should query for the arrow size here ...
     ].
 
     hilightStyle == #openwin ifTrue:[
-	x := x - 2            "/ inset of rounded rectangle
+        x := x - 2            "/ inset of rounded rectangle
     ].
 
     self drawLine:s fromX:x inVisible:visLineNr with:fg and:bg
@@ -2546,7 +2551,7 @@
     "
 
     |line lineNr y isSpecial isSeparatingLine 
-     isDoubleLine right clr1 clr2 text|
+     isDoubleLine right clr1 clr2 text key|
 
     line := self visibleAt:visLineNr.
 
@@ -2576,6 +2581,15 @@
                 inVisible:visLineNr 
                 with:disabledFgColor 
                 and:bgColor.
+
+            "/
+            "/ is there a shortKey ?
+            "/
+            ((ShowAcceleratorKeys ~~ false)
+            and:[shortKeys notNil 
+            and:[(key := shortKeys at:lineNr ifAbsent:nil) notNil]]) ifTrue:[
+                self drawAccelerator:key inVisibleLine:visLineNr with:disabledFgColor and:bgColor
+            ]
             "/ self drawVisibleLine:visLineNr with:disabledFgColor and:bgColor
         ] ifTrue:[
             super redrawVisibleLine:visLineNr
@@ -2748,5 +2762,5 @@
 !MenuView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.135 2002-02-26 13:03:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.136 2002-08-06 08:42:55 cg Exp $'
 ! !