Ticket #1589: ShortCutLabel3.diff

src/org/openstreetmap/josm/tools/ShortCutLabel.java

@@ -5 +5 @@
 
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 
 public class ShortCutLabel {
         public static String name(int shortCut, int modifiers) {
@@ -19 +20 @@
                         s += tr("AltGr-");
                 if ((modifiers & KeyEvent.SHIFT_MASK) != 0 || (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0)
                         s += tr("Shift-");
+                if ((modifiers & KeyEvent.META_MASK) != 0 || (modifiers & KeyEvent.META_DOWN_MASK) != 0)
+                        if (Main.withOSXIntegration) {
+                                s += "\u2318-";
+                        } else {
+                                s += tr("Meta-");
+                        }
                 if (shortCut >= KeyEvent.VK_F1 && shortCut <= KeyEvent.VK_F12)
                         s += "F"+(shortCut-KeyEvent.VK_F1+1);
+                else if (shortCut == KeyEvent.VK_DELETE)
+                        if (Main.withOSXIntegration) {
+                                s += "\u2326";
+                        } else {
+                                s += tr("Del");
+                        }
+                else if (shortCut == KeyEvent.VK_PLUS)
+                        s += "+"; // KeyEvent.VK_PLUS fails to render to a "+" on some platforms
                 else
                         s += Character.toUpperCase((char)shortCut);
                 return s;