Changeset 16276 in josm for trunk

Timestamp:

2020-04-12T16:21:18+02:00 (4 years ago)

Author:

simon04

Message:

fix #19075 - Presets: add popup menu to keys

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• tagging/presets/items/Check.java (modified) (1 diff)
• tagging/presets/items/ComboMultiSelect.java (modified) (1 diff)
• tagging/presets/items/KeyedItem.java (modified) (2 diffs)
• tagging/presets/items/Text.java (modified) (1 diff)
• widgets/QuadStateCheckBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java

@@ -91 +91 @@
         check.setPropertyText(key);
         check.setState(check.getState()); // to update the tooltip text
+        check.setComponentPopupMenu(getPopupMenu());
 
         if (icon != null) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -388 +388 @@
         final JLabel label = new JLabel(tr("{0}:", locale_text));
         label.setToolTipText(getKeyTooltipText());
+        label.setComponentPopupMenu(getPopupMenu());
         p.add(label, GBC.std().insets(0, 0, 10, 0));
         addToPanelAnchor(p, default_, presetInitiallyMatches);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java

@@ -12 +12 @@
 import java.util.TreeSet;
 
+import javax.swing.JPopupMenu;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.gui.dialogs.properties.HelpTagAction;
+import org.openstreetmap.josm.gui.dialogs.properties.TaginfoAction;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
 
@@ -204 +209 @@
     }
 
+    protected JPopupMenu getPopupMenu() {
+        Tag tag = new Tag(key, null);
+        JPopupMenu popupMenu = new JPopupMenu();
+        popupMenu.add(tr("Key: {0}", key)).setEnabled(false);
+        popupMenu.add(new HelpTagAction(() -> tag));
+        popupMenu.add(new TaginfoAction(() -> tag, () -> null));
+        return popupMenu;
+    }
+
     @Override
     public String toString() {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java

@@ -166 +166 @@
         final JLabel label = new JLabel(locale_text + ':');
         label.setToolTipText(getKeyTooltipText());
+        label.setComponentPopupMenu(getPopupMenu());
         label.setLabelFor(value);
         p.add(label, GBC.std().insets(0, 0, 10, 0));

trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java

@@ -48 +48 @@
         @Override
         public void mousePressed(MouseEvent e) {
-            grabFocus();
-            cbModel.nextState();
+            if (SwingUtilities.isLeftMouseButton(e)) {
+                grabFocus();
+                cbModel.nextState();
+            }
         }
     };