Changeset 27807 in osm for applications

Timestamp:

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

Author:

stoecker

Message:

fix 2 of 5 shortct conflicts

Location:

applications/editors/josm/plugins/czechaddress

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (modified) (1 diff)

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

@@ -33 +33 @@
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/CS:JOSM/Plugins/CzechAddress"/>
             <attribute name="Plugin-Icon" value="images/preferences/czech_flag.png"/>
-            <attribute name="Plugin-Mainversion" value="4733"/>
+            <attribute name="Plugin-Mainversion" value="4928"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>

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

@@ -20 +20 @@
               null,//"envelope-closed-big.png",
               "Upravit jména elemntů dle mapy",
-              Shortcut.registerShortcut("address:assignaddress",
-                        "Adresy: Přiřadit adresy",
-                        KeyEvent.VK_P, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT),
+              null,
               true, "czechaddress/manager", true);
     }

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

@@ -43 +43 @@
               Shortcut.registerShortcut("tools:splitarea",
                     tr("Tool: {0}", tr("Split area")),
-                    KeyEvent.VK_S, Shortcut.GROUP_MENU),
+                    KeyEvent.VK_W, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT1),
               true);
     }