Changeset 4982 in josm for trunk/src


Ignore:
Timestamp:
2012-02-18T12:53:53+01:00 (8 years ago)
Author:
stoecker
Message:

see #7226 - patch by akks (fixed a bit) - fix shortcut deprecations

Location:
trunk/src/org/openstreetmap/josm
Files:
97 edited

Legend:

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

    r4968 r4982  
    272272
    273273        registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
    274                 KeyEvent.VK_F1, Shortcut.GROUP_DIRECT));
     274                KeyEvent.VK_F1, Shortcut.DIRECT));
    275275
    276276        if (initListener != null) {
  • trunk/src/org/openstreetmap/josm/actions/AboutAction.java

    r4942 r4982  
    3939        super(tr("About"), "about", tr("Display the about screen."),
    4040            Shortcut.registerShortcut("system:about", tr("About"),
    41             KeyEvent.VK_F1, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1), true);
     41            KeyEvent.VK_F1, Shortcut.SHIFT), true);
    4242    }
    4343
  • trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

    r4942 r4982  
    2727        super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."),
    2828                Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")),
    29                         KeyEvent.VK_D, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     29                        KeyEvent.VK_D, Shortcut.SHIFT), true);
    3030        putValue("help", ht("/Action/AddNode"));
    3131    }
  • trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

    r2323 r4982  
    3737        super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."),
    3838                Shortcut.registerShortcut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")),
    39                         KeyEvent.VK_O, Shortcut.GROUP_EDIT), true);
     39                        KeyEvent.VK_O, Shortcut.DIRECT), true);
    4040        putValue("help", ht("/Action/AlignInCircle"));
    4141    }
  • trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

    r4632 r4982  
    3333    public AlignInLineAction() {
    3434        super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."),
    35                 Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.GROUP_EDIT), true);
     35                Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.DIRECT), true);
    3636        putValue("help", ht("/Action/AlignInLine"));
    3737    }
  • trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

    r4932 r4982  
    107107    public AutoScaleAction(String mode) {
    108108        super(tr("Zoom to {0}", tr(mode)), "dialogs/autoscale/" + mode, tr("Zoom the view to {0}.", tr(mode)),
    109                 Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.GROUP_EDIT), true);
     109                Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.DIRECT), true);
    110110        String modeHelp = Character.toUpperCase(mode.charAt(0)) + mode.substring(1);
    111111        putValue("help", "Action/AutoScale/" + modeHelp);
  • trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java

    r4851 r4982  
    3535                Shortcut.registerShortcut("menu:windows:changesetdialog",
    3636                        tr("Toggle visibility of Changeset Manager window"),
    37                         KeyEvent.VK_C, Shortcut.GROUPS_ALT2 + Shortcut.GROUP_HOTKEY),
     37                        KeyEvent.VK_C, Shortcut.ALT_CTRL),
    3838                true /* register shortcut */
    3939        );
  • trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

    r4892 r4982  
    3737            Shortcut.registerShortcut("system:closechangeset",
    3838                tr("File: {0}", tr("Closes open changesets")),
    39                 KeyEvent.VK_Q, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
     39                KeyEvent.VK_Q, Shortcut.ALT_CTRL),
    4040            true
    4141        );
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r4892 r4982  
    5353    public CombineWayAction() {
    5454        super(tr("Combine Way"), "combineway", tr("Combine several ways into one."),
    55                 Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.GROUP_EDIT), true);
     55                Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.DIRECT), true);
    5656        putValue("help", ht("/Action/CombineWay"));
    5757    }
  • trunk/src/org/openstreetmap/josm/actions/CopyAction.java

    r4380 r4982  
    2323        super(tr("Copy"), "copy",
    2424                tr("Copy selected objects to paste buffer."),
    25                 Shortcut.registerShortcut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, Shortcut.GROUP_MENU), true);
     25                Shortcut.registerShortcut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, Shortcut.CTRL), true);
    2626        putValue("help", ht("/Action/Copy"));
    2727    }
  • trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java

    r4958 r4982  
    1818                tr("Copy coordinates of selected nodes to clipboard."),
    1919                Shortcut.registerShortcut("copy:coordinates", tr("Edit: {0}", tr("Copy Coordinates")),
    20                 KeyEvent.VK_C, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
     20                KeyEvent.VK_C, Shortcut.CTRL_SHIFT),
    2121                false);
    2222        putValue("toolbar", "copy/coordinates");
  • trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

    r4958 r4982  
    4444        super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."),
    4545            Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")),
    46             KeyEvent.VK_O, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     46            KeyEvent.VK_O, Shortcut.SHIFT), true);
    4747        putValue("help", ht("/Action/CreateCircle"));
    4848    }
  • trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

    r4958 r4982  
    4949        super(tr("Create multipolygon"), "multipoly_create", tr("Create multipolygon."),
    5050            Shortcut.registerShortcut("tools:multipoly", tr("Tool: {0}", tr("Create multipolygon")),
    51             KeyEvent.VK_A, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT2), true);
     51            KeyEvent.VK_A, Shortcut.ALT_CTRL), true);
    5252    }
    5353    /**
  • trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

    r3835 r4982  
    1717    public DeleteAction() {
    1818        super(tr("Delete"), "dialogs/delete", tr("Delete selected objects."),
    19                 Shortcut.registerShortcut("system:delete", tr("Edit: {0}", tr("Delete")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT), true);
     19                Shortcut.registerShortcut("system:delete", tr("Edit: {0}", tr("Delete")), KeyEvent.VK_DELETE, Shortcut.DIRECT), true);
    2020        putValue("help", ht("/Action/Delete"));
    2121    }
  • trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

    r4942 r4982  
    3131        super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."),
    3232                Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B,
    33                 Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     33                Shortcut.SHIFT), true);
    3434        putValue("help", ht("/Action/DistributeNodes"));
    3535    }
  • trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

    r4966 r4982  
    2828    public DownloadAction() {
    2929        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
    30                 Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT1), true);
     30                Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT), true);
    3131        putValue("help", ht("/Action/Download"));
    3232    }
  • trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java

    r4796 r4982  
    5959    public DownloadPrimitiveAction() {
    6060        super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."),
    61                 Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")), KeyEvent.VK_O, Shortcut.GROUP_MENU + Shortcut.GROUPS_ALT1), true);
     61                Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")), KeyEvent.VK_O, Shortcut.CTRL_SHIFT), true);
    6262        putValue("help", ht("/Action/DownloadObject"));
    6363    }
  • trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

    r4700 r4982  
    2828    public DownloadReferrersAction() {
    2929        super(tr("Download parent ways/relations..."), "downloadreferrers", tr("Download objects referring to one of the selected objects"),
    30                 Shortcut.registerShortcut("file:downloadreferrers", tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY), true);
     30                Shortcut.registerShortcut("file:downloadreferrers", tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.ALT_CTRL), true);
    3131        putValue("help", ht("/Action/DownloadParentWaysAndRelation"));
    3232    }
  • trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java

    r3969 r4982  
    2020        super(tr("Duplicate"), "duplicate",
    2121                tr("Duplicate selection by copy and immediate paste."),
    22                 Shortcut.registerShortcut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, Shortcut.GROUP_MENU), true);
     22                Shortcut.registerShortcut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, Shortcut.CTRL), true);
    2323        putValue("help", ht("/Action/Duplicate"));
    2424    }
  • trunk/src/org/openstreetmap/josm/actions/ExitAction.java

    r3378 r4982  
    2222    public ExitAction() {
    2323        super(tr("Exit"), "exit", tr("Exit the application."),
    24                 Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.GROUP_MENU), true);
     24                Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true);
    2525        putValue("help", ht("/Action/Exit"));
    2626    }
  • trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

    r4671 r4982  
    4040                Shortcut.registerShortcut("tools:followline", tr(
    4141                "Tool: {0}", tr("Follow")),
    42                 KeyEvent.VK_F, Shortcut.GROUP_EDIT), true);
     42                KeyEvent.VK_F, Shortcut.DIRECT), true);
    4343    }
    4444
  • trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

    r4203 r4982  
    3636                null, /* no icon */
    3737                tr("Toggle fullscreen view"),
    38                 Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"),KeyEvent.VK_F11, Shortcut.GROUP_DIRECT),
     38                Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"),KeyEvent.VK_F11, Shortcut.DIRECT),
    3939                false /* register */
    4040        );
  • trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

    r3570 r4982  
    2929    public GpxExportAction() {
    3030        super(tr("Export to GPX..."), "exportgpx", tr("Export the data to GPX file."),
    31                 Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX..."), KeyEvent.VK_E, Shortcut.GROUP_MENU));
     31                Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX..."), KeyEvent.VK_E, Shortcut.CTRL));
    3232        putValue("help", ht("/Action/GpxExport"));
    3333    }
  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

    r4408 r4982  
    2121                                tr("Display history information about OSM ways, nodes, or relations."),
    2222                                Shortcut.registerShortcut("core:historyinfo",
    23                                 tr("History"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), false);
     23                                tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
    2424                putValue("help", ht("/Action/ObjectHistory"));
    2525                putValue("toolbar", "action/historyinfo");
  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

    r4942 r4982  
    1818                tr("Display history information about OSM ways, nodes, or relations in web browser."),
    1919                Shortcut.registerShortcut("core:historyinfoweb",
    20                         tr("History (web)"), KeyEvent.VK_H, Shortcut.GROUP_DIRECT3),
     20                        tr("History (web)"), KeyEvent.VK_H, Shortcut.CTRL_SHIFT),
    2121                true, "action/historyinfoweb", true);
    2222        putValue("help", ht("/Action/ObjectHistoryWeb"));
  • trunk/src/org/openstreetmap/josm/actions/InfoAction.java

    r4942 r4982  
    2121            tr("Display advanced object information about OSM nodes, ways, or relations."),
    2222            Shortcut.registerShortcut("core:info",
    23                 tr("Advanced info"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY),
     23                tr("Advanced info"), KeyEvent.VK_I, Shortcut.CTRL),
    2424            true, "action/info", true);
    2525        putValue("help", ht("/Action/InfoAboutElements"));
  • trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

    r4942 r4982  
    1818                tr("Display object information about OSM nodes, ways, or relations in web browser."),
    1919                Shortcut.registerShortcut("core:infoweb",
    20                         tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT1),
     20                        tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.CTRL_SHIFT),
    2121                true, "action/infoweb", true);
    2222        putValue("help", ht("/Action/InfoAboutElementsWeb"));
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r4958 r4982  
    308308        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"),
    309309        Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")),
    310             KeyEvent.VK_J, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     310            KeyEvent.VK_J, Shortcut.SHIFT), true);
    311311    }
    312312
  • trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

    r4788 r4982  
    2929    public JoinNodeWayAction() {
    3030        super(tr("Join Node to Way"), "joinnodeway", tr("Include a node into the nearest way segments"),
    31                 Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join Node to Way")), KeyEvent.VK_J, Shortcut.GROUP_EDIT), true);
     31                Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join Node to Way")), KeyEvent.VK_J, Shortcut.DIRECT), true);
    3232        putValue("help", ht("/Action/JoinNodeWay"));
    3333    }
  • trunk/src/org/openstreetmap/josm/actions/JosmAction.java

    r4908 r4982  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
     6import java.awt.event.KeyEvent;
    67import java.util.Collection;
    78
     
    4243    public Shortcut getShortcut() {
    4344        if (sc == null) {
    44             sc = Shortcut.registerShortcut("core:none", tr("No Shortcut"), 0, Shortcut.GROUP_NONE);
     45            sc = Shortcut.registerShortcut("core:none", tr("No Shortcut"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
    4546            // as this shortcut is shared by all action that don't want to have a shortcut,
    4647            // we shouldn't allow the user to change it...
  • trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

    r4960 r4982  
    3030    public JumpToAction() {
    3131        super(tr("Jump To Position"), null, tr("Opens a dialog that allows to jump to a specific location"), Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
    32         KeyEvent.VK_J, Shortcut.GROUP_HOTKEY), false);
     32        KeyEvent.VK_J, Shortcut.CTRL), false);
    3333        putValue("toolbar", "action/jumpto");
    3434        Main.toolbar.register(this);
  • trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

    r4851 r4982  
    2020            tr("Merge the current layer into another layer"),
    2121            Shortcut.registerShortcut("system:merge", tr("Edit: {0}",
    22             tr("Merge")), KeyEvent.VK_M, Shortcut.GROUP_MENU),
     22            tr("Merge")), KeyEvent.VK_M, Shortcut.CTRL),
    2323            true, "action/mergelayer", true);
    2424        putValue("help", ht("/Action/MergeLayer"));
  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r4315 r4982  
    5353    public MergeNodesAction() {
    5454        super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
    55                 Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true);
     55                Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.DIRECT), true);
    5656        putValue("help", ht("/Action/MergeNodes"));
    5757    }
  • trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java

    r4957 r4982  
    2222        super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"),
    2323            Shortcut.registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")),
    24             KeyEvent.VK_M, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
     24            KeyEvent.VK_M, Shortcut.CTRL_SHIFT),
    2525            true /* register */
    2626        );
  • trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

    r4942 r4982  
    3434        super(tr("Mirror"), "mirror", tr("Mirror selected nodes and ways."),
    3535                Shortcut.registerShortcut("tools:mirror", tr("Tool: {0}", tr("Mirror")),
    36                         KeyEvent.VK_M, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     36                        KeyEvent.VK_M, Shortcut.SHIFT), true);
    3737        putValue("help", ht("/Action/Mirror"));
    3838    }
  • trunk/src/org/openstreetmap/josm/actions/MoveAction.java

    r4139 r4982  
    5050        Shortcut sc;
    5151        if        (dir == Direction.UP)   {
    52             sc = Shortcut.registerShortcut("core:moveup",    tr("Move objects {0}", tr("up")), KeyEvent.VK_UP,    Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
     52            sc = Shortcut.registerShortcut("core:moveup",    tr("Move objects {0}", tr("up")), KeyEvent.VK_UP,    Shortcut.SHIFT);
    5353        } else if (dir == Direction.DOWN)  {
    54             sc = Shortcut.registerShortcut("core:movedown",  tr("Move objects {0}", tr("down")), KeyEvent.VK_DOWN,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
     54            sc = Shortcut.registerShortcut("core:movedown",  tr("Move objects {0}", tr("down")), KeyEvent.VK_DOWN,  Shortcut.SHIFT);
    5555        } else if (dir == Direction.LEFT)  {
    56             sc = Shortcut.registerShortcut("core:moveleft",  tr("Move objects {0}", tr("left")), KeyEvent.VK_LEFT,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
     56            sc = Shortcut.registerShortcut("core:moveleft",  tr("Move objects {0}", tr("left")), KeyEvent.VK_LEFT,  Shortcut.SHIFT);
    5757        } else { //dir == Direction.RIGHT) {
    58             sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", tr("right")), KeyEvent.VK_RIGHT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
     58            sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", tr("right")), KeyEvent.VK_RIGHT, Shortcut.SHIFT);
    5959        }
    6060        return sc;
  • trunk/src/org/openstreetmap/josm/actions/NewAction.java

    r3753 r4982  
    1717    public NewAction() {
    1818        super(tr("New Layer"), "new", tr("Create a new map layer."),
    19                 Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.GROUP_MENU), true);
     19                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true);
    2020        putValue("help", ht("/Action/NewLayer"));
    2121    }
  • trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

    r4404 r4982  
    4949    public OpenFileAction() {
    5050        super(tr("Open..."), "open", tr("Open a file."),
    51                 Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.GROUP_MENU));
     51                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL));
    5252        putValue("help", ht("/Action/Open"));
    5353
  • trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

    r4530 r4982  
    4747        /* I18N: Command to download a specific location/URL */
    4848        super(tr("Open Location..."), "openlocation", tr("Open an URL."),
    49                 Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")), KeyEvent.VK_L, Shortcut.GROUP_MENU), true);
     49                Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")), KeyEvent.VK_L, Shortcut.CTRL), true);
    5050        putValue("help", ht("/Action/OpenLocation"));
    5151        this.downloadTasks = new ArrayList<Class<? extends DownloadTask>>();
  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r4942 r4982  
    5151                Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")),
    5252                        KeyEvent.VK_Q,
    53                         Shortcut.GROUP_EDIT), true);
     53                        Shortcut.DIRECT), true);
    5454        putValue("help", ht("/Action/OrthogonalizeShape"));
    5555    }
     
    8383                    Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Tool: {0}", tr("Orthogonalize Shape / Undo")),
    8484                            KeyEvent.VK_Q,
    85                             Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
     85                            Shortcut.SHIFT),
    8686                    true, "action/orthogonalize/undo", true);
    8787        }
  • trunk/src/org/openstreetmap/josm/actions/PasteAction.java

    r3995 r4982  
    3232    public PasteAction() {
    3333        super(tr("Paste"), "paste", tr("Paste contents of paste buffer."),
    34                 Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true);
     34                Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.CTRL), true);
    3535        putValue("help", ht("/Action/Paste"));
    3636        Main.pasteBuffer.addPasteBufferChangedListener(this);
  • trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java

    r4943 r4982  
    3535                tr("Apply tags of contents of paste buffer to all selected items."),
    3636                Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")),
    37                 KeyEvent.VK_V, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1), true);
     37                KeyEvent.VK_V, Shortcut.CTRL_SHIFT), true);
    3838        Main.pasteBuffer.addPasteBufferChangedListener(this);
    3939        putValue("help", ht("/Action/PasteTags"));
  • trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

    r2748 r4982  
    2424    public PreferencesAction() {
    2525        super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
    26                 Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.GROUP_DIRECT), true);
     26                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true);
    2727        putValue("help", ht("/Action/Preferences"));
    2828    }
  • trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

    r4958 r4982  
    6161        super(tr("Purge..."), "purge",  tr("Forget objects but do not delete them on server when uploading."),
    6262                Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")),
    63                 KeyEvent.VK_P, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
     63                KeyEvent.VK_P, Shortcut.CTRL_SHIFT),
    6464                true);
    6565        putValue("help", HelpUtil.ht("/Action/Purge"));
  • trunk/src/org/openstreetmap/josm/actions/RedoAction.java

    r4918 r4982  
    2424    public RedoAction() {
    2525        super(tr("Redo"), "redo", tr("Redo the last undone action."),
    26                 Shortcut.registerShortcut("system:redo", tr("Edit: {0}", tr("Redo")), KeyEvent.VK_Y, Shortcut.GROUP_MENU), true);
     26                Shortcut.registerShortcut("system:redo", tr("Edit: {0}", tr("Redo")), KeyEvent.VK_Y, Shortcut.CTRL), true);
    2727        setEnabled(false);
    2828        putValue("help", ht("/Action/Redo"));
  • trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

    r3504 r4982  
    6666    public ReverseWayAction() {
    6767        super(tr("Reverse Ways"), "wayflip", tr("Reverse the direction of all selected ways."),
    68                 Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.GROUP_EDIT), true);
     68                Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.DIRECT), true);
    6969        putValue("help", ht("/Action/ReverseWays"));
    7070    }
  • trunk/src/org/openstreetmap/josm/actions/SaveAction.java

    r4114 r4982  
    2727    public SaveAction() {
    2828        super(tr("Save"), "save", tr("Save the current data."),
    29                 Shortcut.registerShortcut("system:save", tr("File: {0}", tr("Save")), KeyEvent.VK_S, Shortcut.GROUP_MENU));
     29                Shortcut.registerShortcut("system:save", tr("File: {0}", tr("Save")), KeyEvent.VK_S, Shortcut.CTRL));
    3030        putValue("help", ht("/Action/Save"));
    3131    }
  • trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java

    r4958 r4982  
    2525        super(tr("Save As..."), "save_as", tr("Save the current data to a new file."),
    2626            Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save As...")),
    27             KeyEvent.VK_S, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1));
     27            KeyEvent.VK_S, Shortcut.CTRL_SHIFT));
    2828        putValue("help", ht("/Action/SaveAs"));
    2929    }
  • trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java

    r2512 r4982  
    1414    public SelectAllAction() {
    1515        super(tr("Select All"),"selectall", tr("Select all undeleted objects in the data layer. This selects incomplete objects too."),
    16                 Shortcut.registerShortcut("system:selectall", tr("Edit: {0}", tr("Select All")), KeyEvent.VK_A, Shortcut.GROUP_MENU), true);
     16                Shortcut.registerShortcut("system:selectall", tr("Edit: {0}", tr("Select All")), KeyEvent.VK_A, Shortcut.CTRL), true);
    1717        putValue("help", ht("/Action/SelectAll"));
    1818    }
  • trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

    r4943 r4982  
    3535    public SimplifyWayAction() {
    3636        super(tr("Simplify Way"), "simplify", tr("Delete unnecessary nodes from a way."), Shortcut.registerShortcut("tools:simplify", tr("Tool: {0}", tr("Simplify Way")),
    37                 KeyEvent.VK_Y, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     37                KeyEvent.VK_Y, Shortcut.SHIFT), true);
    3838        putValue("help", ht("/Action/SimplifyWay"));
    3939    }
  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r4254 r4982  
    8080    public SplitWayAction() {
    8181        super(tr("Split Way"), "splitway", tr("Split a way at the selected node."),
    82                 Shortcut.registerShortcut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.GROUP_EDIT), true);
     82                Shortcut.registerShortcut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.DIRECT), true);
    8383        putValue("help", ht("/Action/SplitWay"));
    8484    }
  • trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java

    r4962 r4982  
    1515    public ToggleGPXLinesAction() {
    1616        super(tr("Toggle GPX Lines"), "gps-lines", tr("Toggles the global setting ''{0}''.", tr("Draw lines between raw gps points.")),
    17         Shortcut.registerShortcut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1), true);
     17        Shortcut.registerShortcut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, Shortcut.SHIFT), true);
    1818        putValue("help", ht("/Action/ToggleGPXLines"));
    1919    }
  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r4650 r4982  
    5353    public UnGlueAction() {
    5454        super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."),
    55                 Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.GROUP_EDIT), true);
     55                Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.DIRECT), true);
    5656        putValue("help", ht("/Action/UnGlue"));
    5757    }
  • trunk/src/org/openstreetmap/josm/actions/UndoAction.java

    r4918 r4982  
    2424    public UndoAction() {
    2525        super(tr("Undo"), "undo", tr("Undo the last action."),
    26                 Shortcut.registerShortcut("system:undo", tr("Edit: {0}", tr("Undo")), KeyEvent.VK_Z, Shortcut.GROUP_MENU), true);
     26                Shortcut.registerShortcut("system:undo", tr("Edit: {0}", tr("Undo")), KeyEvent.VK_Z, Shortcut.CTRL), true);
    2727        setEnabled(false);
    2828        putValue("help", ht("/Action/Undo"));
  • trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

    r4958 r4982  
    1616        super(tr("Unselect All"), "unselectall", tr("Unselect all objects."),
    1717            Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}",
    18             tr("Unselect All")), KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT), true);
     18            tr("Unselect All")), KeyEvent.VK_ESCAPE, Shortcut.DIRECT), true);
    1919
    2020        putValue("help", ht("/Action/UnselectAll"));
  • trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

    r4927 r4982  
    2626                Shortcut.registerShortcut("file:updatedata",
    2727                        tr("File: {0}", tr("Update data")),
    28                         KeyEvent.VK_U, Shortcut.GROUP_HOTKEY),
     28                        KeyEvent.VK_U, Shortcut.CTRL),
    2929                true);
    3030        putValue("help", ht("/Action/UpdateData"));
  • trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java

    r4927 r4982  
    2727                Shortcut.registerShortcut("file:updatemodified",
    2828                        tr("File: {0}", tr("Update modified")), KeyEvent.VK_M,
    29                         Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
     29                        Shortcut.ALT_CTRL),
    3030                        true);
    3131        putValue("help", ht("/Action/UpdateModified"));
  • trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

    r4927 r4982  
    8888                Shortcut.registerShortcut("file:updateselection",
    8989                        tr("File: {0}", tr("Update selection")), KeyEvent.VK_U,
    90                         Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
     90                        Shortcut.ALT_CTRL),
    9191                true);
    9292        putValue("help", ht("/Action/UpdateSelection"));
  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r4967 r4982  
    8787    public UploadAction() {
    8888        super(tr("Upload data"), "upload", tr("Upload all changes in the active data layer to the OSM server"),
    89                 Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload data")), KeyEvent.VK_UP, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT1), true);
     89                Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload data")), KeyEvent.VK_UP, Shortcut.CTRL_SHIFT), true);
    9090        putValue("help", ht("/Action/Upload"));
    9191    }
  • trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

    r4957 r4982  
    4747        super(tr("Validation"), "dialogs/validator", tr("Performs the data validation"),
    4848            Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")),
    49             KeyEvent.VK_V, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
     49            KeyEvent.VK_V, Shortcut.SHIFT), true);
    5050    }
    5151
  • trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java

    r4958 r4982  
    2424                tr("Enable/disable automatic moving of the map view to last placed node"),
    2525                Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),
    26                 KeyEvent.VK_F, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
     26                KeyEvent.VK_F, Shortcut.CTRL_SHIFT),
    2727                true /* register shortcut */
    2828        );
  • trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java

    r4177 r4982  
    2727                null, /* no icon */
    2828                tr("Enable/disable rendering the map as wireframe only"),
    29                 Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),KeyEvent.VK_W, Shortcut.GROUP_MENU),
     29                Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),KeyEvent.VK_W, Shortcut.CTRL),
    3030                false /* register toolbar */
    3131        );
  • trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java

    r4891 r4982  
    2020                "dialogs/zoomin",
    2121                tr("Zoom In"),
    22                 Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom In")),KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT),
     22                Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom In")),KeyEvent.VK_PLUS, Shortcut.DIRECT),
    2323                true
    2424        );
     
    2727        Main.registerActionShortcut(this,
    2828            Shortcut.registerShortcut("view:zoominkeypad", tr("View: {0}", tr("Zoom In (Keypad)")),
    29                 KeyEvent.VK_ADD, Shortcut.GROUP_DIRECT));
     29                KeyEvent.VK_ADD, Shortcut.DIRECT));
    3030    }
    3131
  • trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java

    r4891 r4982  
    1717    public ZoomOutAction() {
    1818        super(tr("Zoom Out"), "dialogs/zoomout", tr("Zoom Out"),
    19                 Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom Out")), KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), true);
     19                Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom Out")), KeyEvent.VK_MINUS, Shortcut.DIRECT), true);
    2020        putValue("help", ht("/Action/ZoomOut"));
    2121        // make numpad - behave like -
    2222        Main.registerActionShortcut(this,
    2323            Shortcut.registerShortcut("view:zoomoutkeypad", tr("View: {0}", tr("Zoom Out (Keypad)")),
    24                 KeyEvent.VK_SUBTRACT, Shortcut.GROUP_DIRECT));
     24                KeyEvent.VK_SUBTRACT, Shortcut.DIRECT));
    2525    }
    2626
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java

    r3754 r4982  
    1919    public AudioBackAction() {
    2020        super(trc("audio", "Back"), "audio-back", trc("audio", "Jump back."),
    21         Shortcut.registerShortcut("audio:back", tr("Audio: {0}", trc("audio", "Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true);
     21        Shortcut.registerShortcut("audio:back", tr("Audio: {0}", trc("audio", "Back")), KeyEvent.VK_F6, Shortcut.DIRECT), true);
    2222        this.putValue("help", ht("/Action/AudioBack"));
    2323    }
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java

    r3754 r4982  
    1414    public AudioFasterAction() {
    1515        super(trc("audio", "Faster"), "audio-faster", trc("audio", "Faster Forward"),
    16         Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", trc("audio", "Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true);
     16        Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", trc("audio", "Faster")), KeyEvent.VK_F9, Shortcut.DIRECT), true);
    1717        this.putValue("help", ht("/Action/AudioFaster"));
    1818    }
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java

    r2857 r4982  
    1717    public AudioFwdAction() {
    1818        super(trc("audio", "Forward"), "audio-fwd", trc("audio", "Jump forward"),
    19         Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", trc("audio", "Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true);
     19        Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", trc("audio", "Forward")), KeyEvent.VK_F7, Shortcut.DIRECT), true);
    2020    }
    2121
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java

    r2857 r4982  
    1616    public AudioNextAction() {
    1717        super(trc("audio", "Next Marker"), "audio-next", trc("audio", "Play next marker."),
    18         Shortcut.registerShortcut("audio:next", tr("Audio: {0}", trc("audio", "Next Marker")), KeyEvent.VK_F8, Shortcut.GROUP_DIRECT), true);
     18        Shortcut.registerShortcut("audio:next", tr("Audio: {0}", trc("audio", "Next Marker")), KeyEvent.VK_F8, Shortcut.DIRECT), true);
    1919    }
    2020
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

    r2857 r4982  
    1717    public AudioPlayPauseAction() {
    1818        super(trc("audio", "Play/Pause"), "audio-playpause", tr("Play/pause audio."),
    19         Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", trc("audio", "Play/Pause")), KeyEvent.VK_PERIOD, Shortcut.GROUP_DIRECT), true);
     19        Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", trc("audio", "Play/Pause")), KeyEvent.VK_PERIOD, Shortcut.DIRECT), true);
    2020    }
    2121
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java

    r2857 r4982  
    1616    public AudioPrevAction() {
    1717        super(trc("audio", "Previous Marker"), "audio-prev", trc("audio", "Play previous marker."),
    18         Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", trc("audio", "Previous Marker")), KeyEvent.VK_F5, Shortcut.GROUP_DIRECT), true);
     18        Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", trc("audio", "Previous Marker")), KeyEvent.VK_F5, Shortcut.DIRECT), true);
    1919    }
    2020
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java

    r3754 r4982  
    1414    public AudioSlowerAction() {
    1515        super(trc("audio", "Slower"), "audio-slower", trc("audio", "Slower Forward"),
    16         Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true);
     16        Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.DIRECT), true);
    1717        this.putValue("help", ht("/Action/AudioSlower"));
    1818    }
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r4957 r4982  
    9696                tr("Delete nodes or ways."),
    9797                Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")),
    98                 KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT2),
     98                KeyEvent.VK_DELETE, Shortcut.CTRL),
    9999                mapFrame,
    100100                ImageProvider.getCursor("normal", "delete"));
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r4956 r4982  
    106106    public DrawAction(MapFrame mapFrame) {
    107107        super(tr("Draw"), "node/autonode", tr("Draw nodes"),
    108             Shortcut.registerShortcut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, Shortcut.GROUP_EDIT),
     108            Shortcut.registerShortcut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, Shortcut.DIRECT),
    109109            mapFrame, ImageProvider.getCursor("crosshair", null));
    110110
    111111        snappingShortcut = Shortcut.registerShortcut("mapmode:drawanglesnapping",
    112             tr("Mode: Draw Angle snapping"), KeyEvent.VK_TAB, Shortcut.GROUP_EDIT);
     112            tr("Mode: Draw Angle snapping"), KeyEvent.VK_TAB, Shortcut.DIRECT);
    113113        addMenuItem();
    114114        snapHelper.setMenuCheckBox(snapCheckboxMenuItem);
     
    174174        Main.map.statusLine.getAnglePanel().addMouseListener(snapHelper.anglePopupListener);
    175175        backspaceShortcut = Shortcut.registerShortcut("mapmode:backspace",
    176             tr("Backspace in Add mode"), KeyEvent.VK_BACK_SPACE, Shortcut.GROUP_EDIT);
     176            tr("Backspace in Add mode"), KeyEvent.VK_BACK_SPACE, Shortcut.DIRECT);
    177177        Main.registerActionShortcut(new BackSpaceAction(), backspaceShortcut);
    178178
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r4620 r4982  
    127127    public ExtrudeAction(MapFrame mapFrame) {
    128128        super(tr("Extrude"), "extrude/extrude", tr("Create areas"),
    129                 Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.GROUP_EDIT),
     129                Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.DIRECT),
    130130                mapFrame,
    131131                ImageProvider.getCursor("normal", "rectangle"));
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

    r4855 r4982  
    101101                Shortcut.registerShortcut("mapmode:ImproveWayAccuracy",
    102102                tr("Mode: {0}", tr("Improve Way Accuracy")),
    103                 KeyEvent.VK_W, Shortcut.GROUP_EDIT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     103                KeyEvent.VK_W, Shortcut.DIRECT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
    104104
    105105        cursorSelect = ImageProvider.getCursor("normal", "mode");
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

    r4956 r4982  
    126126        super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"),
    127127            Shortcut.registerShortcut("mapmode:parallel", tr("Mode: {0}",
    128             tr("Parallel")), KeyEvent.VK_P, Shortcut.GROUP_EDIT+
    129             Shortcut.GROUPS_ALT1), mapFrame, ImageProvider.getCursor("normal",
    130             "parallel"));
     128                tr("Parallel")), KeyEvent.VK_P, Shortcut.SHIFT),
     129            mapFrame, ImageProvider.getCursor("normal", "parallel"));
    131130        putValue("help", ht("/Action/Parallel"));
    132131        mv = mapFrame.mapView;
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r4934 r4982  
    157157    public SelectAction(MapFrame mapFrame) {
    158158        super(tr("Select"), "move/move", tr("Select, move, scale and rotate objects"),
    159                 Shortcut.registerShortcut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, Shortcut.GROUP_EDIT),
     159                Shortcut.registerShortcut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, Shortcut.DIRECT),
    160160                mapFrame,
    161161                ImageProvider.getCursor("normal", "selection"));
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

    r3594 r4982  
    4343    public ZoomAction(MapFrame mapFrame) {
    4444        super(tr("Zoom"), "zoom", tr("Zoom and move map"),
    45                 Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT),
     45                Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.DIRECT),
    4646                mapFrame, ImageProvider.getCursor("normal", "zoom"));
    4747        selectionManager = new SelectionManager(this, true, mapFrame.mapView);
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r4948 r4982  
    121121    public SearchAction() {
    122122        super(tr("Search..."), "dialogs/search", tr("Search for objects."),
    123                 Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.GROUP_HOTKEY), true);
     123                Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.CTRL), true);
    124124        putValue("help", ht("/Action/Search"));
    125125    }
  • trunk/src/org/openstreetmap/josm/gui/MainApplet.java

    r4943 r4982  
    3939        public UploadPreferencesAction() {
    4040            super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"),
    41                     Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.VK_U, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
     41                    Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.VK_U, Shortcut.ALT_CTRL_SHIFT), true);
    4242        }
    4343        public void actionPerformed(ActionEvent e) {
  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r4975 r4982  
    515515        current = helpMenu.add(help); // FIXME why is help not a JosmAction?
    516516        current.setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1,
    517                 Shortcut.GROUP_DIRECT).getKeyStroke());
     517                Shortcut.DIRECT).getKeyStroke());
    518518        add(helpMenu, about);
    519519
  • trunk/src/org/openstreetmap/josm/gui/MapMover.java

    r4494 r4982  
    8181        if (contentPane != null) {
    8282            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    83                 Shortcut.registerShortcut("system:movefocusright", tr("Map: {0}", tr("Move right")), KeyEvent.VK_RIGHT, Shortcut.GROUP_HOTKEY).getKeyStroke(),
     83                Shortcut.registerShortcut("system:movefocusright", tr("Map: {0}", tr("Move right")), KeyEvent.VK_RIGHT, Shortcut.CTRL).getKeyStroke(),
    8484                "MapMover.Zoomer.right");
    8585            contentPane.getActionMap().put("MapMover.Zoomer.right", new ZoomerAction("right"));
    8686
    8787            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    88                 Shortcut.registerShortcut("system:movefocusleft", tr("Map: {0}", tr("Move left")), KeyEvent.VK_LEFT, Shortcut.GROUP_HOTKEY).getKeyStroke(),
     88                Shortcut.registerShortcut("system:movefocusleft", tr("Map: {0}", tr("Move left")), KeyEvent.VK_LEFT, Shortcut.CTRL).getKeyStroke(),
    8989                "MapMover.Zoomer.left");
    9090            contentPane.getActionMap().put("MapMover.Zoomer.left", new ZoomerAction("left"));
    9191
    9292            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    93                 Shortcut.registerShortcut("system:movefocusup", tr("Map: {0}", tr("Move up")), KeyEvent.VK_UP, Shortcut.GROUP_HOTKEY).getKeyStroke(),
     93                Shortcut.registerShortcut("system:movefocusup", tr("Map: {0}", tr("Move up")), KeyEvent.VK_UP, Shortcut.CTRL).getKeyStroke(),
    9494                "MapMover.Zoomer.up");
    9595            contentPane.getActionMap().put("MapMover.Zoomer.up", new ZoomerAction("up"));
    9696
    9797            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    98                 Shortcut.registerShortcut("system:movefocusdown", tr("Map: {0}", tr("Move down")), KeyEvent.VK_DOWN, Shortcut.GROUP_HOTKEY).getKeyStroke(),
     98                Shortcut.registerShortcut("system:movefocusdown", tr("Map: {0}", tr("Move down")), KeyEvent.VK_DOWN, Shortcut.CTRL).getKeyStroke(),
    9999                "MapMover.Zoomer.down");
    100100            contentPane.getActionMap().put("MapMover.Zoomer.down", new ZoomerAction("down"));
    101101
    102102            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    103                 Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.GROUP_HOTKEY).getKeyStroke(),
     103                Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL).getKeyStroke(),
    104104                "MapMover.Zoomer.in");
    105105            contentPane.getActionMap().put("MapMover.Zoomer.in", new ZoomerAction(","));
    106106
    107107            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    108                 Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.GROUP_HOTKEY).getKeyStroke(),
     108                Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL).getKeyStroke(),
    109109                "MapMover.Zoomer.out");
    110110            contentPane.getActionMap().put("MapMover.Zoomer.out", new ZoomerAction("."));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r4958 r4982  
    7474        super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
    7575                Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
    76                 tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER
    77                 +Shortcut.GROUPS_ALT1), 100, true);
     76                tr("Command Stack")), KeyEvent.VK_O, Shortcut.ALT_SHIFT), 100, true);
    7877        undoTree.addMouseListener(new PopupMenuHandler());
    7978        undoTree.setRootVisible(false);
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r4951 r4982  
    110110        super(tr("Conflict"), "conflict", tr("Resolve conflicts."),
    111111                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
    112                 KeyEvent.VK_C, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 100);
     112                KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);
    113113
    114114        build();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r4953 r4982  
    7070        super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
    7171                Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")),
    72                 KeyEvent.VK_F, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 162);
     72                KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
    7373        build();
    7474
     
    9292    private static final Shortcut ENABLE_FILTER_SHORTCUT
    9393    = Shortcut.registerShortcut("core_multikey:enableFilter", tr("Multikey: {0}", tr("Enable filter")),
    94     KeyEvent.VK_E, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2);
     94    KeyEvent.VK_E, Shortcut.ALT_CTRL);
    9595
    9696    private static final Shortcut HIDING_FILTER_SHORTCUT
    9797    = Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")),
    98     KeyEvent.VK_H, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2);
     98    KeyEvent.VK_H, Shortcut.ALT_CTRL);
    9999
    100100
  • trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

    r4958 r4982  
    6464        super(tr("History"), "history", tr("Display the history of all selected items."),
    6565                Shortcut.registerShortcut("subwindow:history", tr("Toggle: {0}", tr("History")), KeyEvent.VK_H,
    66                         Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
     66                        Shortcut.ALT_SHIFT), 150);
    6767        build();
    6868        HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/History"));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r4959 r4982  
    150150        for(int i=0; i < 10; i++) {
    151151            visibilityToggleShortcuts[i] = Shortcut.registerShortcut("subwindow:layers:toggleLayer" + (i+1),
    152                     tr("Toggle visibility of layer: {0}", (i+1)), k[i], Shortcut.GROUP_LAYER);
     152                    tr("Toggle visibility of layer: {0}", (i+1)), k[i], Shortcut.ALT);
    153153            visibilityToggleActions[i] = new ToggleLayerIndexVisibility(i);
    154154            Main.registerActionShortcut(visibilityToggleActions[i], visibilityToggleShortcuts[i]);
     
    162162        super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."),
    163163                Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L,
    164                 Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER), 100, true);
     164                Shortcut.ALT_SHIFT), 100, true);
    165165
    166166        // create the models
     
    443443            putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
    444444            Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
    445             tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1).setAccelerator(this);
     445            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT).setAccelerator(this);
    446446            if (init) {
    447447                updateEnabledState();
     
    631631            putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
    632632            Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
    633             tr("Activate layer")), KeyEvent.VK_A, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1).setAccelerator(this);
     633            tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT).setAccelerator(this);
    634634            putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
    635635        }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

    r4956 r4982  
    8787        super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"),
    8888            Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
    89             KeyEvent.VK_M, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
     89            KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150);
    9090        build();
    9191    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r4957 r4982  
    8989        super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
    9090                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")),
    91                 KeyEvent.VK_R, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
     91                KeyEvent.VK_R, Shortcut.ALT_SHIFT), 150);
    9292
    9393        // create the list of relations
  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r4957 r4982  
    129129        super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
    130130                Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}",
    131                 tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER+
    132                 Shortcut.GROUPS_ALT1),
     131                tr("Current Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT),
    133132                150, // default height
    134133                true // default is "show dialog"
  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r4947 r4982  
    6868    public UserListDialog() {
    6969        super(tr("Authors"), "userlist", tr("Open a list of people working on the selected objects."),
    70                 Shortcut.registerShortcut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
     70                Shortcut.registerShortcut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150);
    7171
    7272        build();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r4957 r4982  
    8787        super(tr("Validation Results"), "validator", tr("Open the validation window."),
    8888                Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation results")),
    89                         KeyEvent.VK_V, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
     89                        KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150);
    9090
    9191        popupMenu = new JPopupMenu();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r4949 r4982  
    654654        super(tr("Properties/Memberships"), "propertiesdialog", tr("Properties for selected objects."),
    655655                Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Properties/Memberships")), KeyEvent.VK_P,
    656                         Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150, true);
     656                        Shortcut.ALT_SHIFT), 150, true);
    657657
    658658        // setting up the properties table
     
    10611061            super(tr("Delete"), "dialogs/delete", tr("Delete the selected key in all objects"),
    10621062                    Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_D,
    1063                             Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), false);
     1063                            Shortcut.ALT_CTRL_SHIFT), false);
    10641064            updateEnabledState();
    10651065        }
     
    11621162            super(tr("Add"), "dialogs/add", tr("Add a new key/value pair to all objects"),
    11631163                    Shortcut.registerShortcut("properties:add", tr("Add Property"), KeyEvent.VK_A,
    1164                             Shortcut.GROUP_DIRECT2), false);
     1164                            Shortcut.ALT), false);
    11651165        }
    11661166
     
    11751175            super(tr("Edit"), "dialogs/edit", tr("Edit the value of the selected key for all objects"),
    11761176                    Shortcut.registerShortcut("properties:edit", tr("Edit Properties"), KeyEvent.VK_S,
    1177                             Shortcut.GROUP_DIRECT2), false);
     1177                            Shortcut.ALT), false);
    11781178            updateEnabledState();
    11791179        }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r4943 r4982  
    977977            putValue(NAME, tr("Sort"));
    978978            Shortcut sc = Shortcut.registerShortcut("relationeditor:sort", tr("Relation Editor: Sort"),
    979                 KeyEvent.VK_END, Shortcut.GROUP_DIRECT2);
     979                KeyEvent.VK_END, Shortcut.ALT);
    980980            sc.setAccelerator(this);
    981981            putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
     
    10021002            putValue(NAME, tr("Reverse"));
    10031003        //  Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"),
    1004         //      KeyEvent.VK_END, Shortcut.GROUP_DIRECT2)
     1004        //      KeyEvent.VK_END, Shortcut.ALT)
    10051005            updateEnabledState();
    10061006        }
     
    10251025            // putValue(NAME, tr("Move Up"));
    10261026            Shortcut sc = Shortcut.registerShortcut("relationeditor:moveup", tr("Relation Editor: Move Up"),
    1027                 KeyEvent.VK_UP, Shortcut.GROUP_DIRECT2);
     1027                KeyEvent.VK_UP, Shortcut.ALT);
    10281028            sc.setAccelerator(this);
    10291029            putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
     
    10461046            // putValue(NAME, tr("Move Down"));
    10471047            Shortcut sc = Shortcut.registerShortcut("relationeditor:movedown", tr("Relation Editor: Move Down"),
    1048                 KeyEvent.VK_DOWN, Shortcut.GROUP_DIRECT2);
     1048                KeyEvent.VK_DOWN, Shortcut.ALT);
    10491049            sc.setAccelerator(this);
    10501050            putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
     
    10671067            putValue(NAME, tr("Remove"));
    10681068            Shortcut sc = Shortcut.registerShortcut("relationeditor:remove", tr("Relation Editor: Remove"),
    1069                 KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT2);
     1069                KeyEvent.VK_DELETE, Shortcut.ALT);
    10701070            sc.setAccelerator(this);
    10711071            putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
     
    14041404            putValue(NAME, tr("Download Members"));
    14051405            Shortcut sc = Shortcut.registerShortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
    1406                 KeyEvent.VK_HOME, Shortcut.GROUP_DIRECT2);
     1406                KeyEvent.VK_HOME, Shortcut.ALT);
    14071407            sc.setAccelerator(this);
    14081408            putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
     
    14361436            putValue(NAME, tr("Download Members"));
    14371437        //  Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
    1438         //      KeyEvent.VK_K, Shortcut.GROUP_DIRECT2)
     1438        //      KeyEvent.VK_K, Shortcut.ALT)
    14391439            updateEnabledState();
    14401440        }
     
    16821682
    16831683        public PasteTagsAction() {
    1684             registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1).getKeyStroke());
     1684            registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke());
    16851685        }
    16861686
  • trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

    r4942 r4982  
    3535        public JumpToNextMarker(JumpToMarkerLayer layer) {
    3636            Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
    37                 KeyEvent.VK_J, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2).setAccelerator(this);
     37                KeyEvent.VK_J, Shortcut.ALT_CTRL).setAccelerator(this);
    3838            putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
    3939            putValue(NAME, tr("Jump to next marker"));
     
    9191
    9292            Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")),
    93                 KeyEvent.VK_P, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2).setAccelerator(this);
     93                KeyEvent.VK_P, Shortcut.ALT_CTRL).setAccelerator(this);
    9494            putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
    9595            putValue(NAME, tr("Jump to previous marker"));
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r4897 r4982  
    6565    private ImageViewerDialog() {
    6666        super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
    67         tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.GROUP_EDIT), 200);
     67        tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
    6868
    6969        /* Don't show a detached dialog right from the start. */
     
    8383        btnPrevious.setPreferredSize(buttonDim);
    8484        Shortcut scPrev = Shortcut.registerShortcut(
    85                 "geoimage:previous", tr("Geoimage: {0}", tr("Show previous Image")), KeyEvent.VK_PAGE_UP, Shortcut.GROUP_DIRECT);
     85                "geoimage:previous", tr("Geoimage: {0}", tr("Show previous Image")), KeyEvent.VK_PAGE_UP, Shortcut.DIRECT);
    8686        final String APREVIOUS = "Previous Image";
    8787        Main.registerActionShortcut(prevAction, scPrev);
     
    9494        btnDelete.setPreferredSize(buttonDim);
    9595        Shortcut scDelete = Shortcut.registerShortcut(
    96                 "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
     96                "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT);
    9797        Main.registerActionShortcut(delAction, scDelete);
    9898        btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), DELETE_TEXT);
     
    103103        btnDeleteFromDisk.setPreferredSize(buttonDim);
    104104        Shortcut scDeleteFromDisk = Shortcut.registerShortcut(
    105                 "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY);
     105                "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT);
    106106        final String ADELFROMDISK = "Delete image file from disk";
    107107        Main.registerActionShortcut(delFromDiskAction, scDeleteFromDisk);
     
    113113        btnNext.setPreferredSize(buttonDim);
    114114        Shortcut scNext = Shortcut.registerShortcut(
    115                 "geoimage:next", tr("Geoimage: {0}", tr("Show next Image")), KeyEvent.VK_PAGE_DOWN, Shortcut.GROUP_DIRECT);
     115                "geoimage:next", tr("Geoimage: {0}", tr("Show next Image")), KeyEvent.VK_PAGE_DOWN, Shortcut.DIRECT);
    116116        final String ANEXT = "Next Image";
    117117        Main.registerActionShortcut(nextAction, scNext);
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java

    r4286 r4982  
    1515    public TaggingPresetSearchAction() {
    1616        super(tr("Search preset"), "dialogs/search", tr("Show preset search dialog"),
    17                 Shortcut.registerShortcut("preset:search", tr("Search presets"), KeyEvent.VK_F3, Shortcut.GROUP_DIRECT), false);
     17                Shortcut.registerShortcut("preset:search", tr("Search presets"), KeyEvent.VK_F3, Shortcut.DIRECT), false);
    1818        putValue("toolbar", "presets/search");
    1919        Main.toolbar.register(this);
Note: See TracChangeset for help on using the changeset viewer.