Changeset 7547 in josm for trunk/src/org


Ignore:
Timestamp:
2014-09-16T20:33:54+02:00 (5 years ago)
Author:
Don-vip
Message:

fix #9815 - Disable CTRL-C override in relation list

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r7539 r7547  
    6868import org.openstreetmap.josm.gui.layer.Layer;
    6969import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     70import org.openstreetmap.josm.gui.util.GuiHelper;
    7071import org.openstreetmap.josm.gui.util.HighlightHelper;
    7172import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
     
    173174        InputMapUtils.unassignCtrlShiftUpDown(displaylist, JComponent.WHEN_FOCUSED);
    174175
    175         // Select relation on Ctrl-Enter
     176        // Select relation on Enter
    176177        InputMapUtils.addEnterAction(displaylist, selectRelationAction);
    177178
     
    179180        displaylist.getActionMap().put("edit", editAction);
    180181        displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_MASK), "edit");
     182
     183        // Do not hide copy action because of default JList override (fix #9815)
     184        displaylist.getActionMap().put("copy", Main.main.menu.copy);
     185        displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, GuiHelper.getMenuShortcutKeyMaskEx()), "copy");
    181186
    182187        updateActionsRelationLists();
Note: See TracChangeset for help on using the changeset viewer.