Changeset 16800 in josm for trunk

Timestamp:

2020-07-21T19:07:12+02:00 (4 years ago)

Author:

Klumbumbus

Message:

see #15240 - Change some png icons to svg:

• dialogs/duplicatelayer, dialogs/layerlist, dialogs/layerlist/active, dialogs/layerlist/active-pressed, dialogs/mergedown, dialogs/reorderlayers, all derived from internal dialogs/activate icon, PD and CC0 licensed
• help/internet ​https://commons.wikimedia.org/wiki/File:Gnome-emblem-web.svg, modified, from GNOME Project, LGPL licensed
• purge ​https://commons.wikimedia.org/wiki/File:Edit-clear.svg, resized, from The Tango Desktop Project, PD and CC0 licensed
• dialogs/geoimage/deletefromdisk, derived from internal dialogs/delete icon, PD and CC0 licensed
• remove data/key, use dialogs/propertiesdialog instead (fits better, used in command stack panel only)
• small changes/fixes to existing icons

Location:

trunk

Files:

• nodist/images/data/key.png (moved) (moved from trunk/resources/images/data/key.png )
• nodist/images/data/purge.png (moved) (moved from trunk/resources/images/data/purge.png )
• nodist/images/dialogs/duplicatelayer.png (moved) (moved from trunk/resources/images/dialogs/duplicatelayer.png )
• nodist/images/dialogs/geoimage (added)
• nodist/images/dialogs/geoimage/deletefromdisk.png (moved) (moved from trunk/resources/images/dialogs/geoimage/deletefromdisk.png )
• nodist/images/dialogs/mergedown.png (moved) (moved from trunk/resources/images/dialogs/mergedown.png )
• nodist/images/dialogs/reorderlayers.png (moved) (moved from trunk/resources/images/dialogs/reorderlayers.png )
• nodist/images/purge.png (moved) (moved from trunk/resources/images/purge.png )
• resources/images/data/relation.svg (modified) (5 diffs)
• resources/images/dialogs/activate.svg (modified) (3 diffs)
• resources/images/dialogs/duplicatelayer.svg (added)
• resources/images/dialogs/geoimage/deletefromdisk.svg (added)
• resources/images/dialogs/layerlist.png (deleted)
• resources/images/dialogs/layerlist.svg (added)
• resources/images/dialogs/layerlist/active-pressed.png (deleted)
• resources/images/dialogs/layerlist/active-pressed.svg (added)
• resources/images/dialogs/layerlist/active.png (deleted)
• resources/images/dialogs/layerlist/active.svg (added)
• resources/images/dialogs/mergedown.svg (added)
• resources/images/dialogs/reorderlayers.svg (added)
• resources/images/help/internet.png (deleted)
• resources/images/help/internet.svg (added)
• resources/images/java.svg (modified) (3 diffs)
• resources/images/purge.svg (added)
• src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/PurgeCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (1 diff)

trunk/resources/images/data/relation.svg

@@ -14 +14 @@
    inkscape:export-xdpi="90.000000"
    inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
+   width="16"
+   height="16"
    id="svg11300"
    sodipodi:version="0.32"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="emblem-system3.svg"
+   sodipodi:docname="relation2.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -75 +75 @@
        fy="39.161163"
        r="19.622213"
-       gradientTransform="matrix(1.0043673,0,0,0.31729672,-1.1562752,29.543117)"
+       gradientTransform="matrix(0.33478575,0,0,0.10576452,-0.39572478,41.882807)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -86 +86 @@
        x2="34.534348"
        y2="39.684914"
-       gradientTransform="matrix(1.2364351,0,0,1.2386922,-5.260006,-6.7154919)" />
+       gradientTransform="matrix(0.41214091,0,0,0.41289327,-1.7636218,29.796725)" />
   </defs>
   <sodipodi:namedview
