Changeset 1050 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2008-10-23T11:25:14+02:00 (16 years ago)

Author:

stoecker

Message:

added modifier support to ShortCut definitions. Removed all internal conflicts

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (1 diff)
• CreateCircleAction.java (modified) (1 diff)
• PasteTagsAction.java (modified) (1 diff)
• SaveAsAction.java (modified) (1 diff)
• UnselectAllAction.java (modified) (1 diff)
• audio/AudioSlowerAction.java (modified) (1 diff)

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

@@ -68 +68 @@
 
         public AboutAction() {
-                super(tr("About"), "about", tr("Display the about screen."), ShortCut.registerShortCut("system:about", tr("About..."), KeyEvent.VK_F1, ShortCut.GROUP_DIRECT), true);
+                super(tr("About"), "about", tr("Display the about screen."), ShortCut.registerShortCut("system:about", tr("About..."), KeyEvent.VK_F1, ShortCut.GROUP_DIRECT, ShortCut.SHIFT), true);
         }
 

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

@@ -36 +36 @@
         public CreateCircleAction() {
                 super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."),
-                ShortCut.registerShortCut("tools:createcircle", tr("Tool: Create circle"), KeyEvent.VK_O, ShortCut.GROUP_EDIT), true);
+                ShortCut.registerShortCut("tools:createcircle", tr("Tool: Create circle"), KeyEvent.VK_O, ShortCut.GROUP_EDIT, ShortCut.SHIFT), true);
         }
 

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

@@ -27 +27 @@
                 super(tr("Paste Tags"), "pastetags",
                         tr("Apply tags of contents of paste buffer to all selected items."),
-                        ShortCut.registerShortCut("system:pastestyle", tr("Edit: Paste tags"), KeyEvent.VK_V, ShortCut.GROUP_MENU), true);
+                        ShortCut.registerShortCut("system:pastestyle", tr("Edit: Paste tags"), KeyEvent.VK_V, ShortCut.GROUP_MENU, ShortCut.SHIFT_CTRL), true);
                 DataSet.selListeners.add(this);
                 copyAction.addListener(this);

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

@@ -23 +23 @@
         public SaveAsAction(Layer layer) {
                 super(tr("Save as ..."), "save_as", tr("Save the current data to a new file."),
-                ShortCut.registerShortCut("system:saveas", tr("File: Save as..."), KeyEvent.VK_S, ShortCut.GROUP_MENU), layer);
+                ShortCut.registerShortCut("system:saveas", tr("File: Save as..."), KeyEvent.VK_S, ShortCut.GROUP_MENU, ShortCut.SHIFT_CTRL), layer);
         }
 

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

@@ -21 +21 @@
                 // Add extra shortcut C-S-a
                 Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                ShortCut.registerShortCut("edit:unselectall2", tr("Edit: Unselect all (2)"), KeyEvent.VK_A, ShortCut.GROUP_MENU).getKeyStroke(),
+                ShortCut.registerShortCut("edit:unselectall2", tr("Edit: Unselect all (2)"),
+                KeyEvent.VK_A, ShortCut.GROUP_MENU, ShortCut.SHIFT_CTRL).getKeyStroke(),
                 tr("Unselect All"));
 

trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java

@@ -11 +11 @@
         public AudioSlowerAction() {
                 super(tr("Slower"), "audio-slower", tr("Slower Forward"),
-                ShortCut.registerShortCut("audio:slower", tr("Audio: Slower"), KeyEvent.VK_F9, ShortCut.GROUP_DIRECT), true);
+                ShortCut.registerShortCut("audio:slower", tr("Audio: Slower"), KeyEvent.VK_F4, ShortCut.GROUP_DIRECT), true);
         }
 }