Changeset 4993 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-19T15:32:58+01:00 (12 years ago)

Author:

stoecker

Message:

see #7226 - fix shortcut reassignment

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookUnixoid.java (modified) (1 diff)
• Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -43 +43 @@
         // TODO: Insert system shortcuts here. See Windows and especially OSX to see how to.
         for(int i = KeyEvent.VK_F1; i <= KeyEvent.VK_F12; ++i)
-            Shortcut.registerSystemShortcut("screen:toogle"+i, "reserved", i, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK);
+            Shortcut.registerSystemShortcut("screen:toogle"+i, "reserved", i, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
     }
     /**

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -480 +480 @@
                 for (int k : keys) {
                     int newmodifier = getGroupModifier(m);
-                    if ( findShortcut(k, m) == null ) {
+                    if ( findShortcut(k, newmodifier) == null ) {
                         Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false);
                         System.out.println(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",