Changeset 4942 in josm


Ignore:
Timestamp:
Feb 15, 2012 9:29:21 PM (15 months ago)
Author:
stoecker
Message:

fix some shortcut deprecations, move layer list toggle from <ALT>+<L> to <ALT>+<SHIFT>+<L> to free <ALT>+<L> for PicLayer menu

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

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AboutAction.java

    r2370 r4942  
    3737 
    3838    public AboutAction() { 
    39         super(tr("About"), "about", tr("Display the about screen."), Shortcut.registerShortcut("system:about", tr("About"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), true); 
     39        super(tr("About"), "about", tr("Display the about screen."), 
     40            Shortcut.registerShortcut("system:about", tr("About"), 
     41            KeyEvent.VK_F1, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1), true); 
    4042    } 
    4143 

  • trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

    r4602 r4942  
    2828    } 
    2929 
    30     public AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) { 
    31         super(name, iconName, tooltip, shortcut, register); 
     30    public AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, String toolbarId, boolean installAdapters) { 
     31        super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters); 
    3232    } 
    3333 

  • trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

    r4314 r4942  
    2626    public AddNodeAction() { 
    2727        super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."), 
    28                 Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")), KeyEvent.VK_D, Shortcut.GROUP_EDIT, 
    29                         Shortcut.SHIFT_DEFAULT), true); 
     28                Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")), 
     29                        KeyEvent.VK_D, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true); 
    3030        putValue("help", ht("/Action/AddNode")); 
    3131    } 

  • trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

    r4855 r4942  
    3030    public DistributeAction() { 
    3131        super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."), 
    32                 Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true); 
     32                Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, 
     33                Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true); 
    3334        putValue("help", ht("/Action/DistributeNodes")); 
    3435    } 

  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

    r4700 r4942  
    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_HOTKEY, Shortcut.SHIFT_DEFAULT), false); 
     20                        tr("History (web)"), KeyEvent.VK_H, Shortcut.GROUP_DIRECT3), 
     21                true, "action/historyinfoweb", true); 
    2122        putValue("help", ht("/Action/ObjectHistoryWeb")); 
    22         putValue("toolbar", "action/historyinfoweb"); 
    23         Main.toolbar.register(this); 
    2423    } 
    2524 

  • trunk/src/org/openstreetmap/josm/actions/InfoAction.java

    r4408 r4942  
    1919    public InfoAction() { 
    2020        super(tr("Advanced info"), "about", 
    21                 tr("Display advanced object information about OSM nodes, ways, or relations."), 
    22                 Shortcut.registerShortcut("core:info", 
    23                 tr("Advanced info"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), false); 
     21            tr("Display advanced object information about OSM nodes, ways, or relations."), 
     22            Shortcut.registerShortcut("core:info", 
     23                tr("Advanced info"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), 
     24            true, "action/info", true); 
    2425        putValue("help", ht("/Action/InfoAboutElements")); 
    25         putValue("toolbar", "action/info"); 
    26         Main.toolbar.register(this); 
    2726    } 
    2827 

  • trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

    r4700 r4942  
    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.SHIFT_DEFAULT), false); 
     20                        tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT1), 
     21                true, "action/infoweb", true); 
    2122        putValue("help", ht("/Action/InfoAboutElementsWeb")); 
    22         putValue("toolbar", "action/infoweb"); 
    23         Main.toolbar.register(this); 
    2423    } 
    2524 

  • trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

    r3083 r4942  
    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.SHIFT_DEFAULT), true); 
     36                        KeyEvent.VK_M, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true); 
    3737        putValue("help", ht("/Action/Mirror")); 
    3838    } 

  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r4385 r4942  
    7979    public static class Undo extends JosmAction { 
    8080        public Undo() { 
    81             super(tr("Orthogonalize Shape / Undo"), 
    82                     "ortho", 
     81            super(tr("Orthogonalize Shape / Undo"), "ortho", 
    8382                    tr("Undo orthogonalization for certain nodes"), 
    8483                    Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Tool: {0}", tr("Orthogonalize Shape / Undo")), 
    8584                            KeyEvent.VK_Q, 
    86                             Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), false); 
    87             putValue("toolbar", "action/orthogonalize/undo"); 
    88             Main.toolbar.register(this); 
     85                            Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), 
     86                    true, "action/orthogonalize/undo", true); 
    8987        } 
    9088        public void actionPerformed(ActionEvent e) { 

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

    r4922 r4942  
    162162    protected LayerListDialog(MapFrame mapFrame) { 
    163163        super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), 
    164                 Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, Shortcut.GROUP_LAYER), 100, true); 
     164                Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, 
     165                Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER), 100, true); 
    165166 
    166167        // create the models 

  • trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

    r4842 r4942  
    3434 
    3535        public JumpToNextMarker(JumpToMarkerLayer layer) { 
    36             putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")), 
    37             KeyEvent.VK_J, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK).getKeyStroke()); 
     36            Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")), 
     37                KeyEvent.VK_J, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2).setAccelerator(this); 
    3838            putValue(SHORT_DESCRIPTION, tr("Jump to next marker")); 
    3939            putValue(NAME, tr("Jump to next marker")); 
    … …  
    6161            } 
    6262        } 
    63  
    6463 
    6564        private void execute(Layer l) { 
    … …  
    9190            this.layer = (Layer)layer; 
    9291 
    93             putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", 
    94             tr("Previos marker")), KeyEvent.VK_P, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK).getKeyStroke()); 
     92            Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")), 
     93                KeyEvent.VK_P, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2).setAccelerator(this); 
    9594            putValue(SHORT_DESCRIPTION, tr("Jump to previous marker")); 
    9695            putValue(NAME, tr("Jump to previous marker")); 
    … …  
    134133                return null; 
    135134        } 
    136  
    137135    } 
    138  
    139  
    140136} 

  • trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

    r4932 r4942  
    281281 
    282282    /** 
    283      * Find the size of the screen the for given coordinates. Use first screen, 
     283     * Find the size of the screen for given coordinates. Use first screen, 
    284284     * when no coordinates are stored or null is passed. 
    285285     *  
Note: See TracChangeset for help on using the changeset viewer.