@@ -97 +97 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10.762051"
-     inkscape:cx="19.628633"
-     inkscape:cy="23.853753"
-     inkscape:current-layer="svg11300"
-     showgrid="false"
+     inkscape:zoom="24.583606"
+     inkscape:cx="8.0524535"
+     inkscape:cy="5.9941892"
+     inkscape:current-layer="layer1"
+     showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
@@ -155 +155 @@
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     transform="translate(0,-32)">
     <ellipse
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909089;fill:url(#radialGradient3262);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00532568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909089;fill:url(#radialGradient3262);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33510521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
        id="path3254"
-       cx="24.410738"
-       cy="41.968815"
-       rx="19.707909"
-       ry="6.226069" />
+       cx="8.1265268"
+       cy="46.024666"
+       rx="6.5692372"
+       ry="2.0753355" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3281);fill-opacity:1;fill-rule:nonzero;stroke:#606060;stroke-width:1.69540226;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       d="M 22.892274,0.94219957 C 22.428893,0.9739632 21.978502,1.0458629 21.523359,1.0980415 h -0.03112 L 20.403343,7.0512073 C 18.628514,7.4561374 16.958754,8.14334 15.456596,9.0771538 l -4.88452,-3.52203 C 9.251662,6.582126 8.0500964,7.7798952 6.9942418,9.0771538 l 3.3911642,4.9557822 c -1.0296519,1.576386 -1.8039429,3.376384 -2.2400347,5.267461 -7.48e-5,0.0089 -6.08e-5,0.02962 0,0.03117 l -5.9112055,0.935056 c -0.1080725,0.884318 -0.155558,1.798231 -0.155558,2.711652 1e-7,0.747343 0.020597,1.484703 0.093334,2.212957 l 5.9112053,1.059726 c 0.4204089,2.056507 1.2190363,3.977101 2.3333709,5.672651 l -3.5156116,4.831099 c 1.0068471,1.252239 2.1692423,2.392351 3.4222776,3.397356 l 4.977857,-3.42852 c 1.739694,1.111804 3.681705,1.891423 5.786759,2.275292 l 0.933347,5.890832 c 0.66323,0.06049 1.343373,0.06235 2.022253,0.06235 0.958423,-1e-6 1.873902,-0.0364 2.800046,-0.155843 l 1.120016,-6.015503 c 1.998673,-0.498299 3.876229,-1.362724 5.506757,-2.524642 l 4.791188,3.49086 c 1.242499,-1.059025 2.378693,-2.2763 3.360052,-3.584369 L 38.136958,31.11324 c 0.943658,-1.632715 1.597524,-3.434153 1.928921,-5.360967 l 5.880096,-0.935053 c 0.05159,-0.614736 0.06224,-1.210916 0.06224,-1.838934 0,-1.091358 -0.12662,-2.161425 -0.280005,-3.210346 l -5.973442,-1.09091 c -0.468116,-1.731688 -1.23618,-3.347337 -2.208927,-4.799932 L 41.061452,9.0459845 C 39.971724,7.7108734 38.728652,6.4775279 37.359169,5.4304502 L 32.287977,8.9213119 C 30.830463,8.0577352 29.261976,7.395125 27.559014,7.020039 L 26.625664,1.0980415 C 25.776143,0.99792847 24.919632,0.94219957 24.043401,0.94219957 c -0.23682,0 -0.480546,-0.007486 -0.715567,0 -0.114572,0.003648 -0.22795,-0.006664 -0.342227,0 -0.03096,0.001794 -0.06245,-0.002104 -0.09336,0 z M 23.701173,16.090049 c 0.113661,-0.0057 0.227143,0 0.342228,0 3.682744,0 6.688996,3.01174 6.688996,6.701207 1e-6,3.689467 -3.006253,6.670042 -6.688996,6.670042 -3.682742,1e-6 -6.657884,-2.980575 -6.657884,-6.670042 1e-6,-3.574169 2.79218,-6.522086 6.315656,-6.701207 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3281);fill-opacity:1;fill-rule:nonzero;stroke:#606060;stroke-width:0.56512845;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="m 7.6203782,32.349264 c -0.154459,0.01059 -0.304588,0.03455 -0.456301,0.05195 h -0.01037 l -0.362962,1.984369 c -0.591603,0.134975 -1.148184,0.364041 -1.648899,0.675309 l -1.628157,-1.173998 c -0.440133,0.34233 -0.840651,0.741583 -1.192599,1.173998 l 1.130376,1.651911 c -0.343213,0.525456 -0.601308,1.12545 -0.74667,1.755803 -2.5e-5,0.003 -2.1e-5,0.0099 0,0.01039 l -1.97038198,0.311683 c -0.03602,0.294769 -0.05185,0.599404 -0.05185,0.903875 0,0.249111 0.0069,0.494896 0.03111,0.737645 l 1.97038298,0.353238 c 0.140134,0.685495 0.406341,1.325687 0.777782,1.890865 l -1.171859,1.61035 c 0.335613,0.417409 0.723074,0.797442 1.140748,1.132441 l 1.659269,-1.142829 c 0.579892,0.370598 1.227223,0.630468 1.9289,0.758423 l 0.311113,1.963591 c 0.221074,0.02016 0.447787,0.02078 0.674078,0.02078 0.319471,0 0.624627,-0.01213 0.933339,-0.05195 l 0.373335,-2.005147 C 9.97698,44.795863 10.602825,44.507724 11.146329,44.120422 l 1.597047,1.163608 c 0.414162,-0.353005 0.79289,-0.758759 1.120006,-1.194778 l -1.161489,-1.683077 c 0.31455,-0.544232 0.532503,-1.144706 0.642968,-1.786971 l 1.960012,-0.311681 c 0.0172,-0.20491 0.02075,-0.403635 0.02075,-0.612972 0,-0.363782 -0.04221,-0.720468 -0.09333,-1.070104 l -1.99114,-0.363632 c -0.156037,-0.577224 -0.412056,-1.115768 -0.736302,-1.599962 l 1.171859,-1.610355 c -0.363239,-0.445032 -0.777592,-0.856143 -1.234082,-1.205166 l -1.690381,1.163609 C 10.266414,34.721085 9.7435912,34.500217 9.1759422,34.37519 l -0.311113,-1.97398 c -0.283171,-0.03337 -0.568672,-0.05195 -0.860746,-0.05195 -0.07894,0 -0.16018,-0.0025 -0.23852,0 -0.03819,0.0012 -0.07598,-0.0022 -0.114075,0 -0.01032,5.98e-4 -0.02082,-7.02e-4 -0.03112,0 z m 0.26963,5.049232 c 0.03789,-0.0019 0.07571,0 0.114075,0 1.227569,0 2.2296428,1.003903 2.2296428,2.233714 0,1.22981 -1.0020738,2.223325 -2.2296428,2.223325 -1.227568,0 -2.219273,-0.993515 -2.219273,-2.223325 1e-6,-1.191378 0.930718,-2.174007 2.105198,-2.233714 z"
        id="path3243"
        inkscape:connector-curvature="0" />
     <ellipse
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.64772728;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.03578794;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.64772728;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.34525919;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
        id="path3283"
