Changeset 10241 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-05-17T13:28:04+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12660 - unbind Z shortcut from "Zoom mode" and make it visible in expert mode only

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ZoomAction.java (modified) (2 diffs)
• gui/MapFrame.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

@@ -28 +28 @@
  *
  * @author imi
+ * @since 1
  */
 public class ZoomAction extends MapMode implements SelectionEnded {
@@ -42 +43 @@
     public ZoomAction(MapFrame mapFrame) {
         super(tr("Zoom"), "zoom", tr("Zoom and move map"),
-                Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.DIRECT),
+                Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
                 mapFrame, ImageProvider.getCursor("normal", "zoom"));
         selectionManager = new SelectionManager(this, true, mapFrame.mapView);

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

@@ -246 +246 @@
         addMapMode(new IconToggleButton(mapModeSelectLasso, true));
         addMapMode(new IconToggleButton(mapModeDraw));
-        addMapMode(new IconToggleButton(mapModeZoom));
+        addMapMode(new IconToggleButton(mapModeZoom, true));
         addMapMode(new IconToggleButton(new DeleteAction(this), true));
         addMapMode(new IconToggleButton(new ParallelWayAction(this), true));