Changeset 469 in josm for trunk/src/org

Timestamp:

2007-11-23T09:21:51+01:00 (16 years ago)

Author:

gebner

Message:

Remove ctrl+shift escapes from most actions.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AlignInCircleAction.java (modified) (1 diff)
• AlignInLineAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (1 diff)
• JoinNodeWayAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (1 diff)
• ReverseWayAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• UnselectAllAction.java (modified) (1 diff)

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

@@ -28 +28 @@
 
         public AlignInCircleAction() {
-                super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."), KeyEvent.VK_O, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."), KeyEvent.VK_O, 0, true);
         }
 

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

@@ -28 +28 @@
 
         public AlignInLineAction() {
-                super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), KeyEvent.VK_L, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), KeyEvent.VK_L, 0, true);
         }
 

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

@@ -49 +49 @@
 
         public CombineWayAction() {
-                super(tr("Combine Way"), "combineway", tr("Combine several ways into one."), KeyEvent.VK_C, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                super(tr("Combine Way"), "combineway", tr("Combine several ways into one."), KeyEvent.VK_C, 0, true);
                 DataSet.selListeners.add(this);
         }

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

@@ -35 +35 @@
         public JoinNodeWayAction() {
             super(tr("Join node to way"), "joinnodeway",
-                        tr("Join a node into the nearest way segments"), KeyEvent.VK_J, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                        tr("Join a node into the nearest way segments"), KeyEvent.VK_J, 0, true);
         }
 

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

@@ -53 +53 @@
 
         public MergeNodesAction() {
-                super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into one."), KeyEvent.VK_M, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into one."), KeyEvent.VK_M, 0, true);
                 DataSet.selListeners.add(this);
         }

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

@@ -27 +27 @@
         super(tr("Reverse ways"), "wayflip",
                         tr("Reverse the direction of all selected ways."),
-                        KeyEvent.VK_R, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                        KeyEvent.VK_R, 0, true);
     }
 

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

@@ -51 +51 @@
          */
         public SplitWayAction() {
-                super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), KeyEvent.VK_P, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), KeyEvent.VK_P, 0, true);
                 DataSet.selListeners.add(this);
         }

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

@@ -14 +14 @@
 
         public UnselectAllAction() {
-                super(tr("Unselect All"),"unselectall", tr("Unselect all objects."), KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, true);
+                super(tr("Unselect All"),"unselectall", tr("Unselect all objects."), KeyEvent.VK_U, 0, true);
 
-                // Add extra shortcut U
+                // Add extra shortcut C-S-a
                 Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                        KeyStroke.getKeyStroke(KeyEvent.VK_U, 0), tr("Unselect All"));
+                        KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK), tr("Unselect All"));
     }