Changeset 15437 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-10-07T00:45:30+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #13015 - add icons to preset <check>s

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• tagging/presets/items/Check.java (modified) (5 diffs)
• widgets/QuadStateCheckBox.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
+import java.awt.GridBagLayout;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7 +10 @@
 import java.util.List;
 
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 
 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.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.gui.widgets.QuadStateCheckBox;
 import org.openstreetmap.josm.tools.GBC;
@@ -30 +37 @@
     /** "on" or "off" or unset (default is unset) */
     public String default_; // only used for tagless objects // NOSONAR
+    /** The location of icon file to display */
+    public String icon; // NOSONAR
+    /** The size of displayed icon. If not set, default is 16px */
+    public String icon_size; // NOSONAR
 
     private QuadStateCheckBox check;
@@ -80 +91 @@
             allowedStates.add(QuadStateCheckBox.State.NOT_SELECTED);
         allowedStates.add(QuadStateCheckBox.State.UNSET);
-        check = new QuadStateCheckBox(locale_text, initialState,
+        check = new QuadStateCheckBox(icon == null ? locale_text : null, initialState,
                 allowedStates.toArray(new QuadStateCheckBox.State[0]));
         check.setPropertyText(key);
         check.setState(check.getState()); // to update the tooltip text
 
-        p.add(check, GBC.eol()); // Do not fill, see #15104
+        JPanel checkPanel = new JPanel(new GridBagLayout());
+        checkPanel.add(check, GBC.std());
+        if (icon != null) {
+            JLabel label = new JLabel(locale_text, getIcon(), SwingConstants.LEFT);
+            label.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mousePressed(MouseEvent e) {
+                    check.getMouseAdapter().mousePressed(e);
+                }
+            });
+            checkPanel.add(label);
+            checkPanel.add(new JLabel(), GBC.eol().fill());
+        }
+        p.add(checkPanel, GBC.eol()); // Do not fill, see #15104
         return true;
     }
@@ -106 +130 @@
     }
 
+    /**
+     * Returns the entry icon, if any.
+     * @return the entry icon, or {@code null}
+     * @since 15437
+     */
+    public ImageIcon getIcon() {
+        Integer size = parseInteger(icon_size);
+        return icon == null ? null : loadImageIcon(icon, TaggingPresetReader.getZipIcons(), size != null ? size : 16);
+    }
+
     @Override
     public Collection<String> getValues() {

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

@@ -45 +45 @@
     private final transient QuadStateDecorator cbModel;
     private State[] allowed;
+    private final MouseListener mouseAdapter = new MouseAdapter() {
+        @Override
+        public void mousePressed(MouseEvent e) {
+            grabFocus();
+            cbModel.nextState();
+        }
+    };
 
     /**
@@ -57 +64 @@
         this.allowed = Utils.copyArray(allowed);
         // Add a listener for when the mouse is pressed
-        super.addMouseListener(new MouseAdapter() {
-            @Override public void mousePressed(MouseEvent e) {
-                grabFocus();
-                cbModel.nextState();
-            }
-        });
+        super.addMouseListener(mouseAdapter);
         // Reset the keyboard action map
         ActionMap map = new ActionMapUIResource();
@@ -94 +96 @@
     public synchronized void addMouseListener(MouseListener l) {
         // Do nothing
+    }
+
+    /**
+     * Returns the internal mouse listener.
+     * @return the internal mouse listener
+     * @since 15437
+     */
+    public MouseListener getMouseAdapter() {
+        return mouseAdapter;
     }