Changeset 14106 in josm for trunk/src/org

Timestamp:

2018-08-08T17:33:09+02:00 (6 years ago)

Author:

simon04

Message:

DownloadDialog, PreferenceDialog: bind Ctrl+Enter to main action

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/download/DownloadDialog.java (modified) (1 diff)
• gui/io/UploadDialog.java (modified) (5 diffs)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)
• tools/InputMapUtils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -208 +208 @@
         InputMapUtils.addEnterActionWhenAncestor(cbStartup, btnDownload.getAction());
         InputMapUtils.addEnterActionWhenAncestor(cbZoomToDownloadedData, btnDownload.getAction());
+        InputMapUtils.addCtrlEnterAction(pnl, btnDownload.getAction());
 
         return pnl;

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -12 +12 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -31 +29 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JButton;
-import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -188 +183 @@
         btnUpload.setFocusable(true);
         InputMapUtils.enableEnter(btnUpload);
-        bindCtrlEnterToAction(getRootPane(), btnUpload.getAction());
+        InputMapUtils.addCtrlEnterAction(getRootPane(), btnUpload.getAction());
 
         // -- cancel button
@@ -489 +484 @@
                 public void setupDialog() {
                     super.setupDialog();
-                    bindCtrlEnterToAction(getRootPane(), buttons.get(buttons.size() - 1).getAction());
+                    InputMapUtils.addCtrlEnterAction(getRootPane(), buttons.get(buttons.size() - 1).getAction());
                 }
             };
@@ -703 +698 @@
     }
 
-    private static void bindCtrlEnterToAction(JComponent component, Action actionToBind) {
-        final KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK);
-        component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(stroke, "ctrl_enter");
-        component.getActionMap().put("ctrl_enter", actionToBind);
-    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -67 +67 @@
         JPanel btns = new JPanel(new FlowLayout(FlowLayout.CENTER));
         btns.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        btns.add(new JButton(new OKAction()));
+        OKAction okAction = new OKAction();
+        btns.add(new JButton(okAction));
         btns.add(new JButton(new CancelAction()));
         btns.add(new JButton(helpAction));
         pnl.add(expert, GBC.std().insets(5, 0, 0, 0));
         pnl.add(btns, GBC.std().fill(GBC.HORIZONTAL));
+        InputMapUtils.addCtrlEnterAction(pnl, okAction);
         return pnl;
     }

trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java

@@ -117 +117 @@
          c.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape");
     }
+
+    /**
+     * Add an action activated with Ctrl+Enter key on a component.
+     * @param c The Swing component
+     * @param a action activated with Ctrl+Enter key
+     * @see JComponent#WHEN_IN_FOCUSED_WINDOW
+     */
+    public static void addCtrlEnterAction(JComponent c, Action a) {
+        final KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK);
+        c.getActionMap().put("ctrl_enter", a);
+        c.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(stroke, "ctrl_enter");
+    }
 }