Changeset 29258 in osm for applications/editors

Timestamp:

2013-02-18T17:22:13+01:00 (12 years ago)

Author:

akks

Message:

'JOSM/touchscreenhelper: Added T shortcut, hold T to activate temporarily'

Location:

applications/editors/josm/plugins/touchscreenhelper

Files:

• build.xml (modified) (2 diffs)
• src/touchscreenhelper/BrowseAction.java (modified) (3 diffs)
• src/utils (added)
• src/utils/TimedKeyReleaseListener.java (added)

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

@@ -30 +30 @@
 <project name="touchscreenhelper" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Commit message"/>
+    <property name="commit.message" value="JOSM/touchscreenhelper: Added T shortcut, hold T to activate temporarily"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4394"/>
@@ -37 +37 @@
     <property name="plugin.src.dir" value="src"/>
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.5"/>
+    <property name="ant.build.javac.target" value="1.6"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>

applications/editors/josm/plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java

@@ -4 +4 @@
 
 import java.awt.Cursor;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -12 +13 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.tools.Shortcut;
+import uitils.TimedKeyReleaseListener;
 
 public class BrowseAction extends MapMode implements MouseListener,
-    MouseMotionListener {
+    MouseMotionListener, MapFrame.MapModeChangeListener {
+
+    private MapMode oldMapMode;
+    private TimedKeyReleaseListener listener;
 
     public BrowseAction(MapFrame mapFrame) {
         super(tr("Browse"), "browse", tr("Browse map with left button"),
+            Shortcut.registerShortcut("touchscreenhelper:browse", tr("Mode: {0}", tr("Browse map with left button")),
+                KeyEvent.VK_T, Shortcut.DIRECT),
             mapFrame, Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+        MapFrame.addMapModeChangeListener(this);
     }
-
+    
+    @Override
+    public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) {
+        this.oldMapMode = oldMapMode;
+    }
+    
     @Override public void enterMode() {
         super.enterMode();
-
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
+
+        listener = new TimedKeyReleaseListener() {
+            @Override
+            protected void doKeyReleaseEvent(KeyEvent evt) {
+                if (evt.getKeyCode() == getShortcut().getKeyStroke().getKeyCode()) {
+                    if (oldMapMode!=null && !(oldMapMode instanceof BrowseAction))
+                    Main.map.selectMapMode(oldMapMode);
+                }
+            }
+        };
     }
 
@@ -33 +56 @@
         Main.map.mapView.removeMouseListener(this);
         Main.map.mapView.removeMouseMotionListener(this);
+        listener.stop();
     }