-       cx="24.116323"
-       cy="22.770802"
-       rx="7.9883637"
-       ry="8.0036144" />
+       cx="8.0283899"
+       cy="39.625393"
+       rx="2.6627612"
+       ry="2.6678448" />
   </g>
 </svg>

trunk/resources/images/dialogs/activate.svg

@@ -14 +14 @@
    id="svg2"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    inkscape:export-filename="C:\data\eclipse-ws\eclipse-3.5\JOSM\images\dialogs\activate.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docname="Neues Dokument 1">
+   sodipodi:docname="activate2.svg">
   <defs
      id="defs4">
@@ -71 +71 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="9.1091631"
-     inkscape:cy="9.0998065"
+     inkscape:zoom="22.456572"
+     inkscape:cx="13.959684"
+     inkscape:cy="14.050933"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1094"
-     inkscape:window-height="741"
-     inkscape:window-x="165"
-     inkscape:window-y="163"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -114 +114 @@
        id="path2816"
        sodipodi:nodetypes="ccccc" />
+    <circle
+       style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.06563012"
+       id="path3761-4"
+       cx="18.063999"
+       cy="1034.1927"
+       r="5" />
     <path
-       sodipodi:type="arc"
-       style="fill:#189f5c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3761"
-       sodipodi:cx="310.11682"
-       sodipodi:cy="757.39764"
-       sodipodi:rx="79.802048"
-       sodipodi:ry="72.73098"
-       d="m 389.91887,757.39764 a 79.802048,72.73098 0 1 1 -159.6041,0 79.802048,72.73098 0 1 1 159.6041,0 z"
-       transform="matrix(0.05915865,0,0,0.07067087,-0.08694729,980.72553)" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 15.963287,1035.182 2.183922,1.5692 2.582129,-4.934"
-       id="path3771"
-       sodipodi:nodetypes="ccc" />
+       style="fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 15.56266,1035.0485 2.183922,1.5692 2.58213,-4.934"
+       id="path3771-9"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>

