Changeset 12523 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2017-07-27T01:30:42+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r12279 r12523 178 178 // Edit relation on Ctrl-Enter 179 179 displaylist.getActionMap().put("edit", editAction); 180 displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_ MASK), "edit");180 displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_DOWN_MASK), "edit"); 181 181 182 182 // Do not hide copy action because of default JList override (fix #9815) -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r12420 r12523 449 449 450 450 tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) 451 .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_ MASK), "onCopy");451 .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), "onCopy"); 452 452 tagTable.getActionMap().put("onCopy", copyKeyValueAction); 453 453 -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r12279 r12523 722 722 // Add tag on Shift-Enter 723 723 mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 724 KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_ MASK), "addAndContinue");724 KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_DOWN_MASK), "addAndContinue"); 725 725 mainPanel.getActionMap().put("addAndContinue", new AbstractAction() { 726 726 @Override … … 814 814 lines.add(sc.getKeyText() + ' ' + tr("to apply first suggestion")) 815 815 ); 816 lines.add( KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + ' '816 lines.add(Shortcut.getKeyText(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK)) + ' ' 817 817 +tr("to add without closing the dialog")); 818 818 Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK).ifPresent(sc -> -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r11658 r12523 242 242 243 243 getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 244 KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_ MASK), "checkClipboardContents");244 KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_DOWN_MASK), "checkClipboardContents"); 245 245 246 246 getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() { -
trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
r12497 r12523 65 65 // independent from the keyboard's labelling. But the operation system's locale 66 66 // usually matches the keyboard. This even works with my English Windows and my German keyboard. 67 private static final String SHIFT = KeyEvent.get KeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,67 private static final String SHIFT = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A, 68 68 KeyEvent.SHIFT_DOWN_MASK).getModifiers()); 69 private static final String CTRL = KeyEvent.get KeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,69 private static final String CTRL = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A, 70 70 KeyEvent.CTRL_DOWN_MASK).getModifiers()); 71 private static final String ALT = KeyEvent.get KeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,71 private static final String ALT = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A, 72 72 KeyEvent.ALT_DOWN_MASK).getModifiers()); 73 private static final String META = KeyEvent.get KeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,73 private static final String META = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A, 74 74 KeyEvent.META_DOWN_MASK).getModifiers()); 75 75 -
trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
r12384 r12523 354 354 addAction = new AddAction(); 355 355 getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) 356 .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_ MASK), "addTag");356 .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_DOWN_MASK), "addTag"); 357 357 getActionMap().put("addTag", addAction); 358 358 -
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r12279 r12523 216 216 // get edit results if the table looses the focus, for example if a user clicks "add tags" 217 217 propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); 218 propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_ MASK), "shiftenter");218 propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK), "shiftenter"); 219 219 propertyTable.getActionMap().put("shiftenter", new AbstractAction() { 220 220 @Override public void actionPerformed(ActionEvent e) {
Note:
See TracChangeset
for help on using the changeset viewer.