Changeset 15445 in josm

Timestamp:

2019-10-08T23:08:20+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18210 - fix mode menu (add items properly to display shortcuts) and fix definition of lasso mode to consider it a traditional mapmode

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectLassoAction.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java ) (2 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/MapFrame.java (modified) (5 diffs)
• gui/ModeMenu.java (added)
• gui/layer/geoimage/GeoImageLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectLassoAction.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions;
+package org.openstreetmap.josm.actions.mapmode;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.actions.mapmode.MapMode;
+import java.awt.event.KeyEvent;
+
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -14 +16 @@
  * @since 5152
  */
-public class LassoModeAction extends MapMode {
+public class SelectLassoAction extends MapMode {
 
     /**
-     * Constructs a new {@code LassoModeAction}.
+     * Constructs a new {@code SelectLassoAction}.
      */
-    public LassoModeAction() {
+    public SelectLassoAction() {
         super(tr("Lasso Mode"),
                 /* ICON(mapmode/) */ "rope",
                 tr("Lasso selection mode: select objects within a hand-drawn region"),
+                Shortcut.registerShortcut("mapmode:lasso", tr("Mode: {0}", tr("Lasso Mode")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
                 ImageProvider.getCursor("normal", "rope"));
     }

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -344 +344 @@
      * modeMenu contains map modes
      */
-    public final JMenu modeMenu = addMenu("Mode", /* I18N: mnemonic: M */ trc("menu", "Mode"), KeyEvent.VK_M, 3, ht("/Menu/Mode"));
+    public final JMenu modeMenu = addMenu(new ModeMenu(), /* I18N: mnemonic: M */ trc("menu", "Mode"), KeyEvent.VK_M, 3, ht("/Menu/Mode"));
     /**
      * toolsMenu contains different geometry manipulation actions from JOSM core (most used)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -44 +44 @@
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 
-import org.openstreetmap.josm.actions.LassoModeAction;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
@@ -52 +51 @@
 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
+import org.openstreetmap.josm.actions.mapmode.SelectLassoAction;
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
 import org.openstreetmap.josm.data.ViewportData;
@@ -176 +176 @@
     public final DeleteAction mapModeDelete;
     /** Select Lasso mode */
-    public LassoModeAction mapModeSelectLasso;
+    public final SelectLassoAction mapModeSelectLasso;
 
     private final transient Map<Layer, MapMode> lastMapMode = new HashMap<>();
@@ -241 +241 @@
         // toolBarActions, map mode buttons
         mapModeSelect = new SelectAction(this);
-        mapModeSelectLasso = new LassoModeAction();
+        mapModeSelectLasso = new SelectLassoAction();
         mapModeDraw = new DrawAction();
         mapModeZoom = new ZoomAction(this);
@@ -439 +439 @@
         if (!(b.getAction() instanceof MapMode))
             throw new IllegalArgumentException("MapMode action must be subclass of MapMode");
-        MainApplication.getMenu().modeMenu.add(new JCheckBoxMenuItem(b.getAction()));
+        MainMenu.add(MainApplication.getMenu().modeMenu, (MapMode) b.getAction());
         allMapModeButtons.add(b);
         toolBarActionsGroup.add(b);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -36 +36 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.actions.LassoModeAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.actions.mapmode.SelectLassoAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
@@ -787 +787 @@
     /**
      * Determines if the functionality of this layer is available in
-     * the specified map mode. {@link SelectAction} and {@link LassoModeAction} are supported by default,
+     * the specified map mode. {@link SelectAction} and {@link SelectLassoAction} are supported by default,
      * other map modes can be registered.
      * @param mapMode Map mode to be checked
@@ -794 +794 @@
      */
     private static boolean isSupportedMapMode(MapMode mapMode) {
-        if (mapMode instanceof SelectAction || mapMode instanceof LassoModeAction) {
+        if (mapMode instanceof SelectAction || mapMode instanceof SelectLassoAction) {
             return true;
         }