trunk/resources/images/java.svg

@@ -16 +16 @@
    width="24"
    height="24"
-   viewBox="0 0 30.828558 30.828559"
+   viewBox="0 0 24 24"
    xml:space="preserve"
-   sodipodi:docname="java.svg"
+   sodipodi:docname="java4.svg"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
    id="metadata33"><rdf:RDF><cc:Work
@@ -36 +36 @@
    id="namedview29"
    showgrid="true"
-   inkscape:zoom="28.760232"
-   inkscape:cx="11.436132"
-   inkscape:cy="10.524933"
+   inkscape:zoom="23.227258"
+   inkscape:cx="11.29146"
+   inkscape:cy="8.4268123"
    inkscape:window-x="-8"
    inkscape:window-y="-8"
@@ -49 +49 @@
 
 <path
-   style="fill:#1f6ca1;stroke-width:0.07999869;fill-opacity:1"
-   d="m 12.067915,23.493646 c 0,0 -1.13422,0.65959 0.80719,0.88279 2.351959,0.26831 3.554019,0.22983 6.145889,-0.26072 0,0 0.68143,0.42727 1.6331,0.79735 -5.810309,2.4902 -13.1498693,-0.14424 -8.586179,-1.41942"
+   style="fill:#1f6ca1;fill-opacity:1;stroke-width:0.06227889"
+   d="m 9.3581276,18.254031 c 0,0 -0.882989,0.51349 0.628397,0.687251 1.8309974,0.208879 2.7668004,0.178923 4.7845684,-0.20297 0,0 0.530492,0.332629 1.271366,0.620736 C 11.51914,21.297666 5.8052997,19.246757 9.3581276,18.254031"
    id="path4"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#1f6ca1;stroke-width:0.07999869;fill-opacity:1"
-   d="m 11.357925,20.244096 c 0,0 -1.27214,0.94167 0.67071,1.14263 2.51244,0.25919 4.496569,0.28039 7.929869,-0.38072 0,0 0.47487,0.48143 1.22158,0.74471 -7.025009,2.05421 -14.8495993,0.162 -9.822159,-1.50662"
+   style="fill:#1f6ca1;fill-opacity:1;stroke-width:0.06227889"
+   d="m 8.8054016,15.72426 c 0,0 -0.99036,0.733089 0.522147,0.889536 1.9559324,0.201779 3.5005744,0.218284 6.1733944,-0.29639 0,0 0.369686,0.374793 0.950999,0.579756 -5.468962,1.5992 -11.5603976,0.126117 -7.6465404,-1.172902"
    id="path6"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#fe7600;stroke-width:0.07999869;fill-opacity:1"
