Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 3056)
+++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 3057)
@@ -11,4 +11,5 @@
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Toolkit;
@@ -25,5 +26,4 @@
import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JComponent;
@@ -88,16 +88,18 @@
public JPanel buildMainPanel() {
+ // generic constraints used by different components
+ GridBagConstraints gridBagConstraints;
+
JPanel pnl = new JPanel();
pnl.setLayout(new GridBagLayout());
- pnl.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
// adding the download tasks
- pnl.add(new JLabel(tr("Data Sources and Types")), GBC.eol().insets(0,5,0,0));
+ pnl.add(new JLabel(tr("Data Sources and Types:")), GBC.std().insets(5,5,1,5));
cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), true);
cbDownloadOsmData.setToolTipText(tr("Select to download OSM data in the selected download area."));
- pnl.add(cbDownloadOsmData, GBC.eol().insets(20,0,0,0));
+ pnl.add(cbDownloadOsmData, GBC.std().insets(1,5,1,5));
cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"));
cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces in the selected download area."));
- pnl.add(cbDownloadGpxData, GBC.eol().insets(20,0,0,0));
+ pnl.add(cbDownloadGpxData, GBC.eol().insets(5,5,1,5));
// predefined download selections
@@ -118,10 +120,4 @@
}
- cbNewLayer = new JCheckBox(tr("Download as new layer"));
- cbNewLayer.setToolTipText(tr("Select to download data into a new data layer.
"
- +"Unselect to download into the currently active data layer."));
- pnl.add(cbNewLayer, GBC.eol().insets(0,5,0,0));
-
- pnl. add(new JLabel(tr("Download Area")), GBC.eol().insets(0,5,0,0));
pnl.add(tpDownloadAreaSelectors, GBC.eol().fill());
@@ -134,5 +130,12 @@
Font labelFont = sizeCheck.getFont();
sizeCheck.setFont(labelFont.deriveFont(Font.PLAIN, labelFont.getSize()));
- pnl.add(sizeCheck, GBC.eop().insets(0,5,5,10));
+
+ cbNewLayer = new JCheckBox(tr("Download as new layer"));
+ cbNewLayer.setToolTipText(tr("Select to download data into a new data layer.
"
+ +"Unselect to download into the currently active data layer."));
+
+ pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5,5,5,5));
+ pnl.add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5,5,5,5));
+
return pnl;
}
Index: /trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 3056)
+++ /trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 3057)
@@ -14,5 +14,4 @@
import java.util.Vector;
-import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -117,7 +116,4 @@
slipyyMapTabPanel.setLayout(new BorderLayout());
slipyyMapTabPanel.add(this, BorderLayout.CENTER);
- String labelText = tr("Zoom: Mousewheel, double click or Ctrl + Up/Down "
- + "Move map: Hold right mousebutton and move mouse or use cursor keys. Select: Hold left mousebutton and draw a frame.");
- slipyyMapTabPanel.add(new JLabel("" + labelText + ""), BorderLayout.SOUTH);
iGui.addDownloadAreaSelector(slipyyMapTabPanel, tr("Slippy map"));
new OsmMapControl(this, slipyyMapTabPanel, iSizeButton, iSourceButton);
Index: /trunk/src/org/openstreetmap/josm/tools/GBC.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/GBC.java (revision 3056)
+++ /trunk/src/org/openstreetmap/josm/tools/GBC.java (revision 3057)
@@ -97,4 +97,16 @@
/**
+ * Specifies how to distribute extra horizontal space.
+ * @param weidhtx Weight in horizontal direction
+ * @param weighty Weight in vertical direction
+ * @return This constraint for chaining.
+ */
+ public GBC weight(int weightx, int weighty) {
+ this.weightx = weightx;
+ this.weighty = weighty;
+ return this;
+ }
+
+ /**
* This is a helper to easily create a glue with a minimum default value.
* @param x If higher than 0, this will be a horizontal glue with x as minimum