From 1138a62bcb769b8d303e45f9b1110c132ce1f01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20St=C3=B6cker?= Date: Fri, 28 Apr 2023 12:08:35 +0200 Subject: [PATCH] allow shortcut parsing, fix argument order --- .../actions/MapPointObjectLayerAction.java | 4 ++-- .../gui/dialog/ImageNavigationDialog.java | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapillary/actions/MapPointObjectLayerAction.java b/src/main/java/org/openstreetmap/josm/plugins/mapillary/actions/MapPointObjectLayerAction.java index fa9e9dbdb..a400660af 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapillary/actions/MapPointObjectLayerAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapillary/actions/MapPointObjectLayerAction.java @@ -27,8 +27,8 @@ public class MapPointObjectLayerAction extends JosmAction { "Displays the layer displaying the map point objects detected by Mapillary"); public MapPointObjectLayerAction() { - super(tr(ACTION_NAME), MapillaryPlugin.LOGO.setSize(ImageSizes.DEFAULT), tr(TOOLTIP), Shortcut - .registerShortcut("mapillary:pointFeaturesLayer", tr(ACTION_NAME), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), + super(tr(ACTION_NAME), MapillaryPlugin.LOGO.setSize(ImageSizes.DEFAULT), tr(TOOLTIP), + Shortcut.registerShortcut("mapillary:pointFeaturesLayer", tr(ACTION_NAME), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillary:pointFeaturesLayer", true); } diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/dialog/ImageNavigationDialog.java b/src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/dialog/ImageNavigationDialog.java index 9458d3f44..d28c9ec57 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/dialog/ImageNavigationDialog.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/dialog/ImageNavigationDialog.java @@ -39,28 +39,28 @@ public class ImageNavigationDialog extends ToggleDialog implements LayerManager.LayerChangeListener, IGeoImageLayer.ImageChangeListener { /* Shortcut for image navigation: forward */ private static final Shortcut FORWARD = Shortcut.registerShortcut("mapillary:image_navigation:forward", - tr("Mapillary: Image Navigation: Forward"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Forward"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: left */ private static final Shortcut LEFT = Shortcut.registerShortcut("mapillary:image_navigation:left", - tr("Mapillary: Image Navigation: Left"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Left"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: right */ private static final Shortcut RIGHT = Shortcut.registerShortcut("mapillary:image_navigation:right", - tr("Mapillary: Image Navigation: Right"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Right"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: turn left */ private static final Shortcut TURN_LEFT = Shortcut.registerShortcut("mapillary:image_navigation:turn_left", - tr("Mapillary: Image Navigation: Turn Left"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Turn Left"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: turn right */ private static final Shortcut TURN_RIGHT = Shortcut.registerShortcut("mapillary:image_navigation:turn_right", - tr("Mapillary: Image Navigation: Turn Right"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Turn Right"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: reverse */ private static final Shortcut U_TURN = Shortcut.registerShortcut("mapillary:image_navigation:reverse", - tr("Mapillary: Image Navigation: Reverse"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Reverse"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: back */ private static final Shortcut BACK = Shortcut.registerShortcut("mapillary:image_navigation:back", - tr("Mapillary: Image Navigation: Back"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: Back"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); /* Shortcut for image navigation: 360deg panoramic */ private static final Shortcut PANO = Shortcut.registerShortcut("mapillary:image_navigation:pano", - tr("Mapillary: Image Navigation: 360 panoramic"), Shortcut.NONE, KeyEvent.CHAR_UNDEFINED); + tr("Mapillary: Image Navigation: 360 panoramic"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE); private ImageNavigation imageNavigation; private JPanel panel; @@ -69,8 +69,8 @@ public class ImageNavigationDialog extends ToggleDialog */ public ImageNavigationDialog() { super(tr("Mapillary: Image Navigation"), "mapillary-main", tr("Navigate between different Mapillary images"), - Shortcut.registerShortcut("mapillary:image_navigation", tr("Mapillary: Image Navigation"), Shortcut.NONE, - KeyEvent.CHAR_UNDEFINED), + Shortcut.registerShortcut("mapillary:image_navigation", tr("Mapillary: Image Navigation"), KeyEvent.CHAR_UNDEFINED, + Shortcut.NONE), 80); MainApplication.getLayerManager().addAndFireLayerChangeListener(this); }