Changeset 4500 in josm

Timestamp:

Oct 7, 2011 10:24:12 PM (20 months ago)

Author:

simon04

Message:

fix #5781 - change mnemonics of {add,edit,delete} property to alt+{a,s,d}, of audio menu to alt+u

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -353 +353 @@
 
         if (!Main.pref.getBoolean("audio.menuinvisible", false)) {
-            audioMenu = addMenu(marktr("Audio"), KeyEvent.VK_A, defaultMenuPos, ht("/Menu/Audio"));
+            audioMenu = addMenu(marktr("Audio"), KeyEvent.VK_U, defaultMenuPos, ht("/Menu/Audio"));
             add(audioMenu, audioPlayPause);
             add(audioMenu, audioNext);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -183 +183 @@
     private CopyAllKeyValueAction copyAllKeyValueAction = new CopyAllKeyValueAction();
     private AddAction addAction = new AddAction();
-    private Shortcut addActionShortcut = Shortcut.registerShortcut("properties:add", tr("Add Properties"), KeyEvent.VK_B,
-            Shortcut.GROUP_MNEMONIC);
 
     @Override
@@ -192 +190 @@
         MapView.addEditLayerChangeListener(this);
         updateSelection();
-        Main.registerActionShortcut(addAction, addActionShortcut);
     }
 
@@ -200 +197 @@
         SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
-        Main.unregisterActionShortcut(addAction, addActionShortcut);
     }
 
@@ -1070 +1066 @@
             putValue(SHORT_DESCRIPTION, tr("Delete the selected key in all objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
-            Shortcut s = Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_Q,
+            Shortcut s = Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_D,
                     Shortcut.GROUP_MNEMONIC);
             putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
@@ -1103 +1099 @@
             putValue(SHORT_DESCRIPTION, tr("Add a new key/value pair to all objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
+            Shortcut s = Shortcut.registerShortcut("properties:add", tr("Add Property"), KeyEvent.VK_A,
+                    Shortcut.GROUP_MNEMONIC);
+            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
         }
 
@@ -1115 +1114 @@
             putValue(SHORT_DESCRIPTION, tr("Edit the value of the selected key for all objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+            Shortcut s = Shortcut.registerShortcut("properties:edit", tr("Edit Properties"), KeyEvent.VK_S,
+                    Shortcut.GROUP_MNEMONIC);
+            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
             updateEnabledState();
         }