Changeset 17281 in josm for trunk

Timestamp:

2020-10-29T15:10:45+01:00 (4 years ago)

Author:

Klumbumbus

Message:

• see #7548 - Add icons to preferences tabs
  • preferences/backup, derived from clock and save (clock original from ​https://ftp.acc.umu.se/pub/gnome/sources/gnome-icon-theme/2.20/gnome-icon-theme-2.20.0.tar.bz2, from GNOME Project, save original from ​https://commons.wikimedia.org/wiki/File:Media-floppy.svg, from The Tango Desktop Project), GPL licensed
  • preferences/proxy, derived from preferences/connection (original from ​https://commons.wikimedia.org/wiki/File:Gnome-network-idle.svg, from GNOME Project), LGPL licensed
• Little icon fixes
• ignore landuse=highway (>20k but abandoned proposal)

Location:

trunk

Files:

• resources/data/validator/ignoretags.cfg (modified) (1 diff)
• resources/images/preferences/backup.svg (added)
• resources/images/preferences/language.svg (modified) (1 diff, 1 prop)
• resources/images/preferences/plugin.svg (modified) (1 diff)
• resources/images/preferences/proxy.svg (added)
• src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java (modified) (1 diff)

trunk/resources/data/validator/ignoretags.cfg

@@ -393 +393 @@
 K:sidewalk=none
 K:surface=hard
+K:landuse=highway
 ;
 ; Keys/tags which already have an own warning e.g. in deprecated.mapcss

trunk/resources/images/preferences/language.svg

@@ -1 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 640 512"><!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
-    <path d="M152.1 236.2c-3.5-12.1-7.8-33.2-7.8-33.2h-.5s-4.3 21.1-7.8 33.2l-11.1 37.5H163zM616 96H336v320h280c13.3 0 24-10.7 24-24V120c0-13.3-10.7-24-24-24zm-24 120c0 6.6-5.4 12-12 12h-11.4c-6.9 23.6-21.7 47.4-42.7 69.9 8.4 6.4 17.1 12.5 26.1 18 5.5 3.4 7.3 10.5 4.1 16.2l-7.9 13.9c-3.4 5.9-10.9 7.8-16.7 4.3-12.6-7.8-24.5-16.1-35.4-24.9-10.9 8.7-22.7 17.1-35.4 24.9-5.8 3.5-13.3 1.6-16.7-4.3l-7.9-13.9c-3.2-5.6-1.4-12.8 4.2-16.2 9.3-5.7 18-11.7 26.1-18-7.9-8.4-14.9-17-21-25.7-4-5.7-2.2-13.6 3.7-17.1l6.5-3.9 7.3-4.3c5.4-3.2 12.4-1.7 16 3.4 5 7 10.8 14 17.4 20.9 13.5-14.2 23.8-28.9 30-43.2H412c-6.6 0-12-5.4-12-12v-16c0-6.6 5.4-12 12-12h64v-16c0-6.6 5.4-12 12-12h16c6.6 0 12 5.4 12 12v16h64c6.6 0 12 5.4 12 12zM0 120v272c0 13.3 10.7 24 24 24h280V96H24c-13.3 0-24 10.7-24 24zm58.9 216.1L116.4 167c1.7-4.9 6.2-8.1 11.4-8.1h32.5c5.1 0 9.7 3.3 11.4 8.1l57.5 169.1c2.6 7.8-3.1 15.9-11.4 15.9h-22.9a12 12 0 0 1-11.5-8.6l-9.4-31.9h-60.2l-9.1 31.8c-1.5 5.1-6.2 8.7-11.5 8.7H70.3c-8.2 0-14-8.1-11.4-15.9z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   height="24"
+   width="24"
+   sodipodi:docname="language.svg"
+   id="svg4"
+   version="1.1"
+   viewBox="0 0 24 24">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg4"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="17.647815"
+     inkscape:cx="13.947583"
+     inkscape:zoom="25.044602"
+     showgrid="false"
+     id="namedview6"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff">
+    <inkscape:grid
+       id="grid835"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+  <path
+     style="stroke-width:0.0375"
+     id="path2"
+     d="m 5.70375,11.2575 c -0.13125,-0.45375 -0.2925,-1.245 -0.2925,-1.245 h -0.0188 c 0,0 -0.16125,0.79125 -0.2925,1.245 L 4.6837,12.66375 H 6.11245 Z M 23.1,6 H 12.6 V 18 H 23.1 C 23.59875,18 24,17.59875 24,17.1 V 6.9 C 24,6.40125 23.59875,6 23.1,6 Z m -0.9,4.5 c 0,0.2475 -0.2025,0.45 -0.45,0.45 h -0.4275 c -0.25875,0.885 -0.81375,1.7775 -1.60125,2.62125 0.315,0.24 0.64125,0.46875 0.97875,0.675 0.20625,0.1275 0.27375,0.39375 0.15375,0.6075 L 20.5575,15.375 c -0.1275,0.22125 -0.40875,0.2925 -0.62625,0.16125 -0.4725,-0.2925 -0.91875,-0.60375 -1.3275,-0.93375 -0.40875,0.32625 -0.85125,0.64125 -1.3275,0.93375 -0.2175,0.13125 -0.49875,0.06 -0.62625,-0.16125 l -0.29625,-0.52125 c -0.12,-0.21 -0.0525,-0.48 0.1575,-0.6075 0.34875,-0.21375 0.675,-0.43875 0.97875,-0.675 -0.29625,-0.315 -0.55875,-0.6375 -0.7875,-0.96375 -0.15,-0.21375 -0.0825,-0.51 0.13875,-0.64125 L 17.085,11.82 17.35875,11.65875 c 0.2025,-0.12 0.465,-0.0637 0.6,0.1275 0.1875,0.2625 0.405,0.525 0.6525,0.78375 0.50625,-0.5325 0.8925,-1.08375 1.125,-1.62 H 15.45 C 15.2025,10.95 15,10.7475 15,10.5 V 9.9 c 0,-0.2475 0.2025,-0.45 0.45,-0.45 h 2.4 v -0.6 c 0,-0.2475 0.2025,-0.45 0.45,-0.45 h 0.6 c 0.2475,0 0.45,0.2025 0.45,0.45 v 0.6 h 2.4 c 0.2475,0 0.45,0.2025 0.45,0.45 z M 0,6.9 V 17.1 C 0,17.59875 0.40125,18 0.9,18 H 11.4 V 6 H 0.9 C 0.40125,6 0,6.40125 0,6.9 Z M 2.20875,15.00375 4.365,8.6625 C 4.4287,8.47875 4.5975,8.35875 4.7925,8.35875 h 1.21875 c 0.19125,0 0.36375,0.12375 0.4275,0.30375 L 8.595,15.00375 C 8.6925,15.29625 8.47875,15.6 8.1675,15.6 H 7.30875 A 0.45,0.45 0 0 1 6.8775,15.2775 L 6.525,14.08125 H 4.2675 l -0.34125,1.1925 C 3.87,15.465 3.69375,15.6 3.495,15.6 H 2.63625 c -0.3075,0 -0.525,-0.30375 -0.4275,-0.59625 z" />
 </svg>

trunk/resources/images/preferences/plugin.svg

@@ -72 +72 @@
       <stop
          id="M"
-         stop-color="#bed855"
          style="stop-color:#5589d8;stop-opacity:1" />
       <stop
          id="N"
          offset="1"
-         stop-color="#8bb300"
          style="stop-color:#0048b3;stop-opacity:1" />
     </linearGradient>

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

@@ -47 +47 @@
 
     BackupPreference() {
-        super(null, tr("File backup"), tr("Configure whether to create backup files"));
+        super(/* ICON(preferences/) */ "backup", tr("File backup"), tr("Configure whether to create backup files"));
     }
 

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

@@ -146 +146 @@
 
     private TaggingPresetPreference() {
-        super(null, tr("Tagging Presets"), tr("Tagging Presets"));
+        super("dialogs/propertiesdialog", tr("Tagging Presets"), tr("Tagging Presets"));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java

@@ -36 +36 @@
 
     private ProxyPreference() {
-        super(null, tr("Proxy"), tr("Configure whether to use a proxy server"));
+        super(/* ICON(preferences/) */ "proxy", tr("Proxy"), tr("Configure whether to use a proxy server"));
     }