Changeset 4957 in josm for trunk


Ignore:
Timestamp:
2012-02-16T18:41:28+01:00 (8 years ago)
Author:
stoecker
Message:

some shortcut fixes

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

Legend:

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

    r4836 r4957  
    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.SHIFT_DEFAULT),
     24            KeyEvent.VK_M, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
    2525            true /* register */
    2626        );
  • trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

    r4874 r4957  
    4646    public ValidateAction() {
    4747        super(tr("Validation"), "dialogs/validator", tr("Performs the data validation"),
    48                 Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")), KeyEvent.VK_V, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     48            Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")),
     49            KeyEvent.VK_V, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
    4950    }
    5051
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r4475 r4957  
    9595                "delete",
    9696                tr("Delete nodes or ways."),
    97                 Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")), KeyEvent.VK_D, Shortcut.GROUP_EDIT),
     97                Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")),
     98                KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT2),
    9899                mapFrame,
    99100                ImageProvider.getCursor("normal", "delete"));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r4885 r4957  
    8888    public RelationListDialog() {
    8989        super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
    90                 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R,
    91                         Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
     90                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")),
     91                KeyEvent.VK_R, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
    9292
    9393        // create the list of relations
     
    142142
    143143        // activate DEL in the list of relations
    144         displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "deleteRelation");
    145         displaylist.getActionMap().put("deleteRelation", deleteAction);
     144        //displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "deleteRelation");
     145        //displaylist.getActionMap().put("deleteRelation", deleteAction);
    146146
    147147        popupMenu = new RelationDialogPopupMenu(displaylist);
  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r4536 r4957  
    128128    public SelectionListDialog() {
    129129        super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
    130                 Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT),
     130                Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}",
     131                tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER+
     132                Shortcut.GROUPS_ALT1),
    131133                150, // default height
    132134                true // default is "show dialog"
     
    145147        lstPrimitives.addMouseListener(new SelectionPopupMenuLauncher());
    146148        lstPrimitives.addMouseListener(new DblClickHandler());
    147        
     149
    148150        popupMenu = new SelectionPopup(lstPrimitives);
    149151    }
     
    225227        return popupMenu.add(a);
    226228    }
    227    
     229
    228230    public void addPopupMenuListener(PopupMenuListener l) {
    229231        popupMenu.addPopupMenuListener(l);
     
    233235        popupMenu.addPopupMenuListener(l);
    234236    }
    235    
     237
    236238    public Collection<OsmPrimitive> getSelectedPrimitives() {
    237239        return model.getSelected();
    238240    }
    239    
     241
    240242    /**
    241243     * Updates the dialog title with a summary of the current JOSM selection
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r4707 r4957  
    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.SHIFT_DEFAULT), 150);
     89                        KeyEvent.VK_V, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
    9090
    9191        popupMenu = new JPopupMenu();
Note: See TracChangeset for help on using the changeset viewer.