Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12530) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12531) @@ -12,4 +12,6 @@ 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; @@ -29,10 +31,13 @@ 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; @@ -178,4 +183,5 @@ btnUpload.setFocusable(true); InputMapUtils.enableEnter(btnUpload); + bindCtrlEnterToAction(getRootPane(), btnUpload.getAction()); // -- cancel button @@ -476,5 +482,11 @@ } - ExtendedDialog dlg = new ExtendedDialog((Component) dialog, title, buttonTexts); + ExtendedDialog dlg = new ExtendedDialog((Component) dialog, title, buttonTexts) { + @Override + public void setupDialog() { + super.setupDialog(); + bindCtrlEnterToAction(getRootPane(), buttons.get(buttons.size() - 1).getAction()); + } + }; dlg.setContent("" + message + ""); dlg.setButtonIcons(buttonIcons); @@ -685,3 +697,9 @@ tpConfigPanels.setSelectedIndex(0); } + + 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); + } }