Changeset 1023 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2008-10-05T17:06:27+02:00 (16 years ago)

Author:

stoecker

Message:

close bug #1622. Keyboard shortcuts and specific OS handling

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public final class ConflictDialog extends ToggleDialog {
@@ -51 +52 @@
 
         public ConflictDialog() {
-                super(tr("Conflict"), "conflict", tr("Merging conflicts."), KeyEvent.VK_C, 100);
+                super(tr("Conflict"), "conflict", tr("Merging conflicts."),
+                ShortCut.registerShortCut("subwindow:conflict", tr("Toggle conflict window"), KeyEvent.VK_C, ShortCut.GROUP_LAYER), 100);
                 displaylist.setCellRenderer(new OsmPrimitivRenderer());
                 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);