Changeset 5966 in josm for trunk

Timestamp:

2013-05-18T20:15:51+02:00 (11 years ago)

Author:

akks

Message:

fix #8723: left click on position in status bar now opens lat/lon window again

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JumpToAction.java (modified) (4 diffs)
• gui/MapStatus.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import javax.swing.Icon;
 
 import javax.swing.JLabel;
@@ -21 +20 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MapView;
+
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -31 +31 @@
      */
     public JumpToAction() {
-        super(tr("Jump To Position"), null, tr("Opens a dialog that allows to jump to a specific location"), Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
-        KeyEvent.VK_J, Shortcut.CTRL), false);
-        putValue("toolbar", "action/jumpto");
-        Main.toolbar.register(this);
+        super(tr("Jump To Position"), (Icon) null, tr("Opens a dialog that allows to jump to a specific location"), Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
+        KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", false);
     }
 
@@ -169 +167 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         showJumpToDialog();

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -79 +79 @@
     final MapView mv;
     final Collector collector;
-
+    
     public class BackgroundProgressMonitor implements ProgressMonitorDialog {
 
@@ -141 +141 @@
     final JProgressBar progressBar = new JProgressBar();
     public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor();
+    
+    private MouseListener jumpToOnLeftClick;
 
     /**
@@ -701 +703 @@
             }
         });
+        
+        // also show Jump To dialog on mouse click (except context menu)
+        jumpToOnLeftClick = new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getButton() != MouseEvent.BUTTON3) {
+                    Main.main.menu.jumpToAct.showJumpToDialog();
+                }
+            }
+        };
 
         // Listen for mouse movements and set the position text field
@@ -740 +752 @@
         add(distText, GBC.std().insets(3,0,0,0));
 
+        latText.addMouseListener(jumpToOnLeftClick);
+        lonText.addMouseListener(jumpToOnLeftClick);
+        
         helpText.setEditable(false);
         add(nameText, GBC.std().insets(3,0,0,0));