Changeset 15211 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2019-07-06T22:15:55+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #13458 - display external resources icons in the preferences

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -42 +44 @@
 import javax.swing.DefaultListModel;
 import javax.swing.DefaultListSelectionModel;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -58 +59 @@
 import javax.swing.ListCellRenderer;
 import javax.swing.ListSelectionModel;
+import javax.swing.UIManager;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
@@ -74 +76 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
@@ -1353 +1356 @@
     static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer<ExtendedSourceEntry> {
 
-        private final ImageIcon GREEN_CHECK = ImageProvider.getIfAvailable("misc", "green_check");
-        private final ImageIcon GRAY_CHECK = ImageProvider.getIfAvailable("misc", "gray_check");
+        private static final NamedColorProperty SOURCE_ENTRY_ACTIVE_BACKGROUND_COLOR = new NamedColorProperty(
+                marktr("External resource entry: Active"),
+                new Color(200, 255, 200));
+        private static final NamedColorProperty SOURCE_ENTRY_INACTIVE_BACKGROUND_COLOR = new NamedColorProperty(
+                marktr("External resource entry: Inactive"),
+                new Color(200, 200, 200));
+
         private final Map<String, SourceEntry> entryByUrl = new HashMap<>();
 
@@ -1374 +1382 @@
             setOpaque(true);
             setToolTipText(value.getTooltip());
-            final SourceEntry sourceEntry = entryByUrl.get(value.url);
-            setIcon(sourceEntry == null ? null : sourceEntry.active ? GREEN_CHECK : GRAY_CHECK);
+            if (!isSelected) {
+                final SourceEntry sourceEntry = entryByUrl.get(value.url);
+                GuiHelper.setBackgroundReadable(this, sourceEntry == null ? UIManager.getColor("Table.background") :
+                    sourceEntry.active ? SOURCE_ENTRY_ACTIVE_BACKGROUND_COLOR.get() : SOURCE_ENTRY_INACTIVE_BACKGROUND_COLOR.get());
+            }
+            final ImageSizes size = ImageSizes.TABLE;
+            setIcon(value.icon == null ? ImageProvider.getEmpty(size) : value.icon.getImageIcon(size.getImageDimension()));
             return this;
         }
@@ -1475 +1488 @@
                             } else if ("version".equals(key)) {
                                 last.version = value;
+                            } else if ("icon".equals(key) && last.icon == null) {
+                                last.icon = new ImageProvider(value).setOptional(true).getResource();
                             } else if ("link".equals(key) && last.link == null) {
                                 last.link = value;