Changeset 27852 in osm for applications
- Timestamp:
- 2012-02-18T13:40:52+01:00 (13 years ago)
- Location:
- applications/editors/josm/plugins
- Files:
-
- 156 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/CommandLine/build.xml
r27242 r27852 4 4 <property name="commit.message" value="Moar bugfixes"/> 5 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 6 <property name="plugin.main.version" value="4 645"/>6 <property name="plugin.main.version" value="4980"/> 7 7 <!-- 8 8 ************************************************ -
applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java
r27597 r27852 41 41 public CommandLineAction(CommandLine parentPlugin) { 42 42 super(tr("Command line"), "blankmenu", tr("Set input focus to the command line."), 43 Shortcut.registerShortcut("edit:simplifyArea", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut. GROUP_DIRECT), true);43 Shortcut.registerShortcut("edit:simplifyArea", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.DIRECT), true); 44 44 this.parentPlugin = parentPlugin; 45 45 } -
applications/editors/josm/plugins/Create_grid_of_ways/build.xml
r27831 r27852 32 32 <property name="commit.message" value="Changed constructor signature, updated build.xml"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <property name="josm" location="../../core/dist/josm-custom.jar"/> 36 36 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java
r27831 r27852 33 33 public CreateGridOfWaysAction() { 34 34 super(tr("Create grid of ways"), "creategridofways", tr("Forms a grid of ways in base to two existing that have various nodes and one in common"), Shortcut.registerShortcut("tools:CreateGridOfWays", tr("Tool: {0}", tr("Create grid of ways")), 35 KeyEvent.VK_G, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true); 36 /* en mis otras pruebas esto terminaba : Shortcut.GROUP_EDIT), true); 37 /* le puse tecla G de shortcut pero parece que esta usado por tools:unglue , buscar otro */ 35 KeyEvent.VK_G, Shortcut.SHIFT), true); 38 36 } 39 37 -
applications/editors/josm/plugins/DirectUpload/build.xml
r27019 r27852 27 27 <project name="DirectUpload" default="dist" basedir="."> 28 28 <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/> 29 <property name="plugin.main.version" value="4 549"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java
r24236 r27852 37 37 super(tr("Upload Traces"), "UploadAction", tr("Uploads traces to openstreetmap.org"), 38 38 Shortcut.registerShortcut("tools:uploadtraces", tr("Tool: {0}", tr("Upload Traces")), 39 KeyEvent.VK_G, Shortcut. GROUP_MENU), false);39 KeyEvent.VK_G, Shortcut.CTRL), false); 40 40 } 41 41 -
applications/editors/josm/plugins/FastDraw/build.xml
r27826 r27852 32 32 <property name="commit.message" value="FastDraw: shortcut parsing"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java
r27841 r27852 93 93 FastDrawingMode(MapFrame mapFrame) { 94 94 super(tr("FastDrawing"), "turbopen.png", tr("Fast drawing mode"), 95 Shortcut.registerShortcut("mapmode:fastdraw", tr("Mode: {0}", tr("Fast drawing mode")), KeyEvent.VK_F, Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT1)95 Shortcut.registerShortcut("mapmode:fastdraw", tr("Mode: {0}", tr("Fast drawing mode")), KeyEvent.VK_F, Shortcut.SHIFT) 96 96 ,mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); 97 97 line=new DrawnPolyLine(); -
applications/editors/josm/plugins/FixAddresses/build.xml
r27824 r27852 96 96 <attribute name="de_Plugin-Description" value="Findet ungültige Addressen und bietet Unterstützung zur deren Korrektur."/> 97 97 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/FixAddresses"/> 98 <attribute name="Plugin-Mainversion" value="4 549"/>98 <attribute name="Plugin-Mainversion" value="4980"/> 99 99 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 100 100 <attribute name="Plugin-Icon" value="images/fixaddresses.png"/> -
applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
r27825 r27852 31 31 tr("Find and fix addresses without (valid) streets."), 32 32 Shortcut.registerShortcut("tools:AddressEdit", tr("Tool: {0}", 33 tr("Address Edit")), KeyEvent.VK_X, Shortcut. GROUPS_ALT1+Shortcut.GROUP_MENU), false);33 tr("Address Edit")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), false); 34 34 35 35 setEnabled(false); -
applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
r27650 r27852 32 32 <property name="commit.message" value="Initial version."/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="4 789"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- should not be necessary to change the following properties --> 36 36 <property name="josm" location="../../core/dist/josm-custom.jar"/> -
applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
r27768 r27852 27 27 "home-icon32", 28 28 "Launches the HouseNumberTaggingTool dialog", 29 Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_K, Shortcut. GROUP_EDIT),29 Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_K, Shortcut.DIRECT), 30 30 true); 31 31 -
applications/editors/josm/plugins/OpeningHoursEditor/build.xml
r27805 r27852 32 32 <property name="commit.message" value="fixed main version"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java
r27808 r27852 88 88 tr("Edit time-tag of selected element in a graphical interface"), Shortcut.registerShortcut( 89 89 "tools:opening_hourseditor", tr("Tool: {0}", tr("Edit opening hours")), KeyEvent.VK_O, 90 Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), false);90 Shortcut.ALT_CTRL_SHIFT), false); 91 91 } 92 92 -
applications/editors/josm/plugins/addrinterpolation/build.xml
r27834 r27852 23 23 <project name="AddrInterpolation" default="dist" basedir="."> 24 24 <property name="commit.message" value="Impoved Icon"/> 25 <property name="plugin.main.version" value="49 28"/>25 <property name="plugin.main.version" value="4980"/> 26 26 <!-- 27 27 ************************************************ -
applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java
r27834 r27852 25 25 super(tr("Address Interpolation"), "AddrInterpolation", tr("Handy Address Interpolation Functions"), 26 26 Shortcut.registerShortcut("tools:AddressInterpolation", tr("Tool: {0}", tr("Address Interpolation")), 27 KeyEvent.VK_Z, Shortcut. GROUP_MENU+Shortcut.GROUPS_ALT2), false);27 KeyEvent.VK_Z, Shortcut.ALT_CTRL), false); 28 28 setEnabled(false); 29 29 DataSet.addSelectionListener(this); -
applications/editors/josm/plugins/alignways/build.xml
r27810 r27852 35 35 with 36 36 --> 37 <property name="plugin.main.version" value="49 28"/>37 <property name="plugin.main.version" value="4980"/> 38 38 <!-- 39 39 ************************************************ ** should not be -
applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java
r27810 r27852 33 33 + "around a chosen pivot."), 34 34 Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}", tr("Align Ways")), 35 KeyEvent.VK_SPACE, Shortcut. GROUP_DIRECT+Shortcut.GROUPS_ALT1)35 KeyEvent.VK_SPACE, Shortcut.SHIFT) 36 36 , true); 37 37 setEnabled(false); -
applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java
r27810 r27852 45 45 Shortcut.registerShortcut("mapmode:alignways", 46 46 tr("Mode: {0}", tr("Align Ways")), 47 KeyEvent.VK_N, Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT1),47 KeyEvent.VK_N, Shortcut.SHIFT), 48 48 mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); 49 49 noneSelected = new AlignWaysSelNoneState(); -
applications/editors/josm/plugins/buildings_tools/build.xml
r27791 r27852 32 32 <property name="commit.message" value="BuildingTools: shortcut changes - binary"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java
r27793 r27852 15 15 super(tr("Set buildings size"), "mapmode/building", tr("Set buildings size"), 16 16 Shortcut.registerShortcut("edit:buildingsdialog", tr("Edit: {0}", tr("Set buildings size")), 17 KeyEvent.VK_B, Shortcut. GROUP_DIRECT2+Shortcut.GROUPS_ALT2),17 KeyEvent.VK_B, Shortcut.ALT_CTRL), 18 18 true); 19 19 } -
applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java
r27587 r27852 67 67 Shortcut.registerShortcut("mapmode:buildings", 68 68 tr("Mode: {0}", tr("Draw buildings")), 69 KeyEvent.VK_B, Shortcut. GROUP_EDIT),69 KeyEvent.VK_B, Shortcut.DIRECT), 70 70 mapFrame, getCursor()); 71 71 -
applications/editors/josm/plugins/cadastre-fr/build.xml
r27788 r27852 32 32 <property name="ant.build.javac.target" value="1.5"/> 33 33 <property name="commit.message" value="Changed constructor for Plugin"/> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <target name="init"> 36 36 <mkdir dir="${plugin.build.dir}"/> -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java
r27827 r27852 95 95 super(tr("Add address"), "buildings", 96 96 tr("Helping tool for tag address"), 97 Shortcut.registerShortcut("mapmode:buildings", tr("Mode: {0}", tr("Buildings")), KeyEvent.VK_E, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1),97 Shortcut.registerShortcut("mapmode:buildings", tr("Mode: {0}", tr("Buildings")), KeyEvent.VK_E, Shortcut.ALT_CTRL_SHIFT), 98 98 mapFrame, getCursor()); 99 99 } -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
r27484 r27852 10 10 11 11 import org.openstreetmap.josm.Main; 12 import org.openstreetmap.josm.gui.preferences. PreferenceSetting;12 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting; 13 13 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; 14 14 import org.openstreetmap.josm.tools.GBC; … … 21 21 * @author Pieren <pieren3@gmail.com> 22 22 */ 23 public class CadastrePreferenceSetting implementsPreferenceSetting {23 public class CadastrePreferenceSetting extends DefaultTabPreferenceSetting { 24 24 25 25 static final int TRANS_MIN = 1; … … 91 91 static final int DEFAULT_CROSSPIECES = 0; 92 92 93 public void addGui(final PreferenceTabbedPane gui) {94 95 String description =tr("A special handler of the French cadastre wms at www.cadastre.gouv.fr" + "<BR><BR>"93 public CadastrePreferenceSetting() { 94 super("cadastrewms.gif", I18n.tr("French cadastre WMS"), 95 tr("A special handler of the French cadastre wms at www.cadastre.gouv.fr" + "<BR><BR>" 96 96 + "Please read the Terms and Conditions of Use here (in French): <br>" 97 97 + "<a href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> " 98 98 + "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> <BR>" 99 + "before any upload of data created by this plugin."); 100 JPanel cadastrewmsMast = gui.createPreferenceTab("cadastrewms.gif", I18n.tr("French cadastre WMS"), description); 99 + "before any upload of data created by this plugin.") 100 ); 101 } 102 103 104 public void addGui(final PreferenceTabbedPane gui) { 105 JPanel cadastrewmsMast = gui.createPreferenceTab(this); 101 106 102 107 JPanel cadastrewms = new JPanel(new GridBagLayout()); -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
r27788 r27852 26 26 super(tr(name), "cadastre_small", tr("Download Image from French Cadastre WMS"), 27 27 Shortcut.registerShortcut("cadastre:grab", tr("Cadastre: {0}", tr("Download Image from French Cadastre WMS")), 28 KeyEvent.VK_F10, Shortcut. GROUP_DIRECT), false);28 KeyEvent.VK_F10, Shortcut.DIRECT), false); 29 29 } 30 30 -
applications/editors/josm/plugins/conflation/build.xml
r27837 r27852 32 32 <property name="commit.message" value="Commit message"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java
r27837 r27852 21 21 super(tr("Conflation"), "conflation", tr("Conflation tool for merging data"), 22 22 Shortcut.registerShortcut("tool:conflation", tr("Tool: {0}", tr("Conflation")), 23 KeyEvent.VK_A, Shortcut. GROUP_MENU+Shortcut.GROUPS_ALT1), true);23 KeyEvent.VK_A, Shortcut.CTRL_SHIFT), true); 24 24 //setEnabled(false); 25 25 //DataSet.selListeners.add(this); -
applications/editors/josm/plugins/czechaddress/build.xml
r27807 r27852 33 33 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/CS:JOSM/Plugins/CzechAddress"/> 34 34 <attribute name="Plugin-Icon" value="images/preferences/czech_flag.png"/> 35 <attribute name="Plugin-Mainversion" value="49 28"/>35 <attribute name="Plugin-Mainversion" value="4980"/> 36 36 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 37 37 </manifest> -
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java
r15558 r27852 27 27 Shortcut.registerShortcut("address:resolveconflict", 28 28 "Adresy: Zobrazit konflikty", 29 KeyEvent. VK_R, Shortcut.GROUP_NONE, Shortcut.SHIFT_DEFAULT),29 KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 30 30 true); 31 31 } -
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java
r27815 r27852 40 40 Shortcut.registerShortcut( "mapmode:clickaddress", 41 41 "Sputit továrnu na adresy", 42 KeyEvent.VK_K, Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT2),42 KeyEvent.VK_K, Shortcut.ALT_SHIFT), 43 43 frame, 44 44 ImageProvider.getCursor("crosshair", "envelope-star-small")); -
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java
r15166 r27852 28 28 Shortcut.registerShortcut("address:assignaddress", 29 29 "Adresy: Přiřadit adresy", 30 KeyEvent.VK_P, Shortcut. GROUP_DIRECT, Shortcut.SHIFT_DEFAULT),30 KeyEvent.VK_P, Shortcut.SHIFT), 31 31 true); 32 32 } -
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java
r27839 r27852 30 30 Shortcut.registerShortcut("tools:newaddress", 31 31 "Adresy: Vytvořit/upravit adres", 32 KeyEvent.VK_W, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1),32 KeyEvent.VK_W, Shortcut.ALT_CTRL_SHIFT), 33 33 true); 34 34 } -
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
r27807 r27852 43 43 Shortcut.registerShortcut("tools:splitarea", 44 44 tr("Tool: {0}", tr("Split area")), 45 KeyEvent.VK_W, Shortcut. GROUP_DIRECT2+Shortcut.GROUPS_ALT1),45 KeyEvent.VK_W, Shortcut.ALT_SHIFT), 46 46 true); 47 47 } -
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java
r27612 r27852 62 62 "Umožňuje rychlé vytváření adresních bodů „jedním kliknutím.“", 63 63 Shortcut.registerShortcut("subwindow:addressfactory","Přepnout: Továrna na adresy", 64 KeyEvent.VK_T, Shortcut. GROUP_LAYER),64 KeyEvent.VK_T, Shortcut.ALT), 65 65 200); 66 66 -
applications/editors/josm/plugins/download_along/build.xml
r27832 r27852 32 32 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java
r27832 r27852 56 56 tr("Download OSM data along the selected ways."), 57 57 Shortcut.registerShortcut("tools:download_along", tr("Tool: {0}", 58 tr("Download Along")), KeyEvent.VK_D, Shortcut.GROUP_EDIT+ 59 Shortcut.GROUPS_ALT2), true); 58 tr("Download Along")), KeyEvent.VK_D, Shortcut.ALT_SHIFT), true); 60 59 } 61 60 -
applications/editors/josm/plugins/globalsat/build.xml
r27834 r27852 32 32 <property name="commit.message" value="Changed constructor signature of plugin main class"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <property name="josm" location="../../core/dist/josm-custom.jar"/> 36 36 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java
r27836 r27852 108 108 tr("Import Data from Globalsat Datalogger DG100 into GPX layer."), 109 109 Shortcut.registerShortcut("menu:globalsatimport", tr("Menu: {0}", tr("Globalsat Import")), 110 KeyEvent.VK_G, Shortcut. GROUP_MENU+Shortcut.GROUPS_ALT2), false);110 KeyEvent.VK_G, Shortcut.ALT_CTRL), false); 111 111 } 112 112 public void actionPerformed(ActionEvent e){ -
applications/editors/josm/plugins/gpxfilter/build.xml
r27820 r27852 32 32 <property name="commit.message" value="GPXFilter: moved to Alt-Shift-X"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 60"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java
r27820 r27852 15 15 public AddEGpxLayerAction() { 16 16 super(tr("Add EGPX layer"),null,tr("Add EGPX layer"), 17 Shortcut.registerShortcut("gpxfilter:egpx", tr("Tool: {0}", tr("Add EGPX layer")), 18 KeyEvent.VK_X, Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER), true); 17 Shortcut.registerShortcut("gpxfilter:egpx", tr("Tool: {0}", tr("Add EGPX layer")), 18 KeyEvent.VK_X, Shortcut.ALT_SHIFT), 19 true, "gpxfilter/addegpxlayer", true); 19 20 } 20 21 -
applications/editors/josm/plugins/imageryadjust/build.xml
r27769 r27852 32 32 <property name="commit.message" value="ImageryAdjust: Adjust while holding Y"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java
r27769 r27852 37 37 tr("Adjust the position of the selected imagery layer"), 38 38 Shortcut.registerShortcut("imageryadjust:adjustmode", tr("Mode: {0}", tr("Adjust imagery")), 39 KeyEvent.VK_Y, Shortcut. GROUP_DIRECT2+Shortcut.GROUPS_ALT2),39 KeyEvent.VK_Y, Shortcut.ALT_CTRL), 40 40 mapFrame, 41 41 ImageProvider.getCursor("normal", "move")); -
applications/editors/josm/plugins/imagewaypoint/build.xml
r27768 r27852 32 32 <property name="commit.message" value="Updated the constructor signature of the plugin main class"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <property name="josm" location="../../core/dist/josm-custom.jar"/> 36 36 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java
r27768 r27852 189 189 tr("Display non-geotagged photos"), 190 190 Shortcut.registerShortcut("subwindow:imagewaypoint", tr("Toggle: {0}", tr("WayPoint Image")), 191 KeyEvent.VK_Y, Shortcut. GROUP_LAYER+Shortcut.GROUPS_ALT1),191 KeyEvent.VK_Y, Shortcut.ALT_SHIFT), 192 192 200); 193 193 -
applications/editors/josm/plugins/importvec/build.xml
r27826 r27852 32 32 <property name="commit.message" value="Commit message"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java
r27841 r27852 45 45 public ImportVectorAction() { 46 46 super(tr("Import..."), "open", tr("Import vector graphics."), 47 Shortcut.registerShortcut("system:import", tr("File: {0}", tr("Import...")), KeyEvent.VK_I, Shortcut. GROUP_MENU+Shortcut.GROUPS_ALT2), false);47 Shortcut.registerShortcut("system:import", tr("File: {0}", tr("Import...")), KeyEvent.VK_I, Shortcut.ALT_CTRL), false); 48 48 // Avoid to override "open" toolbar function 49 49 putValue("toolbar", "importvec"); -
applications/editors/josm/plugins/infomode/build.xml
r27557 r27852 32 32 <property name="commit.message" value="InfoMode : for shortcurt parser"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="4 667"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- should not be necessary to change the following properties --> 36 36 <property name="josm" location="../../core/dist/josm-custom.jar"/> -
applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java
r27591 r27852 59 59 InfoMode(MapFrame mapFrame) { 60 60 super(tr("InfoMode"), "infomode.png", tr("GPX info mode"), 61 Shortcut.registerShortcut("mapmode:infomode", tr("Mode: {0}", tr("GPX info mode")), KeyEvent.VK_BACK_SLASH, Shortcut. GROUP_EDIT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));61 Shortcut.registerShortcut("mapmode:infomode", tr("Mode: {0}", tr("GPX info mode")), KeyEvent.VK_BACK_SLASH, Shortcut.DIRECT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); 62 62 infoPanel=new InfoPanel(); 63 63 -
applications/editors/josm/plugins/irsrectify/build.xml
r27821 r27852 32 32 <property name="commit.message" value="irsrectify shortcut confilct"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 60"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java
r27821 r27852 43 43 public IRSRectifyAction() { 44 44 super(tr("Update IRS adjustment layer"), "irsrectify.png", tr("Update IRS adjustment layer"), 45 Shortcut.registerShortcut("menu:irsrectify", tr("Update IRS adjustment layer"), KeyEvent.VK_MULTIPLY, Shortcut. GROUP_DIRECT), false);45 Shortcut.registerShortcut("menu:irsrectify", tr("Update IRS adjustment layer"), KeyEvent.VK_MULTIPLY, Shortcut.DIRECT), false); 46 46 } 47 47 -
applications/editors/josm/plugins/junctionchecking/build.xml
r27817 r27852 27 27 <project name="junctionchecking" default="dist" basedir="."> 28 28 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 29 <property name="plugin.main.version" value="49 28"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.build.dir" value="build"/> -
applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java
r27817 r27852 48 48 super(tr("JunctionChecking"), "junctionchecker", tr("Open the junctionchecking window."), 49 49 Shortcut.registerShortcut("subwindow:junctionchecker", tr("Toggle: {0}", tr("junctions")), 50 KeyEvent.VK_J, Shortcut. GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);50 KeyEvent.VK_J, Shortcut.ALT_SHIFT), 150); 51 51 plugin = junctionCheckerGuiPlugin; 52 52 //das Digraph Create Panel -
applications/editors/josm/plugins/lakewalker/build.xml
r27765 r27852 27 27 <project name="lakewalker" default="dist" basedir="."> 28 28 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 29 <property name="plugin.main.version" value="49 28"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
r27766 r27852 52 52 super(name, "lakewalker-sml", tr("Lake Walker."), 53 53 Shortcut.registerShortcut("tools:lakewalker", tr("Tool: {0}", tr("Lake Walker")), 54 KeyEvent.VK_L, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);54 KeyEvent.VK_L, Shortcut.ALT_CTRL_SHIFT), true); 55 55 this.name = name; 56 56 setEnabled(true); -
applications/editors/josm/plugins/licensechange/build.xml
r27766 r27852 26 26 --> 27 27 <property name="commit.message" value=""/> 28 <property name="plugin.main.version" value="49 28"/>28 <property name="plugin.main.version" value="4980"/> 29 29 <property name="josm" location="../../core/dist/josm-custom.jar"/> 30 30 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java
r27828 r27852 38 38 { 39 39 super(tr("License Check"), "licensechange", tr("Performs the license check"), 40 Shortcut.registerShortcut("tools:licensechange", tr("Tool: {0}", tr("License Check")), KeyEvent.VK_C, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);40 Shortcut.registerShortcut("tools:licensechange", tr("Tool: {0}", tr("License Check")), KeyEvent.VK_C, Shortcut.ALT_CTRL_SHIFT), true); 41 41 this.plugin = plugin; 42 42 } -
applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java
r27766 r27852 76 76 super(tr("Relicensing problems"), "licensechange", tr("Open the relicensing window."), 77 77 Shortcut.registerShortcut("subwindow:licensechange", tr("Toggle: {0}", tr("Relicensing problems")), 78 KeyEvent.VK_L, Shortcut. GROUP_DIRECT2+Shortcut.GROUPS_ALT2), 150);78 KeyEvent.VK_L, Shortcut.ALT_CTRL), 150); 79 79 80 80 this.plugin = plugin; -
applications/editors/josm/plugins/livegps/build.xml
r27830 r27852 27 27 <project name="livegps" default="dist" basedir="."> 28 28 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 29 <property name="plugin.main.version" value="49 28"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java
r27830 r27852 45 45 super(tr("Live GPS"), "livegps", tr("Show GPS data."), 46 46 Shortcut.registerShortcut("subwindow:livegps", tr("Toggle: {0}", tr("Live GPS")), 47 KeyEvent.VK_G, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), 100);47 KeyEvent.VK_G, Shortcut.ALT_CTRL_SHIFT), 100); 48 48 panel = new JPanel(); 49 49 panel.setLayout(new GridLayout(6,2)); -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
r26217 r27852 49 49 Shortcut.registerShortcut("menu:livegps:capture", tr( 50 50 "Menu: {0}", tr("Capture GPS Track")), 51 KeyEvent.VK_R, Shortcut. GROUP_MENU), true);51 KeyEvent.VK_R, Shortcut.CTRL), true); 52 52 } 53 53 … … 63 63 Shortcut.registerShortcut("edit:centergps", tr("Edit: {0}", 64 64 tr("Center Once")), KeyEvent.VK_HOME, 65 Shortcut. GROUP_EDIT), true);65 Shortcut.DIRECT), true); 66 66 } 67 67 … … 81 81 Shortcut.registerShortcut("menu:livegps:autocenter", tr( 82 82 "Menu: {0}", tr("Capture GPS Track")), 83 KeyEvent.VK_HOME, Shortcut. GROUP_MENU), true);83 KeyEvent.VK_HOME, Shortcut.CTRL), true); 84 84 } 85 85 -
applications/editors/josm/plugins/mapdust/build.xml
r27767 r27852 3 3 <!-- properties --> 4 4 <property name="commit.message" value="MapDust bug reporter plugin"/> 5 <property name="plugin.main.version" value="49 28"/>5 <property name="plugin.main.version" value="4980"/> 6 6 <property name="josm" location="../../core/dist/josm-custom.jar"/> 7 7 <property name="plugin.build.dir" value="build/classes"/> -
applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java
r27767 r27852 125 125 /* create MapDust GUI */ 126 126 Shortcut shortcut = Shortcut.registerShortcut("MapDust", tr("Toggle: {0}", tr("Open MapDust")), 127 KeyEvent.VK_0, Shortcut. GROUP_LAYER+Shortcut.GROUPS_ALT1);127 KeyEvent.VK_0, Shortcut.ALT_SHIFT); 128 128 String name = "MapDust bug reports"; 129 129 String tooltip = "Activates the MapDust bug reporter plugin"; -
applications/editors/josm/plugins/measurement/build.xml
r27826 r27852 27 27 <project name="measurement" default="dist" basedir="."> 28 28 <property name="commit.message" value="recompile dure to core change"/> 29 <property name="plugin.main.version" value="49 28"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
r27826 r27852 67 67 super(tr("Measured values"), "measure", tr("Open the measurement window."), 68 68 Shortcut.registerShortcut("subwindow:measurement", tr("Toggle: {0}", tr("Measured values")), 69 KeyEvent.VK_U, Shortcut. GROUP_DIRECT3), 150);69 KeyEvent.VK_U, Shortcut.CTRL_SHIFT), 150); 70 70 71 71 resetButton = new SideButton(marktr("Reset"), "select", "Measurement", -
applications/editors/josm/plugins/merge-overlap/build.xml
r27802 r27852 32 32 <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 36 36 <import file="../build-common.xml"/> -
applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
r27802 r27852 55 55 tr("Merge overlap of ways."), 56 56 Shortcut.registerShortcut("tools:mergeoverlap",tr("Tool: {0}", tr("Merge overlap")), KeyEvent.VK_O, 57 Shortcut. GROUP_HOTKEY+Shortcut.GROUPS_ALT2)57 Shortcut.ALT_CTRL) 58 58 , true); 59 59 } -
applications/editors/josm/plugins/michigan_left/build.xml
r27797 r27852 32 32 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java
r27797 r27852 50 50 tr("Adds no left turn for sets of 4 or 5 ways."), 51 51 Shortcut.registerShortcut("tools:michigan_left", tr("Tool: {0}", 52 tr("Michigan Left")), KeyEvent.VK_N, Shortcut.GROUP_EDIT 53 +Shortcut.GROUPS_ALT2), true); 52 tr("Michigan Left")), KeyEvent.VK_N, Shortcut.ALT_SHIFT), true); 54 53 } 55 54 -
applications/editors/josm/plugins/mirrored_download/build.xml
r27678 r27852 86 86 <attribute name="Plugin-Description" value="Simplifies download from different read-only APIs."/> 87 87 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/mirrored_download"/> 88 <attribute name="Plugin-Mainversion" value="4 549"/>88 <attribute name="Plugin-Mainversion" value="4980"/> 89 89 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 90 90 </manifest> -
applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java
r27843 r27852 29 29 public DownloadAction2() { 30 30 super(tr("Download from OSM mirror..."), null, tr("Download map data from the OSM server."), 31 Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);31 Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut.ALT_SHIFT), true); 32 32 putValue("help", ht("/Action/MirroredDownload")); 33 33 } -
applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java
r27691 r27852 25 25 public UrlSelectionAction() { 26 26 super(tr("Select URL..."), null, tr("Select URL to download from."), 27 Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut. GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);27 Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut.CTRL_SHIFT), true); 28 28 putValue("help", ht("/Action/SelectUrl")); 29 29 } -
applications/editors/josm/plugins/multipoly-convert/build.xml
r27796 r27852 32 32 <property name="commit.message" value="Mulpipoly-convert: help shortcut parser, rebuild"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 36 36 <import file="../build-common.xml"/> -
applications/editors/josm/plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java
r27796 r27852 40 40 Shortcut.registerShortcut("tools:multipolyconv", tr("Tool: {0}", 41 41 tr("Convert to multipolygon")), KeyEvent.VK_M, 42 Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);42 Shortcut.ALT_CTRL_SHIFT), true); 43 43 } 44 44 -
applications/editors/josm/plugins/openstreetbugs/build.xml
r27817 r27852 27 27 <project name="openstreetbugs" default="dist" basedir="."> 28 28 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 29 <property name="plugin.main.version" value="49 28"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
r27817 r27852 115 115 tr("Opens the OpenStreetBugs window and activates the automatic download"), Shortcut.registerShortcut( 116 116 "view:openstreetbugs", tr("Toggle: {0}", tr("Open OpenStreetBugs")), KeyEvent.VK_B, 117 Shortcut. GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);117 Shortcut.ALT_SHIFT), 150); 118 118 119 119 osbPlugin = plugin; -
applications/editors/josm/plugins/openvisible/build.xml
r27826 r27852 32 32 <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <property name="josm" location="../../core/dist/josm-custom.jar"/> 36 36 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
r27826 r27852 49 49 tr("Open only files that are visible in current view."), 50 50 Shortcut.registerShortcut("tools:openvisible", tr("Menu: {0}", tr("Open Visible...")), 51 KeyEvent.VK_I, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);51 KeyEvent.VK_I, Shortcut.ALT_CTRL_SHIFT), true); 52 52 } 53 53 -
applications/editors/josm/plugins/pdfimport/build.xml
r27119 r27852 33 33 <property name="commit.message" value="Initial pdfimport version"/> 34 34 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 35 <property name="plugin.main.version" value="4 549"/>35 <property name="plugin.main.version" value="4980"/> 36 36 <!-- compilation properties --> 37 37 <property name="josm.build.dir" value="../../core"/> -
applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java
r27592 r27852 20 20 tr("Import PDF file."), 21 21 Shortcut.registerShortcut("tools:pdfimport", tr("Tool: {0}",tr("Import PDF file")), 22 KeyEvent.VK_P, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT)22 KeyEvent.VK_P, Shortcut.SHIFT) 23 23 , true); 24 24 } -
applications/editors/josm/plugins/print/build.xml
r27466 r27852 32 32 <property name="commit.message" value="Added a field to specify the map scale."/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="4 733"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- should not be necessary to change the following properties --> 36 36 <property name="josm" location="../../core/dist/josm-custom.jar"/> -
applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintAction.java
r27593 r27852 47 47 super(tr("Print..."), null, tr("Print the map"), 48 48 Shortcut.registerShortcut("print:print", tr("File: {0}", tr("Print...")), 49 KeyEvent.VK_P, Shortcut. GROUP_MENU),49 KeyEvent.VK_P, Shortcut.CTRL), 50 50 true, "print/print", true); 51 51 } -
applications/editors/josm/plugins/reltoolbox/build.xml
r27813 r27852 32 32 <property name="commit.message" value="RelToolbox"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
r27818 r27852 545 545 super("…", null, tr("Enter role for selected members"), 546 546 Shortcut.registerShortcut("reltoolbox:changerole", tr("Relation Toolbox: {0}", tr("Enter role for selected members")), 547 KeyEvent.VK_R, Shortcut. GROUPS_ALT2+Shortcut.GROUP_DIRECT2), true);547 KeyEvent.VK_R, Shortcut.ALT_CTRL), true); 548 548 chosenRelation.addChosenRelationListener(this); 549 549 updateEnabledState(); -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java
r25751 r27852 34 34 super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"), 35 35 Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")), 36 KeyEvent.VK_EQUALS, Shortcut. GROUP_EDIT), true);36 KeyEvent.VK_EQUALS, Shortcut.DIRECT), true); 37 37 this.rel = rel; 38 38 rel.addChosenRelationListener(this); -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java
r26887 r27852 31 31 super("Multi", "data/multipolygon", tr("Create a multipolygon from selected objects"), 32 32 Shortcut.registerShortcut("reltoolbox:multipolygon", tr("Relation Toolbox: {0}", tr("Create multipolygon")), 33 KeyEvent.VK_B, Shortcut. GROUP_HOTKEY), true);33 KeyEvent.VK_B, Shortcut.CTRL), true); 34 34 this.chRel = chRel; 35 35 updateEnabledState(); -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java
r27813 r27852 39 39 super(tr("New"), "data/relation", tr("Create a relation from selected objects"), 40 40 Shortcut.registerShortcut("reltoolbox:create", tr("Relation Toolbox: {0}", tr("Create a new relation")), 41 KeyEvent.VK_N, Shortcut. GROUP_HOTKEY+Shortcut.GROUPS_ALT2), true);41 KeyEvent.VK_N, Shortcut.ALT_CTRL), true); 42 42 this.chRel = chRel; 43 43 updateEnabledState(); -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java
r27813 r27852 29 29 super("Find", "relcontext/find", tr("Find a relation"), 30 30 Shortcut.registerShortcut("reltoolbox:find", tr("Relation Toolbox: {0}", tr("Find a relation")), 31 KeyEvent.VK_F, Shortcut. GROUP_HOTKEY+Shortcut.GROUPS_ALT2), true);31 KeyEvent.VK_F, Shortcut.ALT_CTRL), true); 32 32 this.chRel = chRel; 33 33 } -
applications/editors/josm/plugins/restart/build.xml
r27833 r27852 32 32 <property name="commit.message" value="Commit message"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java
r27833 r27852 18 18 Shortcut.registerShortcut("file:restart", 19 19 tr("File: {0}", tr("Restart JOSM")), 20 KeyEvent.VK_J, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1),20 KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), 21 21 false); 22 22 putValue("toolbar", "action/restart"); -
applications/editors/josm/plugins/reverter/build.xml
r27794 r27852 32 32 <property name="commit.message" value="Reverter: moved menu to Alt-Y (conflicts), recompile"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java
r27794 r27852 16 16 Shortcut.registerShortcut("tool:history", 17 17 "Tool: Display objects history dialog", 18 KeyEvent.VK_H, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1),18 KeyEvent.VK_H, Shortcut.ALT_CTRL_SHIFT), 19 19 true); 20 20 setEnabled(false); -
applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java
r27795 r27852 19 19 Shortcut.registerShortcut("tool:revert", 20 20 tr("Tool: {0}", tr("Revert changeset")), 21 KeyEvent.VK_T, Shortcut. GROUP_DIRECT3),21 KeyEvent.VK_T, Shortcut.CTRL_SHIFT), 22 22 true); 23 23 } -
applications/editors/josm/plugins/roadsigns/build.xml
r27675 r27852 30 30 <property name="commit.message" value="preset maintenance (Fahrradstraße)"/> 31 31 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 32 <property name="plugin.main.version" value="4 721"/>32 <property name="plugin.main.version" value="4980"/> 33 33 34 34 <!-- -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java
r22420 r27852 52 52 public RoadSignAction() { 53 53 super(tr("Roadsign tagging"), "pref/roadsigns-small", tr("Add tags by clicking on road signs"), 54 Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_R, Shortcut. GROUP_LAYER), false);54 Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_R, Shortcut.ALT), false); 55 55 } 56 56 -
applications/editors/josm/plugins/routes/build.xml
r27019 r27852 27 27 <project name="routes" default="dist" basedir="."> 28 28 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 29 <property name="plugin.main.version" value="4 549"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java
r23189 r27852 27 27 public RelationEditMode(MapFrame mapFrame) { 28 28 super(tr("Edit relation"), "node/autonode", tr("Edit relations"), 29 Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut. GROUP_EDIT),29 Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.DIRECT), 30 30 mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); 31 31 } -
applications/editors/josm/plugins/routing/build.xml
r27288 r27852 27 27 <project name="routing" default="dist" basedir="."> 28 28 <property name="commit.message" value="fixed NPE at startup"/> 29 <property name="plugin.main.version" value="4 669"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <!-- Define some properties --> 31 31 <property name="josm" location="../../core/dist/josm-custom.jar"/> -
applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java
r27466 r27852 68 68 public RoutingDialog() { 69 69 super(tr("Routing"), "routing", tr("Open a list of routing nodes"), 70 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut. GROUP_LAYER), 150);70 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.ALT), 150); 71 71 model = new DefaultListModel(); 72 72 createLayout(getJScrollPane(), false, null); -
applications/editors/josm/plugins/simplifyarea/build.xml
r27816 r27852 32 32 <property name="commit.message" value="Initial commit"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java
r27841 r27852 47 47 public SimplifyAreaAction() { 48 48 super(tr("Simplify Area"), "simplify", tr("Delete unnecessary nodes from an area."), 49 Shortcut.registerShortcut("tools:simplifyArea", tr("Tool: {0}", tr("Simplify Area")), KeyEvent.VK_Y, Shortcut. GROUP_MENU+Shortcut.GROUPS_ALT1), true);49 Shortcut.registerShortcut("tools:simplifyArea", tr("Tool: {0}", tr("Simplify Area")), KeyEvent.VK_Y, Shortcut.CTRL_SHIFT), true); 50 50 } 51 51 -
applications/editors/josm/plugins/smed/build.xml
r27811 r27852 32 32 <property name="commit.message" value="New release"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- should not be necessary to change the following properties --> 36 36 <property name="josm" location="../../core/dist/josm-custom.jar"/> -
applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java
r27811 r27852 38 38 super( editor, "Smed",editor, 39 39 Shortcut.registerShortcut("tools:Seamaps", tr("Tool: {0}", tr("SeaMap Editor")), 40 KeyEvent.VK_K, Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT1),40 KeyEvent.VK_K, Shortcut.SHIFT), 41 41 true); //$NON-NLS-1$ //$NON-NLS-2$ 42 42 } -
applications/editors/josm/plugins/surveyor/build.xml
r27806 r27852 32 32 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <property name="josm" location="../../core/dist/josm-custom.jar"/> 36 36 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java
r27812 r27852 38 38 super(tr("AutoSave LiveData"), "autosave.png", tr("Save captured data to file every minute."), 39 39 Shortcut.registerShortcut("surveyor:autosave", tr("Tool: {0}", tr("AutoSave LiveData")), 40 KeyEvent.VK_S, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);40 KeyEvent.VK_S, Shortcut.ALT_CTRL_SHIFT), true); 41 41 } 42 42 -
applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java
r16290 r27852 46 46 super(tr("Surveyor..."), "surveyormenu.png", tr("Open surveyor tool."), 47 47 Shortcut.registerShortcut("surveyor:open", tr("Tool: {0}", tr("Surveyor...")), 48 KeyEvent.VK_R, Shortcut. GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);48 KeyEvent.VK_R, Shortcut.CTRL_SHIFT), true); 49 49 this.gpsPlugin = gpsPlugin; 50 50 } -
applications/editors/josm/plugins/tageditor/build.xml
r27576 r27852 27 27 <project name="tageditor" default="dist" basedir="."> 28 28 <property name="commit.message" value="Tageditor: help shortcut parser, rebuild"/> 29 <property name="plugin.main.version" value="4 847"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <!-- 31 31 ************************************************ -
applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java
r27675 r27852 27 27 tr("Launches the tag editor dialog"), 28 28 Shortcut.registerShortcut("edit:launchtageditor", tr("Launches the tag editor dialog"), 29 KeyEvent.VK_T,Shortcut. GROUP_EDIT)29 KeyEvent.VK_T,Shortcut.DIRECT) 30 30 , true, "tageditor/launch", true); 31 31 -
applications/editors/josm/plugins/tagging-preset-tester/build.xml
r27823 r27852 27 27 <project name="tagging-preset-tester" default="dist" basedir="."> 28 28 <property name="commit.message" value="fix shortcuts conflict"/> 29 <property name="plugin.main.version" value="49 60"/>29 <property name="plugin.main.version" value="4980"/> 30 30 <property name="josm" location="../../core/dist/josm-custom.jar"/> 31 31 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java
r27840 r27852 28 28 Shortcut.registerShortcut("tools:taggingpresettester", 29 29 tr("Tool: {0}", tr("Tagging Preset Tester")), 30 KeyEvent.VK_T, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT3), true);30 KeyEvent.VK_T, Shortcut.ALT_CTRL_SHIFT), true); 31 31 Main.main.menu.helpMenu.addSeparator(); 32 32 MainMenu.add(Main.main.menu.helpMenu, this); -
applications/editors/josm/plugins/terracer/build.xml
r27826 r27852 32 32 <property name="ant.build.javac.target" value="1.5"/> 33 33 <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <target name="init"> 36 36 <mkdir dir="${plugin.build.dir}"/> -
applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java
r27834 r27852 41 41 Shortcut.registerShortcut("tools:ReverseTerrace", 42 42 tr("Tool: {0}", tr("Reverse a Terrace")), 43 KeyEvent.VK_V, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1),43 KeyEvent.VK_V, Shortcut.ALT_CTRL_SHIFT), 44 44 true); 45 45 } -
applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java
r27826 r27852 71 71 Shortcut.registerShortcut("tools:Terracer", tr("Tool: {0}", 72 72 tr("Terrace a building")), KeyEvent.VK_T, 73 Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT1), true);73 Shortcut.SHIFT), true); 74 74 } 75 75 -
applications/editors/josm/plugins/tracer/build.xml
r27354 r27852 32 32 <property name="commit.message" value="adapt to latest josm (getNodePairs changed)"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="4 549"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java
r26610 r27852 42 42 43 43 public TracerAction(MapFrame mapFrame) { 44 super(tr("Tracer"), "tracer-sml", tr("Tracer."), Shortcut.registerShortcut("tools:tracer", tr("Tool: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut. GROUP_EDIT), mapFrame, getCursor());44 super(tr("Tracer"), "tracer-sml", tr("Tracer."), Shortcut.registerShortcut("tools:tracer", tr("Tool: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut.DIRECT), mapFrame, getCursor()); 45 45 } 46 46 -
applications/editors/josm/plugins/trustosm/build.xml
r27819 r27852 32 32 <property name="commit.message" value="New plugin for digital signing osm data"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 61"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java
r27819 r27852 17 17 public ExportSigsAction() { 18 18 super(tr("Export sigs..."), "exportsigs", tr("Export all signatures to XML file."), 19 Shortcut.registerShortcut("file:exportsigs", tr("Export sigs to XML..."), KeyEvent.VK_X, Shortcut. GROUPS_ALT2+Shortcut.GROUP_MENU));19 Shortcut.registerShortcut("file:exportsigs", tr("Export sigs to XML..."), KeyEvent.VK_X, Shortcut.ALT_CTRL)); 20 20 } 21 21 -
applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java
r25785 r27852 23 23 public GetMissingDataAction() { 24 24 super(tr("Download OSM"),"getmissing",tr("Get all referenced but not actually present OSM objects from OSM server."), 25 Shortcut.registerShortcut("gpg:download", tr("Download referenced osm objects..."), KeyEvent.VK_T, Shortcut. GROUP_MENU),true);25 Shortcut.registerShortcut("gpg:download", tr("Download referenced osm objects..."), KeyEvent.VK_T, Shortcut.CTRL),true); 26 26 } 27 27 -
applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java
r27819 r27852 187 187 super(tr("Object signatures"), "trustosm", tr("Open object signing window."), 188 188 Shortcut.registerShortcut("subwindow:trustosm", tr("Toggle: {0}", tr("Object signatures")), 189 KeyEvent.VK_T, Shortcut. GROUPS_ALT2+Shortcut.GROUP_DIRECT2), 150);189 KeyEvent.VK_T, Shortcut.ALT_CTRL), 150); 190 190 191 191 Main.map.mapView.addTemporaryLayer(this); -
applications/editors/josm/plugins/undelete/build.xml
r27803 r27852 32 32 <property name="commit.message" value="adapt to core changes (backwards compatible)"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java
r27803 r27852 68 68 public UndeleteAction() { 69 69 super(tr("Undelete object..."), "undelete", tr("Undelete object by id"), Shortcut.registerShortcut("tools:undelete", tr("File: {0}", tr("Undelete object...")), 70 KeyEvent.VK_U, Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT2), true);70 KeyEvent.VK_U, Shortcut.ALT_SHIFT), true); 71 71 } 72 72 -
applications/editors/josm/plugins/utilsplugin2/build.xml
r27761 r27852 32 32 <property name="commit.message" value="Utilsplugin2: fixing shortcut deprecation"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 37"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java
r27835 r27852 29 29 public AddIntersectionsAction() { 30 30 super(tr("Add nodes at intersections"), "addintersect", tr("Add missing nodes at intersections of selected ways."), 31 Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_N, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT3), true);31 Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_N, Shortcut.ALT_CTRL_SHIFT), true); 32 32 putValue("help", ht("/Action/AddIntersections")); 33 33 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java
r27761 r27852 34 34 tr("Extracts node from a way"), 35 35 Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"), 36 KeyEvent.VK_J, Shortcut. GROUP_DIRECT2), true);36 KeyEvent.VK_J, Shortcut.ALT), true); 37 37 putValue("help", ht("/Action/ExtractNode")); 38 38 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/LatLonAction.java
r27761 r27852 31 31 public LatLonAction() { 32 32 super(tr("Lat Lon tool"), "latlon", tr("Create geometry by entering lat lon coordinates for it."), 33 Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut. GROUP_DIRECT3), true);33 Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.CTRL_SHIFT), true); 34 34 putValue("help", ht("/Action/AddNode")); 35 35 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java
r27616 r27852 43 43 super(tr("Split Object"), "splitobject", tr("Split an object at the selected nodes."), 44 44 Shortcut.registerShortcut("tools:splitobject", tr("Tool: {0}", tr("Split Object")), 45 KeyEvent.VK_P, Shortcut. GROUP_MENU)45 KeyEvent.VK_P, Shortcut.CTRL) 46 46 , true); 47 47 putValue("help", ht("/Action/SplitObject")); -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java
r27761 r27852 36 36 super(tr("Symmetry"), "symmetry", tr("Mirror selected nodes and ways."), 37 37 Shortcut.registerShortcut("tools:symmetry", tr("Tool: {0}", tr("Symmetry")), 38 KeyEvent.VK_S, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);38 KeyEvent.VK_S, Shortcut.ALT_SHIFT), true); 39 39 putValue("help", ht("/Action/Symmetry")); 40 40 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java
r27761 r27852 43 43 public UnGlueRelationAction() { 44 44 super(tr("UnGlue Relation"), "ungluerelations", tr("Duplicate nodes, ways and relations that are used by multiple relations."), 45 Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);45 Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.ALT_SHIFT ), true); 46 46 putValue("help", ht("/Action/UnGlueRelation")); 47 47 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/curves/CurveAction.java
r27761 r27852 31 31 super(tr("Circle arc"), "circlearc", tr("Create a circle arc"), 32 32 Shortcut.registerShortcut("tools:createcurve", tr("Tool: {0}", tr("Create a circle arc")), KeyEvent.VK_C, 33 Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT), true);33 Shortcut.SHIFT), true); 34 34 putValue("help", ht("/Action/CreateCircleArc")); 35 35 updatePreferences(); -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java
r27761 r27852 36 36 tr("Opens specified URL browser"), 37 37 Shortcut.registerShortcut("tools:openurl", tr("Tool: {0}", tr("Open custom URL")), 38 KeyEvent.VK_H, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT), true);38 KeyEvent.VK_H, Shortcut.SHIFT), true); 39 39 putValue("help", ht("/Action/OpenPage")); 40 40 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java
r27761 r27852 23 23 public AlignWayNodesAction() { 24 24 super(TITLE, "dumbutils/alignwaynodes", tr("Align nodes in a way"), 25 Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT)25 Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.SHIFT) 26 26 , true); 27 27 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java
r27761 r27852 21 21 public PasteRelationsAction() { 22 22 super(TITLE, "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"), 23 Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", tr("Paste Relations")), KeyEvent.VK_V, Shortcut. GROUPS_ALT2+Shortcut.GROUP_MENU), true);23 Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", tr("Paste Relations")), KeyEvent.VK_V, Shortcut.ALT_CTRL), true); 24 24 } 25 25 -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java
r27761 r27852 33 33 public ReplaceGeometryAction() { 34 34 super(TITLE, "dumbutils/replacegeometry", tr("Replace geometry of selected object with a new one"), 35 Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut. GROUPS_ALT1+Shortcut.GROUP_MENU)35 Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.CTRL_SHIFT) 36 36 , true); 37 37 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java
r27764 r27852 27 27 super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"), 28 28 Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")), 29 KeyEvent.VK_P, Shortcut. GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);29 KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), true); 30 30 } 31 31 -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java
r27761 r27852 24 24 public TagBufferAction() { 25 25 super(TITLE, "dumbutils/tagbuffer", tr("Pastes tags of previously selected object(s)"), 26 Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT)26 Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut.SHIFT) 27 27 , true); 28 28 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java
r27761 r27852 24 24 public TagSourceAction() { 25 25 super(TITLE, "dumbutils/sourcetag", tr("Add remembered source tag"), 26 Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut. GROUPS_ALT2+Shortcut.GROUP_MENU)26 Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.ALT_CTRL) 27 27 , true); 28 28 source = Main.pref.get("sourcetag.value"); -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java
r25876 r27852 25 25 super(tr("Adjacent nodes"), "adjnodes", tr("Select adjacent nodes"), 26 26 Shortcut.registerShortcut("tools:adjnodes", tr("Tool: {0}","Adjacent nodes"), 27 KeyEvent.VK_E, Shortcut. GROUP_EDIT), true);27 KeyEvent.VK_E, Shortcut.DIRECT), true); 28 28 putValue("help", ht("/Action/AdjacentNodes")); 29 29 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java
r27761 r27852 26 26 tr("Adjacent ways will be selected. Nodes will be deselected."), 27 27 Shortcut.registerShortcut("tools:adjways", tr("Tool: {0}","Adjacent ways"), 28 KeyEvent.VK_E, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT), true);28 KeyEvent.VK_E, Shortcut.SHIFT), true); 29 29 putValue("help", ht("/Action/AdjacentWays")); 30 30 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java
r27761 r27852 23 23 super(tr("All connected ways"), "adjwaysall", tr("Select all connected ways"), 24 24 Shortcut.registerShortcut("tools:adjwaysall", tr("Tool: {0}","All connected ways"), 25 KeyEvent.VK_E, Shortcut. GROUPS_ALT1+Shortcut.GROUP_MENU), true);25 KeyEvent.VK_E, Shortcut.CTRL_SHIFT), true); 26 26 putValue("help", ht("/Action/SelectConnectedWays")); 27 27 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java
r26644 r27852 25 25 super(tr("Intersecting ways"), "intway", tr("Select intersecting ways"), 26 26 Shortcut.registerShortcut("tools:intway", tr("Tool: {0}","Intersecting ways"), 27 KeyEvent.VK_I, Shortcut. GROUP_EDIT), true);27 KeyEvent.VK_I, Shortcut.DIRECT), true); 28 28 putValue("help", ht("/Action/SelectIntersectingWays")); 29 29 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java
r27841 r27852 25 25 super(tr("All intersecting ways"), "intwayall", tr("Select all intersecting ways"), 26 26 Shortcut.registerShortcut("tools:intwayall", tr("Tool: {0}","All intersecting ways"), 27 KeyEvent.VK_MULTIPLY, Shortcut. GROUP_MENU), true);27 KeyEvent.VK_MULTIPLY, Shortcut.CTRL), true); 28 28 putValue("help", ht("/Action/SelectAllIntersectingWays")); 29 29 -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java
r27761 r27852 27 27 super(tr("Middle nodes"), "midnodes", tr("Select middle nodes"), 28 28 Shortcut.registerShortcut("tools:midnodes", tr("Tool: {0}","Middle nodes"), 29 KeyEvent.VK_E, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);29 KeyEvent.VK_E, Shortcut.ALT_SHIFT), true); 30 30 putValue("help", ht("/Action/MiddleNodes")); 31 31 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java
r27761 r27852 29 29 super(tr("All inside [testing]"), "selinside", tr("Select all inside selected polygons"), 30 30 Shortcut.registerShortcut("tools:selinside", tr("Tool: {0}","All inside"), 31 KeyEvent.VK_I, Shortcut. GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);31 KeyEvent.VK_I, Shortcut.ALT_SHIFT), true); 32 32 putValue("help", ht("/Action/SelectAllInside")); 33 33 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectBoundaryAction.java
r27761 r27852 36 36 super(tr("Area boundary [testing]"), "selboundary", tr("Select relation or all ways that forms area boundary"), 37 37 Shortcut.registerShortcut("tools:selboundary", tr("Tool: {0}","Area boundary [testing]"), 38 KeyEvent.VK_SLASH, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT), true);38 KeyEvent.VK_SLASH, Shortcut.SHIFT), true); 39 39 putValue("help", ht("/Action/SelectAreaBoundary")); 40 40 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java
r27761 r27852 24 24 super(tr("Select Highway"), "selecthighway", tr("Select highway for the name/ref given"), 25 25 Shortcut.registerShortcut("tools:selecthighway", tr("Tool: {0}","Select Highway"), 26 KeyEvent.VK_W, Shortcut. GROUPS_ALT2+Shortcut.GROUP_MENU), true);26 KeyEvent.VK_W, Shortcut.ALT_CTRL), true); 27 27 } 28 28 -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java
r27761 r27852 28 28 tr("Select last modified nodes"), 29 29 Shortcut.registerShortcut("tools:selmodnodes", tr("Tool: {0}","Select last modified nodes"), 30 KeyEvent.VK_Z, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT), true);30 KeyEvent.VK_Z, Shortcut.SHIFT), true); 31 31 putValue("help", ht("/Action/SelectLastModifiedNodes")); 32 32 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java
r27834 r27852 28 28 tr("Select last modified ways"), 29 29 Shortcut.registerShortcut("tools:selmodways", tr("Tool: {0}","Select last modified ways"), 30 KeyEvent.VK_Z, Shortcut. GROUP_DIRECT2+Shortcut.GROUPS_ALT1), true);30 KeyEvent.VK_Z, Shortcut.ALT_SHIFT), true); 31 31 putValue("help", ht("/Action/SelectLastModifiedWays")); 32 32 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java
r27761 r27852 31 31 public SelectWayNodesAction() { 32 32 super(tr("Select Way Nodes"),"selectwaynodes" , tr("Select all nodes of a selected way."), 33 Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut. GROUPS_ALT1+Shortcut.GROUP_MENU), true);33 Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut.CTRL_SHIFT), true); 34 34 putValue("help", ht("/Action/SelectWayNodes")); 35 35 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java
r27761 r27852 27 27 tr("Reselect last added object or selection form history"), 28 28 Shortcut.registerShortcut("tools:undoselection", tr("Tool: {0}","Undo selection"), 29 KeyEvent.VK_Z, Shortcut. GROUPS_ALT1+Shortcut.GROUP_MENU), true);29 KeyEvent.VK_Z, Shortcut.CTRL_SHIFT), true); 30 30 putValue("help", ht("/Action/UndoSelection")); 31 31 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java
r27761 r27852 24 24 tr("Removes all nodes from selection"), 25 25 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"), 26 KeyEvent.VK_U, Shortcut. GROUPS_ALT1+Shortcut.GROUP_EDIT), true);26 KeyEvent.VK_U, Shortcut.SHIFT), true); 27 27 putValue("help", ht("/Action/UnselectNodes")); 28 28 } -
applications/editors/josm/plugins/videomapping/build.xml
r27354 r27852 32 32 <property name="commit.message" value="videomapping"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="4 549"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java
r27786 r27852 100 100 }; 101 101 VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"), 102 Shortcut.registerShortcut("videomapping:startstop",tr("Video: {0}", tr("Play/Pause")),KeyEvent.VK_NUMPAD5, Shortcut. GROUP_DIRECT), false) {102 Shortcut.registerShortcut("videomapping:startstop",tr("Video: {0}", tr("Play/Pause")),KeyEvent.VK_NUMPAD5, Shortcut.DIRECT), false) { 103 103 public void actionPerformed(ActionEvent e) { 104 104 gpsVideoPlayer.pause(); … … 106 106 }; 107 107 Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"), 108 Shortcut.registerShortcut("videomapping:backward",tr("Video: {0}", tr("Backward")),KeyEvent.VK_NUMPAD4, Shortcut. GROUP_DIRECT), false) {108 Shortcut.registerShortcut("videomapping:backward",tr("Video: {0}", tr("Backward")),KeyEvent.VK_NUMPAD4, Shortcut.DIRECT), false) { 109 109 public void actionPerformed(ActionEvent e) { 110 110 gpsVideoPlayer.backward(); … … 112 112 }; 113 113 Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"), 114 Shortcut.registerShortcut("videomapping:forward",tr("Video: {0}", tr("Forward")),KeyEvent.VK_NUMPAD6, Shortcut. GROUP_DIRECT), false) {114 Shortcut.registerShortcut("videomapping:forward",tr("Video: {0}", tr("Forward")),KeyEvent.VK_NUMPAD6, Shortcut.DIRECT), false) { 115 115 public void actionPerformed(ActionEvent e) { 116 116 gpsVideoPlayer.forward(); … … 119 119 }; 120 120 Vfaster= new JosmAction(tr("Faster"), "audio-faster", tr("faster playback"), 121 Shortcut.registerShortcut("videomapping:faster",tr("Video: {0}", tr("Faster")),KeyEvent.VK_NUMPAD8, Shortcut. GROUP_DIRECT), false) {121 Shortcut.registerShortcut("videomapping:faster",tr("Video: {0}", tr("Faster")),KeyEvent.VK_NUMPAD8, Shortcut.DIRECT), false) { 122 122 123 123 public void actionPerformed(ActionEvent e) { … … 127 127 }; 128 128 Vslower= new JosmAction(tr("Slower"), "audio-slower", tr("slower playback"), 129 Shortcut.registerShortcut("videomapping:slower",tr("Video: {0}", tr("Slower")),KeyEvent.VK_NUMPAD2, Shortcut. GROUP_DIRECT), false) {129 Shortcut.registerShortcut("videomapping:slower",tr("Video: {0}", tr("Slower")),KeyEvent.VK_NUMPAD2, Shortcut.DIRECT), false) { 130 130 131 131 public void actionPerformed(ActionEvent e) { … … 142 142 }; 143 143 Vloop= new JosmAction(tr("Loop"), "loop", tr("loops n sec around current position"), 144 Shortcut.registerShortcut("videomapping:loop",tr("Video: {0}", tr("Loop")),KeyEvent.VK_NUMPAD7, Shortcut. GROUP_DIRECT), false) {144 Shortcut.registerShortcut("videomapping:loop",tr("Video: {0}", tr("Loop")),KeyEvent.VK_NUMPAD7, Shortcut.DIRECT), false) { 145 145 public void actionPerformed(ActionEvent e) { 146 146 gpsVideoPlayer.toggleLooping(); -
applications/editors/josm/plugins/waydownloader/build.xml
r27803 r27852 26 26 --> 27 27 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 28 <property name="plugin.main.version" value="49 28"/>28 <property name="plugin.main.version" value="4980"/> 29 29 <!-- 30 30 ************************************************ -
applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java
r27803 r27852 57 57 "way-download", 58 58 tr("Download map data on the end of selected way"), 59 Shortcut.registerShortcut("waydownloader:waydownload", tr("Way Download"), KeyEvent.VK_W, Shortcut. GROUP_MENU+Shortcut.GROUPS_ALT1),59 Shortcut.registerShortcut("waydownloader:waydownload", tr("Way Download"), KeyEvent.VK_W, Shortcut.CTRL_SHIFT), 60 60 true); 61 61 } -
applications/editors/josm/plugins/wayselector/build.xml
r27803 r27852 32 32 <property name="commit.message" value="recompile due to core change"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="49 28"/>34 <property name="plugin.main.version" value="4980"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java
r27803 r27852 45 45 "way-select", 46 46 tr("Select non-branching sequences of ways"), 47 Shortcut.registerShortcut("wayselector:wayselect", tr("Way Select"), KeyEvent.VK_W, Shortcut. GROUP_EDIT+Shortcut.GROUPS_ALT1),47 Shortcut.registerShortcut("wayselector:wayselect", tr("Way Select"), KeyEvent.VK_W, Shortcut.SHIFT), 48 48 true); 49 49 }
Note:
See TracChangeset
for help on using the changeset viewer.