Changeset 14106 in josm
- Timestamp:
- 2018-08-08T17:33:09+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r13498 r14106 208 208 InputMapUtils.addEnterActionWhenAncestor(cbStartup, btnDownload.getAction()); 209 209 InputMapUtils.addEnterActionWhenAncestor(cbZoomToDownloadedData, btnDownload.getAction()); 210 InputMapUtils.addCtrlEnterAction(pnl, btnDownload.getAction()); 210 211 211 212 return pnl; -
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r13144 r14106 12 12 import java.awt.GridBagLayout; 13 13 import java.awt.event.ActionEvent; 14 import java.awt.event.InputEvent;15 import java.awt.event.KeyEvent;16 14 import java.awt.event.WindowAdapter; 17 15 import java.awt.event.WindowEvent; … … 31 29 32 30 import javax.swing.AbstractAction; 33 import javax.swing.Action;34 31 import javax.swing.BorderFactory; 35 32 import javax.swing.Icon; 36 33 import javax.swing.JButton; 37 import javax.swing.JComponent;38 34 import javax.swing.JOptionPane; 39 35 import javax.swing.JPanel; 40 36 import javax.swing.JTabbedPane; 41 import javax.swing.KeyStroke;42 37 43 38 import org.openstreetmap.josm.Main; … … 188 183 btnUpload.setFocusable(true); 189 184 InputMapUtils.enableEnter(btnUpload); 190 bindCtrlEnterToAction(getRootPane(), btnUpload.getAction());185 InputMapUtils.addCtrlEnterAction(getRootPane(), btnUpload.getAction()); 191 186 192 187 // -- cancel button … … 489 484 public void setupDialog() { 490 485 super.setupDialog(); 491 bindCtrlEnterToAction(getRootPane(), buttons.get(buttons.size() - 1).getAction());486 InputMapUtils.addCtrlEnterAction(getRootPane(), buttons.get(buttons.size() - 1).getAction()); 492 487 } 493 488 }; … … 703 698 } 704 699 705 private static void bindCtrlEnterToAction(JComponent component, Action actionToBind) {706 final KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK);707 component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(stroke, "ctrl_enter");708 component.getActionMap().put("ctrl_enter", actionToBind);709 }710 700 } -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
r13761 r14106 67 67 JPanel btns = new JPanel(new FlowLayout(FlowLayout.CENTER)); 68 68 btns.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); 69 btns.add(new JButton(new OKAction())); 69 OKAction okAction = new OKAction(); 70 btns.add(new JButton(okAction)); 70 71 btns.add(new JButton(new CancelAction())); 71 72 btns.add(new JButton(helpAction)); 72 73 pnl.add(expert, GBC.std().insets(5, 0, 0, 0)); 73 74 pnl.add(btns, GBC.std().fill(GBC.HORIZONTAL)); 75 InputMapUtils.addCtrlEnterAction(pnl, okAction); 74 76 return pnl; 75 77 } -
trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java
r12520 r14106 117 117 c.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape"); 118 118 } 119 120 /** 121 * Add an action activated with Ctrl+Enter key on a component. 122 * @param c The Swing component 123 * @param a action activated with Ctrl+Enter key 124 * @see JComponent#WHEN_IN_FOCUSED_WINDOW 125 */ 126 public static void addCtrlEnterAction(JComponent c, Action a) { 127 final KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK); 128 c.getActionMap().put("ctrl_enter", a); 129 c.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(stroke, "ctrl_enter"); 130 } 119 131 }
Note:
See TracChangeset
for help on using the changeset viewer.