Changeset 7532 in josm

Timestamp:

2014-09-14T02:03:20+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #8664, fix #10510 - possibility to add icon to preset labels

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/tagging-preset.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (6 diffs)

trunk/data/defaultpresets.xml

@@ -31 +31 @@
 label: simple static text label
   text: the text to display
+  icon: location of icon to display (optional)
+  icon_size: maximal size of icon (optional). If no value is given, default is 16px
 
 space: empty line

trunk/data/tagging-preset.xsd

@@ -155 +155 @@
                 <attribute name="text" type="string" use="required" />
                 <attribute name="text_context" type="string" />
+                <attribute name="icon" type="string" />
+                <attribute name="icon_size" type="integer" />
 
                 <attribute name="name" use="prohibited" />

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -220 +220 @@
         }
         if (preset_name_label) {
-            TaggingPresetItems.Label.addLabel(p, getName());
+            TaggingPresetItems.Label.addLabel(p, getIcon(), getName());
         }
 
@@ -374 +374 @@
             }
 
-            answer = new PresetDialog(p, title, (ImageIcon) getValue(Action.SMALL_ICON),
+            answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),
                     sel.isEmpty(), showNewRelation).getValue();
         }

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -32 +32 @@
 
 import javax.swing.ButtonGroup;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -91 +92 @@
         public String display_value;
         public String short_description;
+        /** The location of icon file to display */
         public String icon;
+        /** The size of displayed icon. If not set, default is size from icon file */
         public String icon_size;
         /** The localized version of {@link #display_value}. */
@@ -128 +131 @@
         public ImageIcon getIcon() {
             return icon == null ? null : loadImageIcon(icon, zipIcons, parseInteger(icon_size));
-        }
-
-        private Integer parseInteger(String str) {
-            if (str == null || str.isEmpty())
-                return null;
-            try {
-                return Integer.parseInt(str);
-            } catch (Exception e) {
-                //
-            }
-            return null;
         }
 
@@ -357 +349 @@
     public static class Label extends TaggingPresetTextItem {
 
+        /** The location of icon file to display (optional) */
+        public String icon;
+        /** The size of displayed icon. If not set, default is 16px */
+        public String icon_size;
+
         @Override
         public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel, boolean presetInitiallyMatches) {
             initializeLocaleText(null);
-            addLabel(p, locale_text);
+            addLabel(p, getIcon(), locale_text);
             return true;
         }
@@ -367 +364 @@
          * Adds a new {@code JLabel} to the given panel.
          * @param p The panel
+         * @param icon the icon (optional, can be null)
          * @param label The text label
          */
-        public static void addLabel(JPanel p, String label) {
-            p.add(new JLabel(label), GBC.eol().fill(GBC.HORIZONTAL));
+        public static void addLabel(JPanel p, Icon icon, String label) {
+            p.add(new JLabel(label, icon, JLabel.LEADING), GBC.eol().fill(GBC.HORIZONTAL));
+        }
+
+        /**
+         * Returns the label icon, if any.
+         * @return the label icon, or {@code null}
+         */
+        public ImageIcon getIcon() {
+            Integer size = parseInteger(icon_size);
+            return icon == null ? null : loadImageIcon(icon, TaggingPresetReader.getZipIcons(), size != null ? size : 16);
         }
     }
@@ -1507 +1514 @@
         return imgProv.get();
     }
+
+    protected static Integer parseInteger(String str) {
+        if (str == null || str.isEmpty())
+            return null;
+        try {
+            return Integer.parseInt(str);
+        } catch (Exception e) {
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
+        }
+        return null;
+    }
 }