Changeset 14012 in josm

Timestamp:

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

Author:

Don-vip

Message:

see #16453 - proper support of different keyboard layouts

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/JosmAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (modified) (5 diffs)
• src/org/openstreetmap/josm/tools/KeyboardUtils.java (added)
• src/org/openstreetmap/josm/tools/Shortcut.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java (added)

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -186 +187 @@
 
     /**
+     * Constructs a new {@code JosmAction}.
+     *
+     * Use this super constructor to setup your action.
+     *
+     * @param name the action's text as displayed on the menu (if it is added to a menu)
+     * @param iconName the filename of the icon to use
+     * @param tooltip  a longer description of the action that will be displayed in the tooltip. Please note
+     *           that html is not supported for menu actions on some platforms.
+     * @param shortcuts ready-created shortcut objects
+     * @since 14012
+     */
+    public JosmAction(String name, String iconName, String tooltip, List<Shortcut> shortcuts) {
+        this(name, iconName, tooltip, shortcuts.get(0), true, null, true);
+        for (int i = 1; i < shortcuts.size(); i++) {
+            MainApplication.registerActionShortcut(this, shortcuts.get(i));
+        }
+    }
+
+    /**
      * Installs the listeners to this action.
      * <p>

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));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -14 +14 @@
 import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
+import java.awt.im.InputContext;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -50 +51 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.tools.KeyboardUtils;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -114 +116 @@
             }
         }
+        KeyboardUtils.getExtendedKeyCodes(InputContext.getInstance().getLocale()).entrySet()
+            .forEach(e -> list.put(e.getKey(), e.getValue().toString()));
         list.put(Integer.valueOf(-1), "");
         return list;
@@ -333 +337 @@
                     int row = panel.shortcutTable.convertRowIndexToModel(lsm.getMinSelectionIndex());
                     Shortcut sc = (Shortcut) panel.model.getValueAt(row, -1);
+                    Object selectedKey = panel.tfKey.getSelectedItem();
                     if (panel.cbDisable.isSelected()) {
                         sc.setAssignedModifier(-1);
-                    } else if (panel.tfKey.getSelectedItem() == null || "".equals(panel.tfKey.getSelectedItem())) {
+                    } else if (selectedKey == null || "".equals(selectedKey)) {
                         sc.setAssignedModifier(KeyEvent.VK_CANCEL);
                     } else {
@@ -345 +350 @@
                         );
                         for (Map.Entry<Integer, String> entry : keyList.entrySet()) {
-                            if (entry.getValue().equals(panel.tfKey.getSelectedItem())) {
+                            if (entry.getValue().equals(selectedKey)) {
                                 sc.setAssignedKey(entry.getKey());
                             }

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -440 +441 @@
 
     /**
+     * Register a shortcut linked to several characters.
+     *
+     * @param shortText an ID. re-use a {@code "system:*"} ID if possible, else use something unique.
+     * {@code "menu:*"} is reserved for menu mnemonics, {@code "core:*"} is reserved for
+     * actions that are part of JOSM's core. Use something like
+     * {@code <pluginname>+":"+<actionname>}.
+     * @param longText this will be displayed in the shortcut preferences dialog. Better
+     * use something the user will recognize...
+     * @param characters the characters you'd prefer
+     * @param requestedGroup the group this shortcut fits best. This will determine the
+     * modifiers your shortcut will get assigned. Use the constants defined above.
+     * @return the shortcut
+     */
+    public static List<Shortcut> registerMultiShortcuts(String shortText, String longText, List<Character> characters, int requestedGroup) {
+        List<Shortcut> result = new ArrayList<>();
+        int i = 1;
+        Map<Integer, Integer> regularKeyCodes = KeyboardUtils.getRegularKeyCodesMap();
+        for (Character c : characters) {
+            Integer code = (int) c;
+            result.add(registerShortcut(
+                    new StringBuilder(shortText).append(" (").append(i).append(')').toString(), longText,
+                    // Add extended keyCode if not a regular one
+                    regularKeyCodes.containsKey(code) ? regularKeyCodes.get(code) : c | KeyboardUtils.EXTENDED_KEYCODE_FLAG,
+                    requestedGroup));
+            i++;
+        }
+        return result;
+    }
+
+    /**
      * Register a shortcut.
      *