Changeset 526 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-01-24T22:15:30+01:00 (17 years ago)

Author:

framm

Message:

• changed move mode to use an initial move threshold of 15 pixels, i.e. you have to move something farther than 15 pixels to initiate a move. configurable through option edit.initial-move-threshold.
• added the key combination shift+arrow keys to "nudge" selected objects by one pixel in either direction.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (1 diff)
• MapView.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
+import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JToolBar;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;

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

@@ -9 +9 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14 +15 @@
 import java.util.LinkedList;
 
+import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -30 +34 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.ModifiedChangedListener;
+
+import com.sun.corba.se.impl.oa.poa.ActiveObjectMap.Key;
 
 /**
@@ -82 +88 @@
 
                                 new MapMover(MapView.this, Main.contentPane);
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, java.awt.event.InputEvent.SHIFT_MASK), "UP");
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, java.awt.event.InputEvent.SHIFT_MASK), "DOWN");
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, java.awt.event.InputEvent.SHIFT_MASK), "LEFT");
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, java.awt.event.InputEvent.SHIFT_MASK), "RIGHT");
+
+                                Main.contentPane.getActionMap().put("UP", new MoveAction(MoveAction.Direction.UP));
+                                Main.contentPane.getActionMap().put("DOWN", new MoveAction(MoveAction.Direction.DOWN));
+                                Main.contentPane.getActionMap().put("LEFT", new MoveAction(MoveAction.Direction.LEFT));
+                                Main.contentPane.getActionMap().put("RIGHT", new MoveAction(MoveAction.Direction.RIGHT));
+                                
 
                                 MapSlider zoomSlider = new MapSlider(MapView.this);