Changeset 16915 in josm

Timestamp:

2020-08-23T17:23:28+02:00 (4 years ago)

Author:

simon04

Message:

fix #19699 - Download dialog: add icons to source checkboxes

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• IDownloadSourceType.java (modified) (2 diffs)
• OSMDownloadSource.java (modified) (5 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.download;
 
+import javax.swing.Icon;
 import javax.swing.JCheckBox;
 import javax.swing.event.ChangeListener;
@@ -34 +35 @@
 
     /**
+     * Returns the icon to be added to the UI.
+     * @return The icon to be added to the UI
+     */
+    default Icon getIcon() {
+        return null;
+    }
+
+    /**
      * Returns the download task class which will be getting the data.
      * @return The {@link DownloadTask} class which will be getting the data

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

@@ -18 +18 @@
 import java.util.concurrent.Future;
 
+import javax.swing.Box;
 import javax.swing.Icon;
 import javax.swing.JCheckBox;
@@ -232 +233 @@
             downloadSourcesPanel.removeAll();
             downloadSourcesPanel.add(new JLabel(tr(DATA_SOURCES_AND_TYPES)));
-            DOWNLOAD_SOURCES
-                .forEach(obj -> downloadSourcesPanel.add(obj.getCheckBox(checkboxChangeListener)));
+            DOWNLOAD_SOURCES.forEach(obj -> {
+                final Icon icon = obj.getIcon();
+                if (icon != null) {
+                    downloadSourcesPanel.add(Box.createHorizontalStrut(6));
+                    downloadSourcesPanel.add(new JLabel(icon));
+                }
+                downloadSourcesPanel.add(obj.getCheckBox(checkboxChangeListener));
+            });
         }
 
@@ -424 +431 @@
 
         @Override
+        public Icon getIcon() {
+            return ImageProvider.get("layer/osmdata_small", ImageProvider.ImageSizes.SMALLICON);
+        }
+
+        @Override
         public Class<? extends AbstractDownloadTask<DataSet>> getDownloadClass() {
             return DownloadOsmTask.class;
@@ -459 +471 @@
 
         @Override
+        public Icon getIcon() {
+            return ImageProvider.get("layer/gpx_small", ImageProvider.ImageSizes.SMALLICON);
+        }
+
+        @Override
         public Class<? extends AbstractDownloadTask<GpxData>> getDownloadClass() {
             return DownloadGpsTask.class;
@@ -492 +509 @@
 
         @Override
+        public Icon getIcon() {
+            return ImageProvider.get("layer/marker_small", ImageProvider.ImageSizes.SMALLICON);
+        }
+
+        @Override
         public Class<? extends AbstractDownloadTask<NoteData>> getDownloadClass() {
             return DownloadNotesTask.class;