Changeset 27819 in osm for applications/editors

Timestamp:

2012-02-17T10:18:51+01:00 (13 years ago)

Author:

akks

Message:

fix 2/3 shortcut conflict and compile error in TrustOsm

Location:

applications/editors/josm/plugins/trustosm

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java (modified) (2 diffs)

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

@@ -32 +32 @@
     <property name="commit.message" value="New plugin for digital signing osm data"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4961"/>
     <!--
       ************************************************

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java

@@ -17 +17 @@
         public ExportSigsAction() {
                 super(tr("Export sigs..."), "exportsigs", tr("Export all signatures to XML file."),
-                                Shortcut.registerShortcut("file:exportsigs", tr("Export sigs to XML..."), KeyEvent.VK_E, Shortcut.GROUP_MENU));
+                                Shortcut.registerShortcut("file:exportsigs", tr("Export sigs to XML..."), KeyEvent.VK_X, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU));
         }
 

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java

@@ -18 +18 @@
 import java.awt.event.KeyEvent;
 import java.awt.geom.GeneralPath;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -186 +187 @@
                 super(tr("Object signatures"), "trustosm", tr("Open object signing window."),
                                 Shortcut.registerShortcut("subwindow:trustosm", tr("Toggle: {0}", tr("Object signatures")),
-                                                KeyEvent.VK_T, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
+                                                KeyEvent.VK_T, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT2), 150);
 
                 Main.map.mapView.addTemporaryLayer(this);