Changeset 6000 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2013-06-10T22:03:21+02:00 (11 years ago)

Author:

simon04

Message:

Add combobox for image format to dialog when creating WMS layer

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -5 +5 @@
 
 import java.awt.Dimension;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
@@ -10 +11 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
+import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import org.openstreetmap.josm.Main;
@@ -20 +23 @@
 import org.openstreetmap.josm.io.imagery.WMSImagery;
 import org.openstreetmap.josm.gui.preferences.imagery.WMSLayerTree;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -77 +81 @@
             final WMSLayerTree tree = new WMSLayerTree();
             tree.updateTree(wms);
+            final JComboBox formats = new JComboBox(wms.getFormats().toArray());
+            formats.setToolTipText(tr("Select image format for WMS layer"));
 
             if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) {{
                 final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
-                setContent(scrollPane);
                 scrollPane.setPreferredSize(new Dimension(400, 400));
+                final JPanel panel = new JPanel(new GridBagLayout());
+                panel.add(scrollPane, GBC.eol().fill());
+                panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+                setContent(panel);
             }}.showDialog().getValue()) {
                 return null;
             }
 
-            String url = wms.buildGetMapUrl(tree.getSelectedLayers());
+            final String url = wms.buildGetMapUrl(
+                    tree.getSelectedLayers(), (String) formats.getSelectedItem());
             return new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies());
         } // exception handling from AddWMSLayerPanel.java