Changeset 17806 in josm for trunk/src/org

Timestamp:

2021-04-20T21:08:58+02:00 (4 years ago)

Author:

simon04

Message:

fix #17838 - Cmd+Shift+Down selects text on the welcome screen

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (1 diff)
• gui/GettingStarted.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -22 +22 @@
 
     /**
+     * Action shortcut (ctrl-shift-down by default), made public in order to be used from {@code GettingStarted} page.
+     */
+    public static final Shortcut SHORTCUT =
+            Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download data")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT);
+
+    /**
      * Constructs a new {@code DownloadAction}.
      */
     public DownloadAction() {
         super(tr("Download data..."), "download", tr("Download map data from a server of your choice"),
-              Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download data")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT),
-              true, false);
+                SHORTCUT, true, false);
         setHelpId(ht("/Action/Download"));
     }

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

@@ -20 +20 @@
 import javax.swing.event.HyperlinkListener;
 
+import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
@@ -139 +140 @@
                 + "</h1><h2 align=\"center\">" + tr("Downloading \"Message of the day\"") + "</h2></html>");
         // clear the build-in command ctrl+shift+O, ctrl+space, ctrl+H because it is used as shortcut in JOSM
+        lg.getInputMap(JComponent.WHEN_FOCUSED).put(DownloadAction.SHORTCUT.getKeyStroke(), "none");
         lg.getInputMap(JComponent.WHEN_FOCUSED).put(DownloadPrimitiveAction.SHORTCUT.getKeyStroke(), "none");
         lg.getInputMap(JComponent.WHEN_FOCUSED).put(MenuItemSearchDialog.Action.SHORTCUT.getKeyStroke(), "none");