Changeset 4982 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2012-02-18T12:53:53+01:00 (12 years ago)

Author:

stoecker

Message:

see #7226 - patch by akks (fixed a bit) - fix shortcut deprecations

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -110 +110 @@
         super(tr("Conflict"), "conflict", tr("Resolve conflicts."),
                 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
-                KeyEvent.VK_C, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 100);
+                KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);
 
         build();