Changeset 4957 in josm

Timestamp:

2012-02-16T18:41:28+01:00 (13 years ago)

Author:

stoecker

Message:

some shortcut fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeSelectionAction.java (modified) (1 diff)
• actions/ValidateAction.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (4 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java

@@ -22 +22 @@
         super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"),
             Shortcut.registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")),
-            KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
+            KeyEvent.VK_M, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
             true /* register */
         );

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -46 +46 @@
     public ValidateAction() {
         super(tr("Validation"), "dialogs/validator", tr("Performs the data validation"),
-                Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")), KeyEvent.VK_V, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+            Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")),
+            KeyEvent.VK_V, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -95 +95 @@
                 "delete",
                 tr("Delete nodes or ways."),
-                Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")), KeyEvent.VK_D, Shortcut.GROUP_EDIT),
+                Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")),
+                KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT2),
                 mapFrame,
                 ImageProvider.getCursor("normal", "delete"));

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

@@ -88 +88 @@
     public RelationListDialog() {
         super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
-                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R,
-                        Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
+                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")),
+                KeyEvent.VK_R, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
 
         // create the list of relations
@@ -142 +142 @@
 
         // activate DEL in the list of relations
-        displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "deleteRelation");
-        displaylist.getActionMap().put("deleteRelation", deleteAction);
+        //displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "deleteRelation");
+        //displaylist.getActionMap().put("deleteRelation", deleteAction);
 
         popupMenu = new RelationDialogPopupMenu(displaylist);

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

@@ -128 +128 @@
     public SelectionListDialog() {
         super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
-                Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT),
+                Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}",
+                tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER+
+                Shortcut.GROUPS_ALT1),
                 150, // default height
                 true // default is "show dialog"
@@ -145 +147 @@
         lstPrimitives.addMouseListener(new SelectionPopupMenuLauncher());
         lstPrimitives.addMouseListener(new DblClickHandler());
-        
+
         popupMenu = new SelectionPopup(lstPrimitives);
     }
@@ -225 +227 @@
         return popupMenu.add(a);
     }
-    
+
     public void addPopupMenuListener(PopupMenuListener l) {
         popupMenu.addPopupMenuListener(l);
@@ -233 +235 @@
         popupMenu.addPopupMenuListener(l);
     }
-    
+
     public Collection<OsmPrimitive> getSelectedPrimitives() {
         return model.getSelected();
     }
-    
+
     /**
      * Updates the dialog title with a summary of the current JOSM selection

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

@@ -87 +87 @@
         super(tr("Validation Results"), "validator", tr("Open the validation window."),
                 Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation results")),
-                        KeyEvent.VK_V, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
+                        KeyEvent.VK_V, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
 
         popupMenu = new JPopupMenu();