Changeset 2550 in josm for trunk

Timestamp:

2009-11-29T14:44:17+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #2669: Problem with zoom keys
fixed #3269: Plus/minus buttons don't work
Couldn't get '+' to work on a swiss german keyboard (don't know why) but 'numpad +' and 'numpad -' now zoom in and zoom out too

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ZoomInAction.java (modified) (2 diffs)
• ZoomOutAction.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -14 +17 @@
 
     public ZoomInAction() {
-        super(tr("Zoom In"), "dialogs/zoomin", tr("Zoom In"),
-                Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom In")), KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT), true);
+        super(
+                tr("Zoom In"),
+                "dialogs/zoomin",
+                tr("Zoom In"),
+                Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom In")),KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT),
+                true
+        );
         putValue("help", ht("/Action/ZoomIn"));
+        // make numpad + behave like + (action is already registred)
+        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD,0), tr("Zoom In"));
     }
 
     public void actionPerformed(ActionEvent e) {
+        Object name = Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).get(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, 0));
+        Main.contentPane.getActionMap().put(name, this);
+
         if (!Main.isDisplayingMapView()) return;
         Main.map.mapView.zoomToFactor(0.9);

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -17 +20 @@
                 Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom Out")), KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), true);
         putValue("help", ht("/Action/ZoomOut"));
+        // make numpad - behave like -
+        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT,0), tr("Zoom Out"));
     }