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

Timestamp:

2020-03-16T22:53:21+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18943 - add data types caption in Download along dialogues

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• download/OSMDownloadSource.java (modified) (3 diffs)
• layer/gpx/DownloadAlongPanel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.download;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -145 +146 @@
 
         /**
+         * Label used in front of data types available for download. Made public for reuse in other download dialogs.
+         * @since 16155
+         */
+        public static final String DATA_SOURCES_AND_TYPES = marktr("Data Sources and Types:");
+
+        /**
          * Creates a new {@link OSMDownloadSourcePanel}.
          * @param dialog the parent download dialog, as {@code DownloadDialog.getInstance()} might not be initialized yet
@@ -159 +166 @@
 
             // adding the download tasks
-            add(new JLabel(tr("Data Sources and Types:")), GBC.std().insets(5, 5, 1, 5).anchor(GBC.CENTER));
+            add(new JLabel(tr(DATA_SOURCES_AND_TYPES)), GBC.std().insets(5, 5, 1, 5).anchor(GBC.CENTER));
             cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), true);
             cbDownloadOsmData.setToolTipText(tr("Select to download OSM data in the selected download area."));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.download.OSMDownloadSource.OSMDownloadSourcePanel;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -61 +62 @@
         this.prefNear = prefNear;
 
+        add(new JLabel(tr(OSMDownloadSourcePanel.DATA_SOURCES_AND_TYPES)), GBC.std().insets(5, 5, 1, 5).anchor(GBC.CENTER));
         cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), Config.getPref().getBoolean(prefOsm, true));
         cbDownloadOsmData.setToolTipText(tr("Select to download OSM data."));
@@ -69 +71 @@
 
         add(new JLabel(tr("Download everything within:")), GBC.std());
+        JPanel panel1 = new JPanel(new GridBagLayout());
         buffer = new JSpinner(new SpinnerNumberModel(Config.getPref().getDouble(prefDist, 50.0), 1.0, 5000.0, 1.0));
-        add(buffer, GBC.std().insets(5, 5, 5, 5));
-        add(new JLabel(tr("meters")), GBC.eol());
+        panel1.add(buffer, GBC.std().insets(5, 5, 5, 5));
+        panel1.add(new JLabel(tr("meters")), GBC.eol());
+        add(panel1, GBC.eol());
 
         add(new JLabel(tr("Maximum area per request:")), GBC.std());
+        JPanel panel2 = new JPanel(new GridBagLayout());
         maxRect = new JSpinner(new SpinnerNumberModel(Config.getPref().getDouble(prefArea, 20.0), 0.01, 25.0, 0.01)) {
             @Override
@@ -80 +85 @@
             }
         };
-        add(maxRect, GBC.std().insets(5, 5, 5, 5));
-        add(new JLabel("km\u00b2"), GBC.eol());
+        panel2.add(maxRect, GBC.std().insets(5, 5, 5, 5));
+        panel2.add(new JLabel("km\u00b2"), GBC.eol());
+        add(panel2, GBC.eol());
 
         if (prefNear != null) {