-   d="m 17.343344,14.731786 c 1.43166,1.6483 -0.37615,3.13155 -0.37615,3.13155 0,0 3.63522,-1.87661 1.96573,-4.22657 -1.55926,-2.19148 -2.755,-3.28034 3.71826,-7.0346002 0,0 -10.160879,2.53772 -5.30784,8.1296202"
+   style="fill:#fe7600;fill-opacity:1;stroke-width:0.06227889"
+   d="m 13.465044,11.432933 c 1.114546,1.283199 -0.292832,2.437908 -0.292832,2.437908 0,0 2.830015,-1.460939 1.530318,-3.29038 -1.213882,-1.7060647 -2.144764,-2.5537417 2.894662,-5.4764289 0,0 -7.9102344,1.9756122 -4.132148,6.3289009"
    id="path8"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#1f6ca1;stroke-width:0.07999869;fill-opacity:1"
-   d="m 25.027944,25.897206 c 0,0 0.83934,0.69159 -0.92439,1.22662 -3.35378,1.01599 -13.958809,1.32278 -16.9048393,0.0405 -1.05902,-0.46071 0.92694,-1.10006 1.55165,-1.23422 0.65151,-0.14128 1.0238299,-0.11496 1.0238299,-0.11496 -1.1777399,-0.82966 -7.6124397,1.6291 -3.2685099,2.33325 11.8465293,1.92116 21.5950893,-0.86511 18.5222593,-2.25117"
+   style="fill:#1f6ca1;fill-opacity:1;stroke-width:0.06227889"
+   d="m 19.447497,20.1252 c 0,0 0.653425,0.538402 -0.719637,0.954922 -2.610914,0.790948 -10.8669184,1.029783 -13.1603995,0.03153 -0.8244459,-0.358663 0.7216218,-0.856396 1.2079581,-0.960839 0.5072,-0.109987 0.79705,-0.0895 0.79705,-0.0895 -0.916869,-0.645889 -5.9262759,1.268253 -2.5445312,1.816433 9.2225106,1.495621 16.8117546,-0.673487 14.4195596,-1.752533"
    id="path10"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#1f6ca1;stroke-width:0.07999869;fill-opacity:1"
-   d="m 12.613345,16.877196 c 0,0 -5.3943903,1.28126 -1.91029,1.74653 1.4711,0.19696 4.40369,0.1524 7.135319,-0.0765 2.23245,-0.18831 4.47409,-0.58871 4.47409,-0.58871 0,0 -0.78719,0.33712 -1.3567,0.72599 -5.47791,1.4407 -16.0602092,0.77047 -13.0136993,-0.70319 2.5764303,-1.24542 4.6712803,-1.10414 4.6712803,-1.10414"
+   style="fill:#1f6ca1;fill-opacity:1;stroke-width:0.06227889"
+   d="m 9.7827446,13.103132 c 0,0 -4.1995273,0.997459 -1.487159,1.359672 1.14525,0.153333 3.4282684,0.118643 5.5548384,-0.05955 1.73796,-0.1466 3.483075,-0.458311 3.483075,-0.458311 0,0 -0.612827,0.262448 -1.05619,0.565183 -4.264547,1.121583 -12.502856,0.59981 -10.1311513,-0.547433 2.0057479,-0.969558 3.6365869,-0.859572 3.6365869,-0.859572"
    id="path12"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#1f6ca1;stroke-width:0.07999869;fill-opacity:1"
