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

Timestamp:

2013-05-14T23:55:50+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #5790 - No layer information for Imagery Sources

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• ImageryLayer.java (modified) (4 diffs)
• TMSLayer.java (modified) (1 diff)

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

@@ -10 +10 @@
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.GridBagLayout;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -22 +23 @@
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
@@ -36 +39 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MenuScroller;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UrlLabel;
 
 public abstract class ImageryLayer extends Layer {
@@ -120 +125 @@
     @Override
     public Object getInfoComponent() {
-        return getToolTipText();
+        JPanel panel = new JPanel(new GridBagLayout());
+        panel.add(new JLabel(getToolTipText()), GBC.eol());
+        if (info != null) {
+            String url = info.getUrl();
+            if (url != null) {
+                panel.add(new JLabel(tr("URL: ")), GBC.std().insets(0, 5, 2, 0)); 
+                panel.add(new UrlLabel(url), GBC.eol().insets(2, 5, 10, 0));
+            }
+            if (dx != 0.0 || dy != 0.0) {
+                panel.add(new JLabel(tr("Offset: ") + dx + ";" + dy), GBC.eol().insets(0, 5, 10, 0));
+            }
+        }
+        return panel;
     }
 

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

@@ -1487 +1487 @@
     @Override
     public String getToolTipText() {
-        return null;
+        return tr("TMS layer ({0}), downloading in zoom {1}", getName(), currentZoomLevel);
     }