Index: trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 11030)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 11031)
@@ -23,4 +23,7 @@
public class DownloadPrimitiveAction extends JosmAction {
+ public static final Shortcut SHORTCUT = Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")),
+ KeyEvent.VK_O, Shortcut.CTRL_SHIFT);
+
/**
* Constructs a new {@code DownloadPrimitiveAction}.
@@ -28,6 +31,5 @@
public DownloadPrimitiveAction() {
super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."),
- Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")),
- KeyEvent.VK_O, Shortcut.CTRL_SHIFT), true);
+ SHORTCUT, true);
putValue("help", ht("/Action/DownloadObject"));
}
Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 11030)
+++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 11031)
@@ -23,6 +23,8 @@
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.datatransfer.OpenTransferHandler;
+import org.openstreetmap.josm.gui.dialogs.MenuItemSearchDialog;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener;
@@ -123,6 +125,7 @@
lg = new LinkGeneral("" + STYLE + "" + "JOSM - " + tr("Java OpenStreetMap Editor")
+ "
" + tr("Downloading \"Message of the day\"") + "
");
- // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM
- lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none");
+ // clear the build-in command ctrl+shift+O, ctrl+space because it is used as shortcut in JOSM
+ lg.getInputMap(JComponent.WHEN_FOCUSED).put(DownloadPrimitiveAction.SHORTCUT.getKeyStroke(), "none");
+ lg.getInputMap(JComponent.WHEN_FOCUSED).put(MenuItemSearchDialog.Action.SHORTCUT.getKeyStroke(), "none");
lg.setTransferHandler(null);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (revision 11030)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (revision 11031)
@@ -113,7 +113,9 @@
public static class Action extends JosmAction {
+ public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL);
+
public Action() {
super(tr("Search menu items"), "dialogs/search", null,
- Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL),
+ SHORTCUT,
true, "dialogs/search-items", false);
}