Changeset 27768 in osm

Timestamp:

2012-02-15T21:48:37+01:00 (13 years ago)

Author:

stoecker

Message:

fix shortcut conflicts

Location:

applications/editors/josm/plugins

Files:

• HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java (modified) (1 diff)
• conflation/REVISION (deleted)
• imagewaypoint/build.xml (modified) (1 diff)
• imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (modified) (1 diff)
• rgisopen/REVISION (deleted)

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java

@@ -27 +27 @@
             "home-icon32", 
             "Launches the HouseNumberTaggingTool dialog", 
-            Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_Y, Shortcut.GROUP_EDIT),
+            Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_K, Shortcut.GROUP_EDIT),
             true);
 

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

@@ -32 +32 @@
     <property name="commit.message" value="Updated the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4928"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>

applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java

@@ -189 +189 @@
         tr("Display non-geotagged photos"),
         Shortcut.registerShortcut("subwindow:imagewaypoint", tr("Toggle: {0}", tr("WayPoint Image")),
-        KeyEvent.VK_Y, Shortcut.GROUP_LAYER),
+        KeyEvent.VK_Y, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1),
         200);