Changeset 11031 in josm
- Timestamp:
- 2016-09-20T11:32:04+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
r10601 r11031 23 23 public class DownloadPrimitiveAction extends JosmAction { 24 24 25 public static final Shortcut SHORTCUT = Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")), 26 KeyEvent.VK_O, Shortcut.CTRL_SHIFT); 27 25 28 /** 26 29 * Constructs a new {@code DownloadPrimitiveAction}. … … 28 31 public DownloadPrimitiveAction() { 29 32 super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."), 30 Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")), 31 KeyEvent.VK_O, Shortcut.CTRL_SHIFT), true); 33 SHORTCUT, true); 32 34 putValue("help", ht("/Action/DownloadObject")); 33 35 } -
trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
r10881 r11031 23 23 24 24 import org.openstreetmap.josm.Main; 25 import org.openstreetmap.josm.actions.DownloadPrimitiveAction; 25 26 import org.openstreetmap.josm.data.Version; 26 27 import org.openstreetmap.josm.gui.datatransfer.OpenTransferHandler; 28 import org.openstreetmap.josm.gui.dialogs.MenuItemSearchDialog; 27 29 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference; 28 30 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener; … … 123 125 lg = new LinkGeneral("<html>" + STYLE + "<h1>" + "JOSM - " + tr("Java OpenStreetMap Editor") 124 126 + "</h1><h2 align=\"center\">" + tr("Downloading \"Message of the day\"") + "</h2></html>"); 125 // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM 126 lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none"); 127 // clear the build-in command ctrl+shift+O, ctrl+space because it is used as shortcut in JOSM 128 lg.getInputMap(JComponent.WHEN_FOCUSED).put(DownloadPrimitiveAction.SHORTCUT.getKeyStroke(), "none"); 129 lg.getInputMap(JComponent.WHEN_FOCUSED).put(MenuItemSearchDialog.Action.SHORTCUT.getKeyStroke(), "none"); 127 130 lg.setTransferHandler(null); 128 131 -
trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
r10611 r11031 113 113 public static class Action extends JosmAction { 114 114 115 public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL); 116 115 117 public Action() { 116 118 super(tr("Search menu items"), "dialogs/search", null, 117 S hortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL),119 SHORTCUT, 118 120 true, "dialogs/search-items", false); 119 121 }
Note:
See TracChangeset
for help on using the changeset viewer.