Changeset 9258 in josm for trunk

Timestamp:

2016-01-02T14:38:01+01:00 (9 years ago)

Author:

simon04

Message:

Attempt to fix some shortcut parse issues

See wiki:DevelopersGuide/ShortcutsList

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DistributeAction.java (modified) (3 diffs)
• actions/relation/EditRelationAction.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -34 +33 @@
 public final class DistributeAction extends JosmAction {
 
-    private static final String ACTION_SHORT_NAME = marktr("Distribute Nodes");
-
     /**
      * Constructs a new {@code DistributeAction}.
      */
     public DistributeAction() {
-        super(tr(ACTION_SHORT_NAME), "distribute",
+        super(tr("Distribute Nodes"), "distribute",
               tr("Distribute the selected nodes to equal distances along a line."),
-              Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr(ACTION_SHORT_NAME)), KeyEvent.VK_B, Shortcut.SHIFT),
+              Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.SHIFT),
               true);
         putValue("help", ht("/Action/DistributeNodes"));
@@ -100 +97 @@
 
         // Do it!
-        Main.main.undoRedo.add(new SequenceCommand(tr(ACTION_SHORT_NAME), cmds));
+        Main.main.undoRedo.add(new SequenceCommand(tr("Distribute Nodes"), cmds));
         Main.map.repaint();
     }

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -6 +6 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.Collection;
 import java.util.HashSet;
@@ -19 +20 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -33 +35 @@
         putValue(SHORT_DESCRIPTION, tr("Call relation editor for selected relation"));
         putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+        Main.registerActionShortcut(this,
+                Shortcut.registerShortcut("relations:edit", tr("Edit relation"), KeyEvent.VK_X, Shortcut.ALT));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -138 +138 @@
     }
 
-    private final transient Shortcut[] visibilityToggleShortcuts = new Shortcut[10];
+    private final transient Shortcut[] visibilityToggleShortcuts = new Shortcut[]{
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer1", tr("Toggle visibility of layer: {0}", 1), KeyEvent.VK_1, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer2", tr("Toggle visibility of layer: {0}", 2), KeyEvent.VK_2, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer3", tr("Toggle visibility of layer: {0}", 3), KeyEvent.VK_3, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer4", tr("Toggle visibility of layer: {0}", 4), KeyEvent.VK_4, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer5", tr("Toggle visibility of layer: {0}", 5), KeyEvent.VK_5, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer6", tr("Toggle visibility of layer: {0}", 6), KeyEvent.VK_6, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer7", tr("Toggle visibility of layer: {0}", 7), KeyEvent.VK_7, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer8", tr("Toggle visibility of layer: {0}", 8), KeyEvent.VK_8, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer9", tr("Toggle visibility of layer: {0}", 9), KeyEvent.VK_9, Shortcut.ALT),
+            Shortcut.registerShortcut("subwindow:layers:toggleLayer10", tr("Toggle visibility of layer: {0}", 10), KeyEvent.VK_0, Shortcut.ALT),
+    };
     private final ToggleLayerIndexVisibility[] visibilityToggleActions = new ToggleLayerIndexVisibility[10];
 
@@ -146 +157 @@
      */
     private void createVisibilityToggleShortcuts() {
-        final int[] k = {
-                KeyEvent.VK_1, KeyEvent.VK_2, KeyEvent.VK_3, KeyEvent.VK_4, KeyEvent.VK_5,
-                KeyEvent.VK_6, KeyEvent.VK_7, KeyEvent.VK_8, KeyEvent.VK_9, KeyEvent.VK_0};
-
         for (int i = 0; i < 10; i++) {
-            visibilityToggleShortcuts[i] = Shortcut.registerShortcut("subwindow:layers:toggleLayer" + (i+1),
-                    tr("Toggle visibility of layer: {0}", i+1), k[i], Shortcut.ALT);
             visibilityToggleActions[i] = new ToggleLayerIndexVisibility(i);
             Main.registerActionShortcut(visibilityToggleActions[i], visibilityToggleShortcuts[i]);