Changeset 4953 in josm

Timestamp:

Feb 16, 2012 1:20:24 PM (15 months ago)

Author:

stoecker

Message:

fix some shortcut deprecations

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• FilterDialog.java (modified) (4 diffs)
• LayerListDialog.java (modified) (2 diffs)

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

@@ -69 +69 @@
     public FilterDialog(){
         super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
-                Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")), KeyEvent.VK_F, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 162);
+                Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")),
+                KeyEvent.VK_F, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 162);
         build();
 
@@ -89 +90 @@
     }
 
-    private static final KeyStroke ENABLE_FILTER_SHORTCUT
-    = Shortcut.registerShortcut("core_multikey:enableFilter", tr("Multikey: {0}", tr("Enable filter")), KeyEvent.VK_E, Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK).getKeyStroke();
-
-    private static final KeyStroke HIDING_FILTER_SHORTCUT
-    = Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")), KeyEvent.VK_H, Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK).getKeyStroke();
+    private static final Shortcut ENABLE_FILTER_SHORTCUT
+    = Shortcut.registerShortcut("core_multikey:enableFilter", tr("Multikey: {0}", tr("Enable filter")),
+    KeyEvent.VK_E, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2);
+
+    private static final Shortcut HIDING_FILTER_SHORTCUT
+    = Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")),
+    KeyEvent.VK_H, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2);
 
 
     protected final String[] columnToolTips = {
-            tr("Enable filter ({0}+{1})", KeyEvent.getKeyModifiersText(ENABLE_FILTER_SHORTCUT.getModifiers()), KeyEvent.getKeyText(ENABLE_FILTER_SHORTCUT.getKeyCode())),
-            tr("Hiding filter ({0}+{1})", KeyEvent.getKeyModifiersText(HIDING_FILTER_SHORTCUT.getModifiers()), KeyEvent.getKeyText(HIDING_FILTER_SHORTCUT.getKeyCode())),
+            Main.platform.makeTooltip(tr("Enable filter"), ENABLE_FILTER_SHORTCUT),
+            Main.platform.makeTooltip(tr("Hiding filter"), HIDING_FILTER_SHORTCUT),
             null,
             tr("Inverse filter"),
@@ -334 +337 @@
         EnableFilterAction() {
             putValue(SHORT_DESCRIPTION, tr("Enable filter"));
-            putValue(ACCELERATOR_KEY, ENABLE_FILTER_SHORTCUT);
+            ENABLE_FILTER_SHORTCUT.setAccelerator(this);
         }
 
@@ -353 +356 @@
         public HidingFilterAction() {
             putValue(SHORT_DESCRIPTION, tr("Hiding filter"));
-            putValue(ACCELERATOR_KEY, HIDING_FILTER_SHORTCUT);
+            HIDING_FILTER_SHORTCUT.setAccelerator(this);
         }
 

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

@@ -443 +443 @@
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
-            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
-            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK).getKeyStroke());
+            Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
+            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1).setAccelerator(this);
             if (init) {
                 updateEnabledState();
@@ -631 +631 @@
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
             putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
-            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
-            tr("Activate layer")), KeyEvent.VK_A, Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK).getKeyStroke());
+            Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
+            tr("Activate layer")), KeyEvent.VK_A, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1).setAccelerator(this);
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
         }