Changeset 27837 in osm for applications

Timestamp:

2012-02-17T18:45:50+01:00 (13 years ago)

Author:

stoecker

Message:

fix shortcut conflict

Location:

applications/editors/josm/plugins/conflation

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java (modified) (1 diff)

applications/editors/josm/plugins/conflation/build.xml

@@ -32 +32 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="4928"/>
     <!--
       ************************************************

applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java

@@ -21 +21 @@
         super(tr("Conflation"), "conflation", tr("Conflation tool for merging data"),
                 Shortcut.registerShortcut("tool:conflation", tr("Tool: {0}", tr("Conflation")),
-                KeyEvent.VK_C, Shortcut.GROUP_MENU,
-                InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK), true);
+                KeyEvent.VK_A, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1), true);
         //setEnabled(false);
         //DataSet.selListeners.add(this);