Changeset 5711 in josm for trunk


Ignore:
Timestamp:
2013-02-12T21:56:20+01:00 (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r5360 r5711  
    66
    77import java.awt.event.ActionEvent;
     8import java.awt.event.KeyEvent;
    89import java.io.IOException;
    910import java.util.Collection;
     
    3233import org.openstreetmap.josm.tools.CheckParameterUtil;
    3334import org.openstreetmap.josm.tools.ExceptionUtil;
     35import org.openstreetmap.josm.tools.Shortcut;
    3436import org.xml.sax.SAXException;
    3537
     
    4446                "uploadselection",
    4547                tr("Upload all changes in the current selection to the OSM server."),
    46                 null, /* no shortcut */
     48                Shortcut.registerShortcut("file:uploadSelection", tr("File: {0}", tr("Upload selection")), KeyEvent.VK_U, Shortcut.ALT_CTRL_SHIFT),
    4749                true);
    4850        putValue("help", ht("/Action/UploadSelection"));
  • trunk/src/org/openstreetmap/josm/gui/MainApplet.java

    r5279 r5711  
    4040        public UploadPreferencesAction() {
    4141            super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"),
    42                     Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.VK_U, Shortcut.ALT_CTRL_SHIFT), true);
     42                    Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
    4343        }
    4444        public void actionPerformed(ActionEvent e) {
Note: See TracChangeset for help on using the changeset viewer.