Changeset 4993 in josm for trunk/src


Ignore:
Timestamp:
2012-02-19T15:32:58+01:00 (8 years ago)
Author:
stoecker
Message:

see #7226 - fix shortcut reassignment

Location:
trunk/src/org/openstreetmap/josm/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

    r4978 r4993  
    4343        // TODO: Insert system shortcuts here. See Windows and especially OSX to see how to.
    4444        for(int i = KeyEvent.VK_F1; i <= KeyEvent.VK_F12; ++i)
    45             Shortcut.registerSystemShortcut("screen:toogle"+i, "reserved", i, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK);
     45            Shortcut.registerSystemShortcut("screen:toogle"+i, "reserved", i, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
    4646    }
    4747    /**
  • trunk/src/org/openstreetmap/josm/tools/Shortcut.java

    r4979 r4993  
    480480                for (int k : keys) {
    481481                    int newmodifier = getGroupModifier(m);
    482                     if ( findShortcut(k, m) == null ) {
     482                    if ( findShortcut(k, newmodifier) == null ) {
    483483                        Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false);
    484484                        System.out.println(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
Note: See TracChangeset for help on using the changeset viewer.