Ignore:
Timestamp:
2020-10-13T20:21:52+02:00 (4 years ago)
Author:
Klumbumbus
Message:

fix #19851 - Fix shortcut names

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/MainInitialization.java

    r17080 r17188  
    8080                // help shortcut
    8181                MainApplication.registerActionShortcut(MainApplication.menu.help,
    82                         Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT));
     82                        Shortcut.registerShortcut("system:help", tr("Help: {0}", tr("Help")), KeyEvent.VK_F1, Shortcut.DIRECT));
    8383            }),
    8484            new InitializationTask(tr("Initializing internal boundaries data"), () -> {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r17062 r17188  
    253253                "changesetdialog",
    254254                tr("Open the list of changesets in the current layer."),
    255                 Shortcut.registerShortcut("subwindow:changesets", tr("Toggle: {0}", tr("Changesets")),
     255                Shortcut.registerShortcut("subwindow:changesets", tr("Windows: {0}", tr("Changesets")),
    256256                    KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
    257257                200, /* the preferred height */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r16789 r17188  
    9595    public CommandStackDialog() {
    9696        super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
    97                 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
     97                Shortcut.registerShortcut("subwindow:commandstack", tr("Windows: {0}",
    9898                tr("Command Stack")), KeyEvent.VK_O, Shortcut.ALT_SHIFT), 100);
    9999        undoTree.addMouseListener(new MouseEventHandler());

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r17093 r17188  
    102102    public ConflictDialog() {
    103103        super(tr("Conflict"), "conflict", tr("Resolve conflicts"),
    104                 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
     104                Shortcut.registerShortcut("subwindow:conflict", tr("Windows: {0}", tr("Conflict")),
    105105                KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);
    106106

  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r17148 r17188  
    8181    public FilterDialog() {
    8282        super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
    83                 Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")),
     83                Shortcut.registerShortcut("subwindow:filter", tr("Windows: {0}", tr("Filter")),
    8484                        KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
    8585        build();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r16960 r17188  
    197197    public LayerListDialog(MainLayerManager layerManager) {
    198198        super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."),
    199                 Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L,
     199                Shortcut.registerShortcut("subwindow:layers", tr("Windows: {0}", tr("Layers")), KeyEvent.VK_L,
    200200                        Shortcut.ALT_SHIFT), 100, true);
    201201        this.layerManager = layerManager;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

    r17161 r17188  
    113113    public MapPaintDialog() {
    114114        super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"),
    115                 Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
     115                Shortcut.registerShortcut("subwindow:mappaint", tr("Windows: {0}", tr("Map Paint Styles")),
    116116                        KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150, false, MapPaintPreference.class);
    117117        build();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

    r16423 r17188  
    125125        // CHECKSTYLE.OFF: LineLength
    126126        /** Action shortcut (ctrl / space by default), made public in order to be used from {@code GettingStarted} page. */
    127         public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL);
     127        public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", tr("Help: {0}", tr("Search menu items")), KeyEvent.VK_SPACE, Shortcut.CTRL);
    128128        // CHECKSTYLE.ON: LineLength
    129129

  • trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java

    r17062 r17188  
    3030    public MinimapDialog() {
    3131        super(tr("Mini map"), "minimap", tr("Displays a small map of the current edit location"),
    32                 Shortcut.registerShortcut("subwindow:minimap", tr("Toggle: {0}", tr("Mini map")),
     32                Shortcut.registerShortcut("subwindow:minimap", tr("Windows: {0}", tr("Mini map")),
    3333                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150);
    3434    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

    r17062 r17188  
    7777    public NotesDialog() {
    7878        super(tr("Notes"), "notes/note_open", tr("List of notes"),
    79                 Shortcut.registerShortcut("subwindow:notes", tr("Toggle: {0}", tr("Notes")),
     79                Shortcut.registerShortcut("subwindow:notes", tr("Windows: {0}", tr("Notes")),
    8080                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150);
    8181        addCommentAction = new AddCommentAction();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r17150 r17188  
    148148    public RelationListDialog() {
    149149        super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
    150                 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")),
     150                Shortcut.registerShortcut("subwindow:relations", tr("Windows: {0}", tr("Relations")),
    151151                KeyEvent.VK_R, Shortcut.ALT_SHIFT), 150, true);
    152152

  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r16601 r17188  
    148148    public SelectionListDialog() {
    149149        super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
    150                 Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}",
    151                 tr("Current Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT),
     150                Shortcut.registerShortcut("subwindow:selection", tr("Windows: {0}",
     151                tr("Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT),
    152152                150, // default height
    153153                true // default is "show dialog"

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r16438 r17188  
    7272    public UserListDialog() {
    7373        super(tr("Authors"), "userlist", tr("Open a list of people working on the selected objects."),
    74                 Shortcut.registerShortcut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150);
     74                Shortcut.registerShortcut("subwindow:authors", tr("Windows: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150);
    7575        build();
    7676    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r16967 r17188  
    116116    public ValidatorDialog() {
    117117        super(tr("Validation Results"), "validator", tr("Open the validation window."),
    118                 Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation Results")),
     118                Shortcut.registerShortcut("subwindow:validator", tr("Windows: {0}", tr("Validation Results")),
    119119                        KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class);
    120120

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r17066 r17188  
    255255    public PropertiesDialog() {
    256256        super(tr("Tags/Memberships"), "propertiesdialog", tr("Tags for selected objects."),
    257                 Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
     257                Shortcut.registerShortcut("subwindow:properties", tr("Windows: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
    258258                        Shortcut.ALT_SHIFT), 150, true);
    259259
    … …  
    12291229        EditAction() {
    12301230            super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"),
    1231                     Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S,
     1231                    Shortcut.registerShortcut("properties:edit", tr("Edit: {0}", tr("Edit Tags")), KeyEvent.VK_S,
    12321232                            Shortcut.ALT), false);
    12331233            updateEnabledState();

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r16800 r17188  
    100100    private ImageViewerDialog() {
    101101        super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
    102         tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
     102        tr("Windows: {0}", tr("Geotagged Images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
    103103        build();
    104104        MainApplication.getLayerManager().addActiveLayerChangeListener(this);

  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

    r16320 r17188  
    3434        public Action() {
    3535            super(tr("Search for objects by preset..."), "dialogs/search", tr("Search for objects by their presets."),
    36                     Shortcut.registerShortcut("preset:search-objects", tr("Search for objects by preset"), KeyEvent.VK_F3, Shortcut.SHIFT),
    37                     false);
     36                    Shortcut.registerShortcut("preset:search-objects", tr("Presets: {0}", tr("Search for objects by preset...")),
     37                    KeyEvent.VK_F3, Shortcut.SHIFT), false);
    3838            putValue("toolbar", "presets/search-objects");
    3939            MainApplication.getToolbar().register(this);
Note: See TracChangeset for help on using the changeset viewer.