Changeset 4943 in josm for trunk/src

Timestamp:

2012-02-15T22:08:55+01:00 (13 years ago)

Author:

stoecker

Message:

fix some shortcut deprecations

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteTagsAction.java (modified) (1 diff)
• actions/SimplifyWayAction.java (modified) (1 diff)
• actions/ToggleGPXLinesAction.java (modified) (1 diff)
• gui/MainApplet.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)

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

@@ -34 +34 @@
         super(tr("Paste Tags"), "pastetags",
                 tr("Apply tags of contents of paste buffer to all selected items."),
-                Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")),
+                KeyEvent.VK_V, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1), true);
         Main.pasteBuffer.addPasteBufferChangedListener(this);
         putValue("help", ht("/Action/PasteTags"));

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

@@ -35 +35 @@
     public SimplifyWayAction() {
         super(tr("Simplify Way"), "simplify", tr("Delete unnecessary nodes from a way."), Shortcut.registerShortcut("tools:simplify", tr("Tool: {0}", tr("Simplify Way")),
-                KeyEvent.VK_Y, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_Y, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/SimplifyWay"));
     }

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

@@ -15 +15 @@
     public ToggleGPXLinesAction() {
         super(tr("Toggle GPX Lines"), "gps-lines", tr("Toggles the global setting ''{0}''.", tr("Draw lines between raw gps points.")),
-        Shortcut.registerShortcut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+        Shortcut.registerShortcut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/ToggleGPXLines"));
     }

trunk/src/org/openstreetmap/josm/gui/MainApplet.java

@@ -39 +39 @@
         public UploadPreferencesAction() {
             super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"),
-                    Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.VK_U, Shortcut.GROUP_HOTKEY), true);
+                    Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.VK_U, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
         }
         public void actionPerformed(ActionEvent e) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -1682 +1682 @@
 
         public PasteTagsAction() {
-            registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT).getKeyStroke());
+            registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1).getKeyStroke());
         }