Changeset 5449 in josm

Timestamp:

2012-08-17T07:45:35+02:00 (12 years ago)

Author:

jttt

Message:

Show multikey shortcut hint in menu

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/FilterDialog.java (modified) (7 diffs)
• dialogs/LayerListDialog.java (modified) (4 diffs)
• layer/JumpToMarkerActions.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import javax.swing.JCheckBox;
 import javax.swing.JTable;
-import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
@@ -73 +72 @@
         super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
                 Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")),
-                KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
+                        KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
         build();
         enableFilterAction = new EnableFilterAction();
@@ -96 +95 @@
     private static final Shortcut ENABLE_FILTER_SHORTCUT
     = Shortcut.registerShortcut("core_multikey:enableFilter", tr("Multikey: {0}", tr("Enable filter")),
-    KeyEvent.VK_E, Shortcut.ALT_CTRL);
+            KeyEvent.VK_E, Shortcut.ALT_CTRL);
 
     private static final Shortcut HIDING_FILTER_SHORTCUT
     = Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")),
-    KeyEvent.VK_H, Shortcut.ALT_CTRL);
+            KeyEvent.VK_H, Shortcut.ALT_CTRL);
 
 
@@ -214 +213 @@
             }
         });
-        
+
         // Toggle filter "enabled" on Enter
         InputMapUtils.addEnterAction(userTable, new AbstractAction() {
@@ -246 +245 @@
         super.destroy();
     }
-    
+
     static class StringRenderer extends DefaultTableCellRenderer {
         @Override
@@ -389 +388 @@
         EnableFilterAction() {
             putValue(SHORT_DESCRIPTION, tr("Enable filter"));
+            ENABLE_FILTER_SHORTCUT.setAccelerator(this);
         }
 
@@ -412 +412 @@
         public HidingFilterAction() {
             putValue(SHORT_DESCRIPTION, tr("Hiding filter"));
+            HIDING_FILTER_SHORTCUT.setAccelerator(this);
         }
 

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

@@ -274 +274 @@
                 );
         getActionMap().put("delete", deleteLayerAction);
-        
+
         // Activate layer on Enter key press
         InputMapUtils.addEnterAction(layerList, new AbstractAction() {
@@ -282 +282 @@
             }
         });
-        
+
         // Show/Activate layer on Enter key press
         InputMapUtils.addSpacebarAction(layerList, showHideLayerAction);
-        
+
         createLayout(layerList, true, Arrays.asList(new SideButton[] {
                 new SideButton(moveUpAction, false),
@@ -469 +469 @@
             multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
                     tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT);
+            multikeyShortcut.setAccelerator(this);
             if (init) {
                 updateEnabledState();
@@ -671 +672 @@
             multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
                     tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT);
+            multikeyShortcut.setAccelerator(this);
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
         }

trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

@@ -25 +25 @@
     private static JumpToNextMarker jumpToNextMarkerAction;
     private static JumpToPreviousMarker jumpToPreviousMarkerAction;
-            
+
     public static void initialize() {
         jumpToNextMarkerAction = new JumpToNextMarker(null);
@@ -32 +32 @@
         MultikeyActionsHandler.getInstance().addAction(jumpToPreviousMarkerAction);
     }
-    
+
     public static void unregisterActions() {
         MultikeyActionsHandler.getInstance().removeAction(jumpToNextMarkerAction);
@@ -46 +46 @@
         public JumpToNextMarker(JumpToMarkerLayer layer) {
             multikeyShortcut = Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
-                KeyEvent.VK_J, Shortcut.ALT_CTRL);
+                    KeyEvent.VK_J, Shortcut.ALT_CTRL);
+            multikeyShortcut.setAccelerator(this);
             putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
             putValue(NAME, tr("Jump to next marker"));
@@ -107 +108 @@
             this.layer = (Layer)layer;
 
-            Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")),
-                KeyEvent.VK_P, Shortcut.ALT_CTRL).setAccelerator(this);
+            multikeyShortcut = Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")),
+                    KeyEvent.VK_P, Shortcut.ALT_CTRL);
+            multikeyShortcut.setAccelerator(this);
             putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
             putValue(NAME, tr("Jump to previous marker"));