Changeset 18743 in josm for trunk

Timestamp:

2023-05-30T22:40:29+02:00 (15 months ago)

Author:

stoecker

Message:

fix icon script and warning in SVG image

Location:

trunk

Files:

• nodist/images/misc/rectangle.svg (moved) (moved from trunk/resources/images/misc/rectangle.svg )
• resources/images/presets/misc/avalanche_protection.svg (modified) (1 diff)
• scripts/geticons.pl (modified) (2 diffs)

trunk/resources/images/presets/misc/avalanche_protection.svg

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="16"
-   height="16"
-   viewBox="0 0 4.2333333 4.2333333"
-   version="1.1"
-   id="svg36055"
-   inkscape:version="1.2.2 (b0a8486, 2022-12-01)"
-   sodipodi:docname="avalanche_protection.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview36057"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="true"
-     inkscape:zoom="38.057741"
-     inkscape:cx="10.497207"
-     inkscape:cy="9.5775522"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg36055">
-    <inkscape:grid
-       type="xygrid"
-       id="grid36059" />
-  </sodipodi:namedview>
-  <defs
-     id="defs36052">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient36615">
-      <stop
-         style="stop-color:#646464;stop-opacity:1;"
-         offset="0"
-         id="stop36611" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop36613" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient36615"
-       id="linearGradient36617"
-       x1="2.1166666"
-       y1="4.2333331"
-       x2="3.7041667"
-       y2="0"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="g37471"
-     inkscape:label="g37471">
-    <g
-       id="g37466">
-      <rect
-         style="fill:#784421;stroke:none;stroke-width:0.237;stroke-dasharray:none"
-         id="rect37440"
-         width="0.52916664"
-         height="2.3812499"
-         x="0.81319994"
-         y="0.1324237"
-         transform="rotate(6.3019573)" />
-      <rect
-         style="fill:#784421;stroke:none;stroke-width:0.237;stroke-dasharray:none"
-         id="rect37440-0"
-         width="0.52916664"
-         height="2.3812499"
-         x="2.9461188"
-         y="0.16306539"
-         transform="rotate(6.3019573)" />
-    </g>
-    <rect
-       style="stroke:none;stroke-width:0.236087;stroke-dasharray:none"
-       id="rect36682"
-       width="4.201272"
-       height="0.52910423"
-       x="0.097832456"
-       y="0.26046646"
-       transform="matrix(0.9921591,0.12498128,-0.12309514,0.99239487,0,0)" />
-    <rect
-       style="stroke:none;stroke-width:0.236087;stroke-dasharray:none"
-       id="rect36682-0"
-       width="4.201272"
-       height="0.52910423"
-       x="0.19541389"
-       y="1.0459511"
-       transform="matrix(0.9921591,0.12498128,-0.12309514,0.99239487,0,0)" />
-    <rect
-       style="stroke:none;stroke-width:0.236087;stroke-dasharray:none"
-       id="rect36682-6"
-       width="4.201272"
-       height="0.52910423"
-       x="0.29312083"
-       y="1.833479"
-       transform="matrix(0.9921591,0.12498128,-0.12309514,0.99239487,0,0)" />
-  </g>
-  <rect
-     style="stroke-width:0.237;stroke-dasharray:none;stroke:none;fill-opacity:1;fill:url(#linearGradient36617)"
-     id="rect36061"
-     width="4.2333331"
-     height="4.2333331"
-     x="0"
-     y="0" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1" />
-</svg>
+<svg height="16" viewBox="0 0 4 4" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.94482519 0 0 .94488194 -.000007 0)" gradientUnits="userSpaceOnUse" x1="2.116667" x2="3.704167" y1="4.233333" y2="0"><stop offset="0" stop-color="#646464"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><path d="m.8132.132424h.529167v2.38125h-.529167z" fill="#784421" transform="matrix(.93911580979 .10371805591 -.10371182656 .93917221686 -.000007 0)"/><path d="m2.946119.163065h.529167v2.38125h-.529167z" fill="#784421" transform="matrix(.93911580979 .10371805591 -.10371182656 .93917221686 -.000007 0)"/><g transform="matrix(.93741691017 .11809255431 -.11630338904 .93769599001 -.000007 0)"><path d="m.097832.260466h4.201272v.529104h-4.201272z"/><path d="m.195414 1.045951h4.201272v.529104h-4.201272z"/><path d="m.293121 1.833479h4.201272v.529104h-4.201272z"/></g><path d="m-.000007 0h3.99976v4h-3.99976z" fill="url(#a)"/></svg>

trunk/scripts/geticons.pl

@@ -31 +31 @@
     while(my $l = <FILE>)
     {
+      if($l =~ /extends MapMode/)
+      {
+        $extends = "mapmode/";
+      }
+      elsif($l =~ /extends ToggleDialog/)
+      {
+        $extends = "dialogs/";
+      }
+      elsif($l =~ /extends JosmAction/)
+      {
+        $extends = "";
+      }
       if($l =~ /private static final String ([A-Z_]+) = ("[^"]+")/)
       {
@@ -116 +128 @@
           ++$icons{$i};
         }
-      }
-      if($l =~ /extends MapMode/)
-      {
-        $extends = "mapmode/";
-      }
-      elsif($l =~ /extends ToggleDialog/)
-      {
-        $extends = "dialogs/";
-      }
-      elsif($l =~ /extends JosmAction/)
-      {
-        $extends = "";
       }
     }