Changeset 17231 in josm for trunk

Timestamp:

2020-10-18T12:21:14+02:00 (4 years ago)

Author:

simon04

Message:

see #7548 - Re-organize the preference dialog (add various icons)

Source of the language icon: ​https://github.com/FortAwesome/Font-Awesome/blob/5.15.1/svgs/solid/language.svg (CC BY 4.0)

Location:

trunk

Files:

• CONTRIBUTION (modified) (1 diff)
• resources/images/preferences/language.svg (added)
• src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/display/GPXPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (modified) (1 diff)

trunk/CONTRIBUTION

@@ -127 +127 @@
 https://wiki.openstreetmap.org/wiki/File:Logo_simple.svg
 
-Social logos come from https://github.com/FortAwesome/Font-Awesome (CC BY 4.0)
+Social logos and the language icon come from https://github.com/FortAwesome/Font-Awesome (CC BY 4.0)
 
 See also the commit message of each icon for its source

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

@@ -28 +28 @@
     default ImageIcon getIcon(ImageProvider.ImageSizes size) {
         String iconName = getIconName();
-        return iconName == null || iconName.isEmpty() ? null : ImageProvider.get("preferences", iconName, size);
+        return iconName == null || iconName.isEmpty()
+                ? null
+                : iconName.contains("/")
+                ? ImageProvider.get(iconName, size)
+                : ImageProvider.get("preferences", iconName, size);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -81 +81 @@
 
     ColorPreference() {
-        super(null, tr("Colors"), tr("Change colors used in program dialogs and in map paint styles."));
+        super("/colorchooser", tr("Colors"), tr("Change colors used in program dialogs and in map paint styles."));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -69 +69 @@
 
     DrawingPreference() {
-        super(null, tr("OSM Data"), tr("Settings that control the drawing of OSM data."));
+        super(/* ICON(preferences/) */ "display", tr("OSM Data"), tr("Settings that control the drawing of OSM data."));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXPreference.java

@@ -25 +25 @@
 
     GPXPreference() {
-        super(null, tr("GPS Points"), tr("Settings that control the drawing of GPS tracks."));
+        super("layer/gpx_small.svg", tr("GPS Points"), tr("Settings that control the drawing of GPS tracks."));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -48 +48 @@
 
     LanguagePreference() {
-        super(null, tr("Language"), tr("Change the language of JOSM."));
+        super(/* ICON(preferences/) */ "language", tr("Language"), tr("Change the language of JOSM."));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -40 +40 @@
 
     MapPaintPreference() {
-        super(null, tr("Map Paint Styles"), tr("Map Paint Styles"));
+        super("dialogs/mapstyle", tr("Map Paint Styles"), tr("Map Paint Styles"));
     }