Changeset 68 in josm for src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2006-03-24T01:45:42+01:00 (20 years ago)

Author:

imi

Message:

• Remove Alt from hotkeys ('n' for new node, not Alt-n)
• use command line options to open files/start or download (--help for a list)

Location:

src/org/openstreetmap/josm/actions/mapmode

Files:

• AddLineSegmentAction.java (modified) (1 diff)
• AddNodeAction.java (modified) (1 diff)
• AddWayAction.java (modified) (1 diff)
• DeleteAction.java (modified) (1 diff)
• MapMode.java (modified) (2 diffs)
• MoveAction.java (modified) (1 diff)
• SelectionAction.java (modified) (1 diff)
• ZoomAction.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/mapmode/AddLineSegmentAction.java

@@ -46 +46 @@
          */
         public AddLineSegmentAction(MapFrame mapFrame) {
-                super("Add Line Segment", "addlinesegment", "Add a line segment between two nodes.", KeyEvent.VK_G, mapFrame);
+                super("Add Line Segment", "addlinesegment", "Add a line segment between two nodes.", "G", KeyEvent.VK_G, mapFrame);
         }
 

src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -28 +28 @@
          */
         public AddNodeAction(MapFrame mapFrame) {
-                super("Add nodes", "addnode", "Add nodes to the map.", KeyEvent.VK_N, mapFrame);
+                super("Add nodes", "addnode", "Add nodes to the map.", "N", KeyEvent.VK_N, mapFrame);
         }
 

src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java

@@ -43 +43 @@
          */
         public AddWayAction(MapFrame mapFrame, MapMode followMode) {
-                super("Add Way", "addway", "Combine selected segments to a new way.", KeyEvent.VK_W, mapFrame);
+                super("Add Way", "addway", "Combine selected segments to a new way.", "W", KeyEvent.VK_W, mapFrame);
                 this.followMode = followMode;
         }

src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -43 +43 @@
          */
         public DeleteAction(MapFrame mapFrame) {
-                super("Delete", "delete", "Delete nodes, streets or segments.", KeyEvent.VK_D, mapFrame);
+                super("Delete", "delete", "Delete nodes, streets or segments.", "Delete", KeyEvent.VK_DELETE, mapFrame);
         }
 

src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -5 +5 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -31 +33 @@
         /**
          * Construct a mapMode with the given icon and the given MapFrame
-         *
-         * @param iconName The filename of the icon.
-         * @param mapFrame The parent MapFrame, this MapMode belongs to.
          */
-        public MapMode(String name, String iconName, String tooltip, int mnemonic, MapFrame mapFrame) {
-                super(name, "mapmode/"+iconName, tooltip, mnemonic, null);
+        public MapMode(String name, String iconName, String tooltip, String keyname, int keystroke, MapFrame mapFrame) {
+                super(name, "mapmode/"+iconName, tooltip, keyname, KeyStroke.getKeyStroke(keystroke, 0));
                 this.mapFrame = mapFrame;
                 mv = mapFrame.mapView;

src/org/openstreetmap/josm/actions/mapmode/MoveAction.java

@@ -47 +47 @@
          */
         public MoveAction(MapFrame mapFrame) {
-                super("Move", "move", "Move selected objects around", KeyEvent.VK_M, mapFrame);
+                super("Move", "move", "Move selected objects around.", "M", KeyEvent.VK_M, mapFrame);
         }
 

src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java

@@ -63 +63 @@
          */
         public SelectionAction(MapFrame mapFrame) {
-                super("Selection", "selection", "Select objects by dragging or clicking", KeyEvent.VK_S, mapFrame);
+                super("Selection", "selection", "Select objects by dragging or clicking.", "S", KeyEvent.VK_S, mapFrame);
                 this.selectionManager = new SelectionManager(this, false, mv);
         }

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

@@ -41 +41 @@
          */
         public ZoomAction(MapFrame mapFrame) {
-                super("Zoom", "zoom", "Zoom in by dragging", KeyEvent.VK_Z, mapFrame);
+                super("Zoom", "zoom", "Zoom in by dragging.", "Z", KeyEvent.VK_Z, mapFrame);
                 mv = mapFrame.mapView;
                 selectionManager = new SelectionManager(this, true, mv);