Changeset 27834 in osm for applications

Timestamp:

2012-02-17T18:34:30+01:00 (13 years ago)

Author:

stoecker

Message:

fix shortcut conflicts

Location:

applications/editors/josm/plugins

Files:

• addrinterpolation/build.xml (modified) (1 diff)
• addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java (modified) (1 diff)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (modified) (1 diff)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java (modified) (1 diff)
• globalsat/build.xml (modified) (1 diff)
• globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java (modified) (1 diff)
• terracer/src/terracer/ReverseTerraceAction.java (modified) (1 diff)
• utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java (modified) (1 diff)
• utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java (modified) (1 diff)

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

@@ -23 +23 @@
 <project name="AddrInterpolation" default="dist" basedir=".">
     <property name="commit.message" value="Impoved Icon"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4928"/>
     <!--
       ************************************************

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java

@@ -25 +25 @@
         super(tr("Address Interpolation"), "AddrInterpolation", tr("Handy Address Interpolation Functions"),
                 Shortcut.registerShortcut("tools:AddressInterpolation", tr("Tool: {0}", tr("Address Interpolation")),
-                        KeyEvent.VK_A, Shortcut.GROUP_MENU,
-                        InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK), false);
+                        KeyEvent.VK_Z, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT2), false);
         setEnabled(false);
         DataSet.addSelectionListener(this);

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java

@@ -192 +192 @@
     public void pluginStatusChanged(int message) {
         if (message == MESSAGE_DATABASE_LOADED) {
-            czechMenu = Main.main.menu.addMenu(marktr("Adress"), KeyEvent.VK_A, 4, ht("/Plugin/CzechAddress"));
+            czechMenu = Main.main.menu.addMenu(marktr("Adress"), KeyEvent.VK_Z, 4, ht("/Plugin/CzechAddress"));
             menuItems.add(MainMenu.add(czechMenu, new PointManipulatorAction()));
             menuItems.add(MainMenu.add(czechMenu, new GroupManipulatorAction()));

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java

@@ -30 +30 @@
                 Shortcut.registerShortcut("tools:newaddress",
                         "Adresy: Vytvořit/upravit adres",
-                        KeyEvent.VK_A, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT),
+                        KeyEvent.VK_W, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1, Shortcut.SHIFT_DEFAULT),
                 true);
     }

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

@@ -32 +32 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- 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"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java

@@ -108 +108 @@
             tr("Import Data from Globalsat Datalogger DG100 into GPX layer."),
             Shortcut.registerShortcut("menu:globalsatimport", tr("Menu: {0}", tr("Globalsat Import")),
-            KeyEvent.VK_I, Shortcut.GROUP_MENU), false);
+            KeyEvent.VK_G, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), false);
         }
         public void actionPerformed(ActionEvent e){

applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java

@@ -41 +41 @@
             Shortcut.registerShortcut("tools:ReverseTerrace",
                     tr("Tool: {0}", tr("Reverse a Terrace")),
-                    KeyEvent.VK_R, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT),
+                    KeyEvent.VK_V, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
                         true);
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java

@@ -29 +29 @@
     public AddIntersectionsAction() {
         super(tr("Add nodes at intersections"), "addintersect", tr("Add missing nodes at intersections of selected ways."),
-                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_I,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_I,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT3), true);
         putValue("help", ht("/Action/AddIntersections"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java

@@ -28 +28 @@
                 tr("Select last modified ways"),
                 Shortcut.registerShortcut("tools:selmodways", tr("Tool: {0}","Select last modified ways"),
-                KeyEvent.VK_Z,  Shortcut.GROUP_DIRECT2), true);
+                KeyEvent.VK_Z,  Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/SelectLastModifiedWays"));
     }