Changeset 6799 in josm

Timestamp:

2014-02-01T12:56:30+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9607 - defaultpreset: do not link image files, but include them in the *.jar file

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/power_source-biofuel.svg (added)
• images/presets/power_source-coal.svg (added)
• images/presets/power_source-gas.svg (added)
• images/presets/power_source-nuclear.svg (added)
• images/presets/power_source-oil.svg (added)
• images/presets/power_source-sun.svg (added)
• images/presets/power_source-waste.svg (added)
• images/presets/power_source-water.svg (added)
• images/presets/power_source-wind.svg (added)

trunk/data/defaultpresets.xml

@@ -5202 +5202 @@
             <text key="start_date" text="Start date" />
             <combo key="generator:source" text="Source" values_searchable="true">
-                <list_entry value="biofuel" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
-                <list_entry value="biogas" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
-                <list_entry value="biomass" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
-                <list_entry value="coal" icon="http://wiki.openstreetmap.org/w/images/4/4b/Bahnpirat-power_source-coal.svg" />
-                <list_entry value="diesel" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
-                <list_entry value="gas" icon="http://wiki.openstreetmap.org/w/images/e/e6/Bahnpirat-power_source-gas.svg" />
-                <list_entry value="gasoline" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
-                <list_entry value="geothermal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
-                <list_entry value="hydro" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
-                <list_entry value="nuclear" icon="http://wiki.openstreetmap.org/w/images/3/3e/2020_stBN_powergensource_nuclear.svg" />
-                <list_entry value="oil" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
-                <list_entry value="osmotic" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
-                <list_entry value="solar" icon="http://wiki.openstreetmap.org/w/images/2/22/2020_stBN_powergensource_sun.svg" />
-                <list_entry value="tidal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
-                <list_entry value="waste" icon="http://wiki.openstreetmap.org/w/images/2/2f/Bahnpirat-power_source-waste.svg" />
-                <list_entry value="wave" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
-                <list_entry value="wind" icon="http://wiki.openstreetmap.org/w/images/0/03/2020_stBN_powergensource_wind.svg" />
+                <list_entry value="biofuel"    icon="presets/power_source-biofuel.svg" />
+                <list_entry value="biogas"     icon="presets/power_source-biofuel.svg" />
+                <list_entry value="biomass"    icon="presets/power_source-biofuel.svg" />
+                <list_entry value="coal"       icon="presets/power_source-coal.svg" />
+                <list_entry value="diesel"     icon="presets/power_source-oil.svg" />
+                <list_entry value="gas"        icon="presets/power_source-gas.svg" />
+                <list_entry value="gasoline"   icon="presets/power_source-oil.svg" />
+                <list_entry value="geothermal" icon="presets/power_source-water.svg" />
+                <list_entry value="hydro"      icon="presets/power_source-water.svg" />
+                <list_entry value="nuclear"    icon="presets/power_source-nuclear.svg" />
+                <list_entry value="oil"        icon="presets/power_source-oil.svg" />
+                <list_entry value="osmotic"    icon="presets/power_source-water.svg" />
+                <list_entry value="solar"      icon="presets/power_source-sun.svg" />
+                <list_entry value="tidal"      icon="presets/power_source-water.svg" />
+                <list_entry value="waste"      icon="presets/power_source-waste.svg" />
+                <list_entry value="wave"       icon="presets/power_source-water.svg" />
+                <list_entry value="wind"       icon="presets/power_source-wind.svg" />
             </combo>
             <combo key="generator:method" text="Method" values_context="generator method" values_searchable="true">