-   d="m 22.290224,22.286226 c 5.56855,-2.89363 2.99387,-5.67439 1.19678,-5.29975 -0.44047,0.0917 -0.63687,0.17111 -0.63687,0.17111 0,0 0.16352,-0.25615 0.47583,-0.36703 3.55523,-1.2499 6.28942,3.68642 -1.14766,5.64151 0,8e-5 0.0862,-0.077 0.11192,-0.14584"
+   style="fill:#1f6ca1;fill-opacity:1;stroke-width:0.06227889"
+   d="m 17.316185,17.314056 c 4.33511,-2.252688 2.330724,-4.417507 0.931692,-4.12585 -0.342906,0.07139 -0.495803,0.133209 -0.495803,0.133209 0,0 0.1273,-0.199412 0.370433,-0.285732 2.767743,-0.973046 4.896307,2.869874 -0.893452,4.391909 0,6.3e-5 0.06711,-0.05994 0.08713,-0.113536"
    id="path14"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#fe7600;stroke-width:0.07999869;fill-opacity:1"
-   d="m 18.932924,0.54002581 c 0,0 3.08395,3.08498999 -2.925,7.82882999 -4.818559,3.8053802 -1.098779,5.9751002 -0.002,8.4541002 -2.812669,-2.53772 -4.876799,-4.77168 -3.492019,-6.8508502 2.03253,-3.05203 7.663319,-4.53176 6.419019,-9.43207999"
+   style="fill:#fe7600;fill-opacity:1;stroke-width:0.06227889"
+   d="m 14.70253,0.38466269 c 0,0 2.400852,2.40166131 -2.277109,6.09473571 -3.7512434,2.9624849 -0.855398,4.6516086 -0.0016,6.5815076 C 10.234161,11.085294 8.6272376,9.3461583 9.7052876,7.7275273 11.28761,5.3515247 15.671174,4.1995565 14.702487,0.38466269"
    id="path16"
    inkscape:connector-curvature="0" />
 
 <path
-   style="fill:#1f6ca1;stroke-width:0.07999869;fill-opacity:1"
-   d="m 13.160535,30.127296 c 5.345109,0.34216 13.553139,-0.18983 13.747539,-2.71899 0,0 -0.37368,0.95878 -4.41745,1.72021 -4.56217,0.85855 -10.188959,0.75831 -13.5262593,0.20808 8e-5,-8e-5 0.68319,0.56543 4.1961703,0.7907"
+   style="fill:#1f6ca1;fill-opacity:1;stroke-width:0.06227889"
+   d="m 10.208732,23.418321 c 4.161161,0.266371 10.551104,-0.147783 10.702444,-2.116731 0,0 -0.290909,0.746409 -3.43898,1.339182 -3.551644,0.66838 -7.9320944,0.590343 -10.5301784,0.16199 6.2e-5,-6.3e-5 0.531862,0.440186 3.2667144,0.615559"
    id="path18"
    inkscape:connector-curvature="0" />

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -245 +245 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get("data", "key");
+        return ImageProvider.get("dialogs", "propertiesdialog", ImageProvider.ImageSizes.SMALLICON);
     }
 

trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java

@@ -141 +141 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get("data", "key");
+        return ImageProvider.get("dialogs", "propertiesdialog", ImageProvider.ImageSizes.SMALLICON);
     }
 

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -259 +259 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get("data", "purge");
+        return ImageProvider.get("purge");
     }
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1336 +1336 @@
                         mainFrame, title,
                         tr("Change proxy settings"), tr("Cancel"));
-                ed.setButtonIcons("dialogs/settings", "cancel").setCancelButton(2);
+                ed.setButtonIcons("preference", "cancel").setCancelButton(2);
                 ed.setMinimumSize(new Dimension(460, 260));
                 ed.setIcon(JOptionPane.WARNING_MESSAGE);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -321 +321 @@
                         tr("Delete image file from disk"),
                         tr("Cancel"), tr("Delete"))
-                        .setButtonIcons("cancel", "dialogs/delete")
+                        .setButtonIcons("cancel", "dialogs/geoimage/deletefromdisk")
                         .setContent(new JLabel("<html><h3>"
                                 + trn("Delete the file from disk?",