Changeset 5390 in josm

Timestamp:

Aug 4, 2012 1:17:04 PM (10 months ago)

Author:

bastiK

Message:

use individual imagery icons in layer list

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ImageryMenu.java (modified) (1 diff)
• layer/ImageryLayer.java (modified) (3 diffs)
• layer/Layer.java (modified) (1 diff)

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

@@ -92 +92 @@
         removeAll();
 
-        // for each configured WMSInfo, add a menu entry.
+        // for each configured ImageryInfo, add a menu entry.
         for (final ImageryInfo u : ImageryLayerInfo.instance.getLayers()) {
             add(new AddImageryLayerAction(u));

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -42 +42 @@
 
 public abstract class ImageryLayer extends Layer {
-    protected static final Icon icon = ImageProvider.get("imagery_small");
 
     public static final IntegerProperty PROP_FADE_AMOUNT = new IntegerProperty("imagery.fade_amount", 0);
@@ -62 +61 @@
     protected final ImageryInfo info;
 
+    protected Icon icon;
+
     protected double dx = 0.0;
     protected double dy = 0.0;
@@ -79 +80 @@
         super(info.getName());
         this.info = info;
+        if (info.getIcon() != null) {
+            icon = new ImageProvider(info.getIcon()).setOptional(true).
+                    setMaxHeight(ICON_SIZE).setMaxWidth(ICON_SIZE).get();
+            if (icon == null) {
+                icon = ImageProvider.get("imagery_small");
+            }
+        }
         this.sharpenLevel = PROP_SHARPEN_LEVEL.get();
         if (OffsetServer.PROP_SERVER_ENABLED.get()) {

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -83 +83 @@
     static public final String NAME_PROP = Layer.class.getName() + ".name";
 
+    static public final int ICON_SIZE = 16;
+
     /** keeps track of property change listeners */
     protected PropertyChangeSupport propertyChangeSupport;