Changeset 27803 in osm for applications

Timestamp:

2012-02-16T20:34:40+01:00 (13 years ago)

Author:

stoecker

Message:

fix shortcut conflicts

Location:

applications/editors/josm/plugins

Files:

• undelete/build.xml (modified) (1 diff)
• undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java (modified) (1 diff)
• waydownloader/build.xml (modified) (1 diff)
• waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (modified) (1 diff)
• wayselector/build.xml (modified) (1 diff)
• wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java (modified) (1 diff)

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

@@ -32 +32 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4734"/>
+    <property name="plugin.main.version" value="4928"/>
     <!--
       ************************************************

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

@@ -68 +68 @@
         public UndeleteAction() {
         super(tr("Undelete object..."), "undelete", tr("Undelete object by id"), Shortcut.registerShortcut("tools:undelete", tr("File: {0}", tr("Undelete object...")),
-        KeyEvent.VK_U, Shortcut.GROUP_EDIT, KeyEvent.SHIFT_DOWN_MASK|KeyEvent.ALT_DOWN_MASK), true);
+        KeyEvent.VK_U, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT2), true);
       }
 

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

@@ -26 +26 @@
     -->
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4928"/>
     <!--
       ************************************************

applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java

@@ -57 +57 @@
                     "way-download",
                     tr("Download map data on the end of selected way"),
-                    Shortcut.registerShortcut("waydownloader:waydownload", tr("Way Download"), KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
+                    Shortcut.registerShortcut("waydownloader:waydownload", tr("Way Download"), KeyEvent.VK_W, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
                     true);
         }

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

@@ -32 +32 @@
     <property name="commit.message" value="recompile due to core change"/>
     <!-- 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"/>
     <!--
       ************************************************

applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java

@@ -45 +45 @@
                   "way-select",
                   tr("Select non-branching sequences of ways"),
-                  Shortcut.registerShortcut("wayselector:wayselect", tr("Way Select"), KeyEvent.VK_W, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT),
+                  Shortcut.registerShortcut("wayselector:wayselect", tr("Way Select"), KeyEvent.VK_W, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
                   true);
         }