Changeset 14012 in josm for trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java

Timestamp:

2018-07-08T00:27:14+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16453 - proper support of different keyboard layouts

File:

• trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java (modified) (3 diffs)

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

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.tools.KeyboardUtils;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -20 +19 @@
 public class ReorderImageryLayersAction extends JosmAction {
 
-    private static final int VK_SQUARE = 0x10000b2;
-
     /**
      * Constructs a new {@code ReorderImageryLayersAction}.
@@ -28 +25 @@
         // TODO: find a suitable icon
         super(tr("Reorder imagery layers"), "dialogs/layerlist", tr("Reorders non-overlay imagery layers."),
-            Shortcut.registerShortcut("imagery:reorder", tr("Reorder imagery layers"), KeyEvent.VK_DEAD_TILDE, Shortcut.DIRECT), true);
-        // On AZERTY keyboard layour the key displays the character '²'
-        MainApplication.registerActionShortcut(this,
-            Shortcut.registerShortcut("imagery:reorderbis", tr("Reorder imagery layers"), VK_SQUARE, Shortcut.DIRECT));
+            Shortcut.registerMultiShortcuts("imagery:reorder", tr("Reorder imagery layers"),
+                    KeyboardUtils.getCharactersForKey('E', 0), Shortcut.DIRECT));
     }