- Timestamp:
- 2012-01-21T14:30:56+01:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
r3995 r4836 20 20 public class MergeSelectionAction extends AbstractMergeAction { 21 21 public MergeSelectionAction() { 22 super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"), Shortcut 23 .registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")), KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), 24 true /* register */ 22 super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"), 23 Shortcut.registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")), 24 KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), 25 true /* register */ 25 26 ); 26 27 putValue("help", ht("/Action/MergeSelection")); -
trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
r4527 r4836 124 124 125 125 public ParallelWayAction(MapFrame mapFrame) { 126 super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"), Shortcut 127 .registerShortcut("mapmode:parallel", tr("Mode: {0}", tr("Parallel")), KeyEvent.VK_P, 128 Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), mapFrame, ImageProvider.getCursor("normal", 129 "parallel")); 126 super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"), 127 Shortcut.registerShortcut("mapmode:parallel", tr("Mode: {0}", 128 tr("Parallel")), KeyEvent.VK_P, Shortcut.GROUP_EDIT, 129 Shortcut.SHIFT_DEFAULT), mapFrame, ImageProvider.getCursor("normal", 130 "parallel")); 130 131 putValue("help", ht("/Action/Parallel")); 131 132 mv = mapFrame.mapView;
Note:
See TracChangeset
for help on using the changeset viewer.