Changeset 5659 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-01-03T20:19:57+01:00 (11 years ago)

Author:

akks

Message:

see #8024: Ctrl-Shift-1..5 in Add Tag dialog = add and continue

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -549 +549 @@
                 // Create action for reusing the tag, with keyboard shortcut Ctrl+(1-5)
                 String actionShortcutKey = "properties:recent:"+count;
+                String actionShortcutShiftKey = "properties:recent:shift:"+count;
                 Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, null, KeyEvent.VK_0+count, Shortcut.CTRL);
                 final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) {
@@ -561 +562 @@
                     }
                 };
+                Shortcut scShift = Shortcut.registerShortcut(actionShortcutShiftKey, null, KeyEvent.VK_0+count, Shortcut.CTRL_SHIFT);
+                final JosmAction actionShift = new JosmAction(actionShortcutShiftKey, null, tr("Use this tag again"), scShift, false) {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        action.actionPerformed(null);
+                        performTagAdding();
+                        selectKeysComboBox();
+                    }
+                };
                 recentTagsActions.add(action);
+                recentTagsActions.add(actionShift);
                 disableTagIfNeeded(t, action);
                 // Find and display icon
@@ -580 +591 @@
                     mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey);
                     mainPanel.getActionMap().put(actionShortcutKey, action);
+                    mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scShift.getKeyStroke(), actionShortcutShiftKey);
+                    mainPanel.getActionMap().put(actionShortcutShiftKey, actionShift);
                     // Make the tag label clickable and set tooltip to the action description (this displays also the keyboard shortcut)
                     tagLabel.setToolTipText((String) action.getValue(Action.SHORT_DESCRIPTION));