Changeset 4958 in josm


Ignore:
Timestamp:
2012-02-16T19:12:00+01:00 (8 years ago)
Author:
stoecker
Message:

fix remaining shortcut deprecations

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

Legend:

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

    r4418 r4958  
    1717        super(tr("Copy Coordinates"), null,
    1818                tr("Copy coordinates of selected nodes to clipboard."),
    19                 Shortcut.registerShortcut("copy:coordinates", tr("Edit: {0}", tr("Copy Coordinates")), KeyEvent.VK_C, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
     19                Shortcut.registerShortcut("copy:coordinates", tr("Edit: {0}", tr("Copy Coordinates")),
     20                KeyEvent.VK_C, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
    2021                false);
    2122        putValue("toolbar", "copy/coordinates");
  • trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

    r4126 r4958  
    4343    public CreateCircleAction() {
    4444        super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."),
    45                 Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")), KeyEvent.VK_O, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     45            Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")),
     46            KeyEvent.VK_O, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
    4647        putValue("help", ht("/Action/CreateCircle"));
    4748    }
  • trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

    r4731 r4958  
    4848    public CreateMultipolygonAction() {
    4949        super(tr("Create multipolygon"), "multipoly_create", tr("Create multipolygon."),
    50                 Shortcut.registerShortcut("tools:multipoly", tr("Tool: {0}", tr("Create multipolygon")),
    51                         KeyEvent.VK_A, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK ), true);
     50            Shortcut.registerShortcut("tools:multipoly", tr("Tool: {0}", tr("Create multipolygon")),
     51            KeyEvent.VK_A, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT2), true);
    5252    }
    5353    /**
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r4458 r4958  
    306306    // Adds the menu entry, Shortcuts, etc.
    307307    public JoinAreasAction() {
    308         super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")),
    309                 KeyEvent.VK_J, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     308        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"),
     309        Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")),
     310            KeyEvent.VK_J, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
    310311    }
    311312
  • trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

    r4868 r4958  
    6060        /* translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune" */
    6161        super(tr("Purge..."), "purge",  tr("Forget objects but do not delete them on server when uploading."),
    62                 Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")), KeyEvent.VK_P, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT)
    63                 , true);
     62                Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")),
     63                KeyEvent.VK_P, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
     64                true);
    6465        putValue("help", HelpUtil.ht("/Action/Purge"));
    6566    }
  • trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java

    r2323 r4958  
    2424    public SaveAsAction() {
    2525        super(tr("Save As..."), "save_as", tr("Save the current data to a new file."),
    26                 Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save As...")), KeyEvent.VK_S, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
     26            Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save As...")),
     27            KeyEvent.VK_S, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1));
    2728        putValue("help", ht("/Action/SaveAs"));
    2829    }
  • trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

    r3252 r4958  
    1515    public UnselectAllAction() {
    1616        super(tr("Unselect All"), "unselectall", tr("Unselect all objects."),
    17                 Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}", tr("Unselect All")), KeyEvent.VK_U, Shortcut.GROUP_EDIT), true);
    18         // this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
    19         // the correct group in
    20 
    21         // Add extra shortcut C-S-a
    22         Main.registerActionShortcut(this, Shortcut.registerShortcut("edit:unselectallfocus", tr("Edit: {0}", tr("Unselect All (Focus)")),
    23                 KeyEvent.VK_A, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
    24 
    25 
    26 
    27         // Add extra shortcut ESCAPE
    28         /*
    29          * FIXME: this isn't optimal. In a better world the mapmode actions
    30          * would be able to capture keyboard events and react accordingly. But
    31          * for now this is a reasonable approximation.
    32          */
    33         Main.registerActionShortcut(this, Shortcut.registerShortcut("edit:unselectallescape", tr("Edit: {0}", tr("Unselect All (Escape)")),
    34                 KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT));
     17            Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}",
     18            tr("Unselect All")), KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT), true);
    3519
    3620        putValue("help", ht("/Action/UnselectAll"));
  • trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java

    r4701 r4958  
    2323                "viewport-follow",
    2424                tr("Enable/disable automatic moving of the map view to last placed node"),
    25                 Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),KeyEvent.VK_F, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
     25                Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),
     26                KeyEvent.VK_F, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
    2627                true /* register shortcut */
    2728        );
  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r4908 r4958  
    7373    public CommandStackDialog(final MapFrame mapFrame) {
    7474        super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
    75                 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100, true);
     75                Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
     76                tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER
     77                +Shortcut.GROUPS_ALT1), 100, true);
    7678        undoTree.addMouseListener(new PopupMenuHandler());
    7779        undoTree.setRootVisible(false);
  • trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

    r4408 r4958  
    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.SHIFT_DEFAULT), 150);
     66                        Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
    6767        build();
    6868        HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/History"));
Note: See TracChangeset for help on using the changeset viewer.