Changeset 178 in josm for src/org/openstreetmap/josm/tools/ShortCutLabel.java

Timestamp:

2006-12-29T16:57:07+01:00 (17 years ago)

Author:

imi

Message:

• fixed display of tooltip shortcuts
• added icon=... to annotation presets
• added support for putting annotation presets in the toolbar

File:

• src/org/openstreetmap/josm/tools/ShortCutLabel.java (modified) (1 diff)

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

@@ -9 +9 @@
         public static String name(int shortCut, int modifiers) {
                 String s = "";
-                if ((modifiers & KeyEvent.CTRL_MASK) != 0)
+                if ((modifiers & KeyEvent.CTRL_MASK) != 0 || (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0)
                         s += tr("Ctrl-");
-                if ((modifiers & KeyEvent.ALT_MASK) != 0)
+                if ((modifiers & KeyEvent.ALT_MASK) != 0 || (modifiers & KeyEvent.ALT_DOWN_MASK) != 0)
                         s += tr("Alt-");
-                if ((modifiers & KeyEvent.ALT_GRAPH_MASK) != 0)
+                if ((modifiers & KeyEvent.ALT_GRAPH_MASK) != 0 || (modifiers & KeyEvent.ALT_GRAPH_DOWN_MASK) != 0)
                         s += tr("AltGr-");
-                if ((modifiers & KeyEvent.SHIFT_MASK) != 0)
+                if ((modifiers & KeyEvent.SHIFT_MASK) != 0 || (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0)
                         s += tr("Shift-");
                 if (shortCut >= KeyEvent.VK_F1 && shortCut <= KeyEvent.VK_F12)