Changeset 5711 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-02-12T21:56:20+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8415 - Replaced shortcut Ctrl-Alt-Shift-U. It now uploads current selection instead of uploading preferences in the applet (patch by Cobra)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UploadSelectionAction.java (modified) (3 diffs)
• gui/MainApplet.java (modified) (1 diff)

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

@@ -6 +6 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.io.IOException;
 import java.util.Collection;
@@ -32 +33 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ExceptionUtil;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
@@ -44 +46 @@
                 "uploadselection",
                 tr("Upload all changes in the current selection to the OSM server."),
-                null, /* no shortcut */
+                Shortcut.registerShortcut("file:uploadSelection", tr("File: {0}", tr("Upload selection")), KeyEvent.VK_U, Shortcut.ALT_CTRL_SHIFT),
                 true);
         putValue("help", ht("/Action/UploadSelection"));

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

@@ -40 +40 @@
         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.ALT_CTRL_SHIFT), true);
+                    Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
         }
         public void actionPerformed(ActionEvent e) {