Changeset 16871 in josm


Ignore:
Timestamp:
2020-08-11T22:26:29+02:00 (4 years ago)
Author:
Klumbumbus
Message:

see #15240 - Change some png icons to svg:

Location:
trunk
Files:
2 added
1 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/resources/images/lock.svg

    r15392 r16871  
    1 <svg height="812" viewBox="42 119 650 812" width="650" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    2     <!-- Adapted from https://commons.wikimedia.org/wiki/File:Lock.svg -->
    3     <linearGradient id="a">
    4         <stop offset="0" stop-color="#fff"/>
    5         <stop offset="1" stop-color="#fff" stop-opacity="0"/>
    6     </linearGradient>
    7     <linearGradient id="b" gradientTransform="matrix(31.442825 0 0 15.721413 163.64608 98.870782)" gradientUnits="userSpaceOnUse" x1="11.5" x2="11.779029" xlink:href="#a" y1="20.579729" y2="14.259961"/>
    8     <linearGradient id="c" gradientTransform="matrix(31.442825 0 0 14.809689 -182.22526 119.54828)" gradientUnits="userSpaceOnUse" x1="14.217941" x2="17.859085" xlink:href="#a" y1="6.879535" y2="3.95666"/>
    9     <linearGradient id="d" gradientTransform="matrix(14.541559 0 0 15.073297 19.247073 148.75198)" gradientUnits="userSpaceOnUse" x1="10.907269" x2="30.875446" y1="25.002281" y2="36.127281">
    10         <stop offset="0" stop-color="#fff"/>
    11         <stop offset="1" stop-color="#fff" stop-opacity=".494845"/>
    12     </linearGradient>
    13     <linearGradient id="e" gradientTransform="matrix(15.721413 0 0 17.134408 -9.289589 61.732234)" gradientUnits="userSpaceOnUse" x1="6.72682" x2="40.938126" y1="32.161697" y2="32.161697">
    14         <stop offset="0" stop-color="#fce94f"/>
    15         <stop offset=".20999999" stop-color="#ffec41"/>
    16         <stop offset=".83999997" stop-color="#edd400"/>
    17         <stop offset="1" stop-color="#c4a00f" stop-opacity=".941176"/>
    18     </linearGradient>
    19     <linearGradient id="f" gradientTransform="matrix(15.721413 0 0 17.134408 -9.289589 79.385615)" gradientUnits="userSpaceOnUse" x1="31.630468" x2="8.671364" y1="41.791817" y2="25.793524">
    20         <stop offset="0" stop-color="#8f5902"/>
    21         <stop offset="1" stop-color="#c17d11"/>
    22     </linearGradient>
    23     <linearGradient id="g" gradientTransform="matrix(15.401043 0 0 15.948654 -11.070064 104.56497)" gradientUnits="userSpaceOnUse" x1="12.88666" x2="20.087339" y1="4.360276" y2="18.414022">
    24         <stop offset="0" stop-color="#babdb6"/>
    25         <stop offset=".5" stop-color="#eeeeec"/>
    26         <stop offset="1" stop-color="#babdb6"/>
    27     </linearGradient>
    28     <linearGradient id="h" gradientTransform="matrix(15.401043 0 0 15.948654 -11.070064 104.56497)" gradientUnits="userSpaceOnUse" x1="19.250618" x2="16.198252" y1="9.663577" y2="6.039655">
    29         <stop offset="0" stop-color="#555753"/>
    30         <stop offset="1" stop-color="#888a85"/>
    31     </linearGradient>
    32     <path d="m-64.879845 115.85568h850v850h-850z" fill="none"/>
    33     <path d="m149.64097 462.77119v-122.55827c0-125.51812 84.12878-182.74178 209.22253-181.17424 125.77437 1.56753 208.8138 56.17792 208.8138 183.17269l-.20845 120.55982h-76.73795v-88.997c-2.06012-30.8929 8.56244-134.37251-130.98679-134.37251-140.51178 0-132.25265 103.8535-131.74913 134.98757v88.38194h-78.35452z" fill="url(#g)" fill-rule="evenodd" stroke="url(#h)" stroke-width="37.986671"/>
    34     <rect height="377.42322" rx="84.899323" ry="73.867165" style="fill-rule:evenodd;stroke-width:37.986675;stroke-linecap:round;stroke-linejoin:round;fill:url(#e);stroke:url(#f)" width="550.18536" x="92.865761" y="464.39069"/>
    35     <rect height="302.70956" rx="46.140316" ry="46.140354" style="fill:none;stroke-width:37.98671;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:.601093;stroke:url(#d)" width="480.31729" x="127.86926" y="501.4451"/>
    36     <g fill-rule="evenodd">
    37         <path d="m163.64595 347.00672c4.16875-92.93931 30.00738-162.92832 202.36234-168.86158-111.60142 15.72802-172.30435 48.31298-172.30435 145.47854 0 0-2.78392 120.42879-2.78392 120.42879h-27.27407z" fill="url(#c)"/>
    38         <path d="m509.51706 287.52774h31.442825v157.21413h-31.442825z" fill="url(#b)"/>
    39     </g>
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<svg
     3   xmlns:dc="http://purl.org/dc/elements/1.1/"
     4   xmlns:cc="http://creativecommons.org/ns#"
     5   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     6   xmlns:svg="http://www.w3.org/2000/svg"
     7   xmlns="http://www.w3.org/2000/svg"
     8   xmlns:xlink="http://www.w3.org/1999/xlink"
     9   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     10   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     11   height="16"
     12   viewBox="42 119 16 16"
     13   width="16"
     14   version="1.1"
     15   id="svg54"
     16   sodipodi:docname="lock8.svg"
     17   inkscape:version="0.92.3 (2405546, 2018-03-11)">
     18  <metadata
     19     id="metadata60">
     20    <rdf:RDF>
     21      <cc:Work
     22         rdf:about="">
     23        <dc:format>image/svg+xml</dc:format>
     24        <dc:type
     25           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     26        <dc:title></dc:title>
     27      </cc:Work>
     28    </rdf:RDF>
     29  </metadata>
     30  <defs
     31     id="defs58" />
     32  <sodipodi:namedview
     33     pagecolor="#ffffff"
     34     bordercolor="#666666"
     35     borderopacity="1"
     36     objecttolerance="10"
     37     gridtolerance="10"
     38     guidetolerance="10"
     39     inkscape:pageopacity="0"
     40     inkscape:pageshadow="2"
     41     inkscape:window-width="1680"
     42     inkscape:window-height="987"
     43     id="namedview56"
     44     showgrid="true"
     45     inkscape:zoom="53.112471"
     46     inkscape:cx="8.997351"
     47     inkscape:cy="4.0679039"
     48     inkscape:window-x="-8"
     49     inkscape:window-y="-8"
     50     inkscape:window-maximized="1"
     51     inkscape:current-layer="svg54">
     52    <inkscape:grid
     53       type="xygrid"
     54       id="grid867" />
     55  </sodipodi:namedview>
     56  <!-- Adapted from https://commons.wikimedia.org/wiki/File:Lock.svg -->
     57  <linearGradient
     58     id="a">
     59    <stop
     60       offset="0"
     61       stop-color="#fff"
     62       id="stop2" />
     63    <stop
     64       offset="1"
     65       stop-color="#fff"
     66       stop-opacity="0"
     67       id="stop4" />
     68  </linearGradient>
     69  <linearGradient
     70     id="b"
     71     gradientTransform="matrix(31.442825,0,0,15.721413,163.64608,98.870782)"
     72     gradientUnits="userSpaceOnUse"
     73     x1="11.5"
     74     x2="11.779029"
     75     xlink:href="#a"
     76     y1="20.579729"
     77     y2="14.259961" />
     78  <linearGradient
     79     id="c"
     80     gradientTransform="matrix(31.442825,0,0,14.809689,-182.22526,119.54828)"
     81     gradientUnits="userSpaceOnUse"
     82     x1="14.217941"
     83     x2="17.859085"
     84     xlink:href="#a"
     85     y1="6.8795352"
     86     y2="3.95666" />
     87  <linearGradient
     88     id="d"
     89     gradientTransform="matrix(0.27180498,0,0,0.28662498,43.482032,120.46309)"
     90     gradientUnits="userSpaceOnUse"
     91     x1="10.907269"
     92     x2="30.875446"
     93     y1="25.002281"
     94     y2="36.127281">
     95    <stop
     96       offset="0"
     97       stop-color="#fff"
     98       id="stop9" />
     99    <stop
     100       offset="1"
     101       stop-color="#fff"
     102       stop-opacity=".494845"
     103       id="stop11" />
     104  </linearGradient>
     105  <linearGradient
     106     id="e"
     107     gradientTransform="matrix(0.29385832,0,0,0.32581782,42.948635,118.80836)"
     108     gradientUnits="userSpaceOnUse"
     109     x1="6.72682"
     110     x2="40.938126"
     111     y1="32.161697"
     112     y2="32.161697">
     113    <stop
     114       offset="0"
     115       stop-color="#fce94f"
     116       id="stop14" />
     117    <stop
     118       offset=".20999999"
     119       stop-color="#ffec41"
     120       id="stop16" />
     121    <stop
     122       offset=".83999997"
     123       stop-color="#edd400"
     124       id="stop18" />
     125    <stop
     126       offset="1"
     127       stop-color="#c4a00f"
     128       stop-opacity=".941176"
     129       id="stop20" />
     130  </linearGradient>
     131  <linearGradient
     132     id="f"
     133     gradientTransform="matrix(0.29385832,0,0,0.32581782,42.948635,119.14403)"
     134     gradientUnits="userSpaceOnUse"
     135     x1="31.630468"
     136     x2="8.6713638"
     137     y1="41.791817"
     138     y2="25.793524">
     139    <stop
     140       offset="0"
     141       stop-color="#8f5902"
     142       id="stop23" />
     143    <stop
     144       offset="1"
     145       stop-color="#c17d11"
     146       id="stop25" />
     147  </linearGradient>
     148  <linearGradient
     149     id="g"
     150     gradientTransform="matrix(0.28787009,0,0,0.30327025,42.91536,119.62284)"
     151     gradientUnits="userSpaceOnUse"
     152     x1="12.88666"
     153     x2="20.087339"
     154     y1="4.3602762"
     155     y2="18.414022">
     156    <stop
     157       offset="0"
     158       stop-color="#babdb6"
     159       id="stop28" />
     160    <stop
     161       offset=".5"
     162       stop-color="#eeeeec"
     163       id="stop30" />
     164    <stop
     165       offset="1"
     166       stop-color="#babdb6"
     167       id="stop32" />
     168  </linearGradient>
     169  <linearGradient
     170     id="h"
     171     gradientTransform="matrix(0.28787009,0,0,0.30327025,42.91536,119.62284)"
     172     gradientUnits="userSpaceOnUse"
     173     x1="19.250618"
     174     x2="16.198252"
     175     y1="9.6635771"
     176     y2="6.0396552">
     177    <stop
     178       offset="0"
     179       stop-color="#555753"
     180       id="stop35" />
     181    <stop
     182       offset="1"
     183       stop-color="#888a85"
     184       id="stop37" />
     185  </linearGradient>
     186  <path
     187     d="m 45.919302,126.43429 v -2.33052 c 0,-2.38677 1.572501,-3.47492 3.910701,-3.44509 2.350931,0.0299 3.903067,1.06823 3.903067,3.48308 l -0.0039,2.29253 h -1.434357 v -1.69234 c -0.03853,-0.58744 0.160047,-2.55515 -2.448353,-2.55515 -2.626395,0 -2.472019,1.97482 -2.46261,2.56685 v 1.68064 h -1.464535 z"
     188     id="path42"
     189     style="fill:url(#g);fill-rule:evenodd;stroke:url(#h);stroke-width:0.71615541"
     190     inkscape:connector-curvature="0" />
     191  <rect
     192     height="7.1768584"
     193     rx="1.5869043"
     194     ry="1.7435207"
     195     style="fill:url(#e);fill-rule:evenodd;stroke:url(#f);stroke-width:0.71615547;stroke-linecap:round;stroke-linejoin:round"
     196     width="10.283845"
     197     x="44.858078"
     198     y="126.46507"
     199     id="rect44" />
     200  <rect
     201     height="5.7561474"
     202     rx="0.99423397"
     203     ry="1.1974483"
     204     style="fill:none;stroke:url(#d);stroke-width:0.71615613;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.60109301"
     205     width="8.9778986"
     206     x="45.512348"
     207     y="127.1697"
     208     id="rect46" />
     209  <g
     210     id="g52"
     211     transform="matrix(0.01869159,0,0,0.01901541,43.122272,117.63448)"
     212     style="fill-rule:evenodd">
     213    <path
     214       d="m 163.64595,347.00672 c 4.16875,-92.93931 30.00738,-162.92832 202.36234,-168.86158 -111.60142,15.72802 -172.30435,48.31298 -172.30435,145.47854 0,0 -2.78392,120.42879 -2.78392,120.42879 h -27.27407 z"
     215       id="path48"
     216       style="fill:url(#c)"
     217       inkscape:connector-curvature="0" />
     218    <path
     219       d="m 509.51706,287.52774 h 31.44282 v 157.21413 h -31.44282 z"
     220       id="path50"
     221       style="fill:url(#b)"
     222       inkscape:connector-curvature="0" />
     223  </g>
    40224</svg>

  • trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

    r16502 r16871  
    199199
    200200    static String fixImageLinks(String s) {
    201         Matcher m = Pattern.compile("src=\"/browser/trunk/resources(/images/.*?\\.png)\\?format=raw\"").matcher(s);
     201        Matcher m = Pattern.compile("src=\"/browser/trunk/resources(/images/.*?\\.svg)\\?format=raw\"").matcher(s);
    202202        StringBuffer sb = new StringBuffer();
    203203        while (m.find()) {

  • trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java

    r16006 r16871  
    4040    @Test
    4141    public void testImageReplacementStatic() {
    42         final String html = "the download button <img src=\"/browser/trunk/resources/images/download.png?format=raw\" " +
    43                 "alt=\"source:trunk/resources/images/download.png\" title=\"source:trunk/resources/images/download.png\" />.";
     42        final String html = "the download button <img src=\"/browser/trunk/resources/images/download.svg?format=raw\" " +
     43                "alt=\"source:trunk/resources/images/download.svg\" title=\"source:trunk/resources/images/download.svg\" />.";
    4444        assertFalse(GettingStarted.fixImageLinks(html).equals(html));
    4545
Note: See TracChangeset for help on using the changeset viewer.