From 4b6869dd67869fdbf9b0d98cfdaed4e10775bcaa Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 19 Jun 2018 15:08:08 +0200 Subject: [PATCH] icons: fix various icons broken when recoloring with CSS. For anyone wishing to help me fix icons, here is the trick: apparently GTK+ would fill the paths with CSS colors, not stroke them. So when we have icon drawing based on path-stroking, they don't end up as expected. In Inkscape, just run "Stroke to Path" to transform a stroke design in a fill design. I am fixing "gimp-tool-cage", "document-revert", "gimp-image-reload", "gimp-reset" and "view-refresh". More to follow as we discover them, I guess. --- icons/Symbolic/24/gimp-tool-cage-symbolic.svg | 75 ++++---- .../scalable/document-revert-symbolic.svg | 63 ++++--- .../scalable/gimp-image-reload-symbolic.svg | 83 ++++----- .../Symbolic/scalable/gimp-reset-symbolic.svg | 108 +++++++---- .../scalable/gimp-tool-cage-symbolic.svg | 171 ++++++++++++------ .../scalable/view-refresh-symbolic.svg | 67 +++---- icons/Symbolic/symbolic-scalable.svg | 120 ++++-------- 7 files changed, 373 insertions(+), 314 deletions(-) diff --git a/icons/Symbolic/24/gimp-tool-cage-symbolic.svg b/icons/Symbolic/24/gimp-tool-cage-symbolic.svg index 423d253a40..e6ef69a5e0 100644 --- a/icons/Symbolic/24/gimp-tool-cage-symbolic.svg +++ b/icons/Symbolic/24/gimp-tool-cage-symbolic.svg @@ -11,13 +11,13 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="24" + width="24.000006" height="24" - viewBox="0 0 24 24" + viewBox="0 0 24.000006 24" id="svg30571" version="1.1" - inkscape:version="0.91+devel r" - sodipodi:docname="gimp-tool-cage-24.svg" + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="gimp-tool-cage-symbolic.svg" inkscape:export-filename="/home/klaus/Bilder/icons/Symbolic/hicolor/24x24/apps/gimp-channel.png" inkscape:export-xdpi="98.181816" inkscape:export-ydpi="98.181816"> @@ -35,7 +35,7 @@ + showguides="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + id="grid4369" + originx="10.687503" + originy="-6.0625" /> @@ -154,43 +160,44 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1028.3622)"> + transform="translate(10.687503,-1022.2997)"> + style="display:inline" + transform="translate(-10.687497,-6.0624826)" + id="gimp-tool-cage-24"> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient7333-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.24780607;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 21.039062,1030.0371 -19.1621089,3.3828 v 0.9414 17.2989 l 10.2812499,-7.9981 10.087891,4.4844 z m -2.076171,2.6484 0.792968,11.8946 -7.914062,-3.5176 -7.7187501,6.002 v -11.7598 z" + id="rect3916-8" + inkscape:connector-curvature="0" /> diff --git a/icons/Symbolic/scalable/document-revert-symbolic.svg b/icons/Symbolic/scalable/document-revert-symbolic.svg index 7b079c152e..e435453544 100644 --- a/icons/Symbolic/scalable/document-revert-symbolic.svg +++ b/icons/Symbolic/scalable/document-revert-symbolic.svg @@ -12,8 +12,8 @@ viewBox="0 0 16 16" id="svg30571" version="1.1" - inkscape:version="0.92pre1 unknown" - sodipodi:docname="gimp-revert.svg"> + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="document-revert-symbolic.svg"> + showguides="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + id="grid4233" + originx="3.7931905" + originy="-1.1206091" /> @@ -70,7 +76,7 @@ Klaus Staedtler - + @@ -78,36 +84,33 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1036.3622)"> + transform="translate(3.7931905,-1035.2416)"> + style="display:inline" + id="document-revert" + transform="matrix(-1.03125,0,0,1.03125,12.45681,-33.756918)" + inkscape:label="document-revert"> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + diff --git a/icons/Symbolic/scalable/gimp-image-reload-symbolic.svg b/icons/Symbolic/scalable/gimp-image-reload-symbolic.svg index 4904721e3e..7d6f321af5 100644 --- a/icons/Symbolic/scalable/gimp-image-reload-symbolic.svg +++ b/icons/Symbolic/scalable/gimp-image-reload-symbolic.svg @@ -9,13 +9,13 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - viewBox="0 0 15.999999 16" + viewBox="0 0 16.000123 16.000309" id="svg7384" - height="16" - width="16" + height="16.000309" + width="16.000124" version="1.1" - inkscape:version="0.92pre1 unknown" - sodipodi:docname="gimp-image-reload.svg"> + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="gimp-image-reload-symbolic.svg"> + inkscape:snap-global="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + id="grid4277" + originx="1.2204012" + originy="-1.8981504" /> @@ -49,7 +55,7 @@ image/svg+xml - + Barbara Muraus, Jakub Steiner, Klaus Staedtler @@ -149,46 +155,37 @@ xlink:href="#linearGradient19282-4" /> + style="display:inline" + id="gimp-image-reload" + transform="translate(1.2501967e-4,3.1180829e-4)" + inkscape:label="gimp-image-reload"> + transform="matrix(0.44359232,0,0,0.43109129,18.091378,-432.8546)" + id="refresh-1"> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.98589587;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m -30.907162,1004.6132 c -1.0832,-0.094 -2.201477,0.01 -3.302453,0.3301 -4.403905,1.2902 -7.190289,5.7028 -6.457892,10.2162 0.732397,4.5134 4.762023,7.7438 9.331985,7.4741 l -0.143053,-2.9803 c -3.073493,0.1814 -5.745861,-1.9585 -6.239975,-5.0036 -0.494115,-3.045 1.356726,-5.9734 4.31927,-6.8414 2.962541,-0.8678 6.049881,0.6108 7.21397,3.4588 l 2.766602,-1.1561 c -1.2946,-3.1673 -4.238855,-5.2158 -7.488454,-5.4978 z" + id="path4874-9" + inkscape:connector-curvature="0" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m -24.273438,1004.0898 a 1.50015,1.50015 0 0 0 -1.476562,1.5215 v 4 h -4 a 1.50015,1.50015 0 1 0 0,3 h 7 v -7 a 1.50015,1.50015 0 0 0 -1.523438,-1.5215 z" + id="path8393-3-8-4-9-3-7-4" + inkscape:connector-curvature="0" /> + transform="matrix(0.71428571,0,0,0.70921986,-96.428714,-263.43262)" + id="g3172-4-7"> + style="fill:url(#linearGradient10188);fill-opacity:1;stroke:none" + inkscape:connector-curvature="0" /> + style="opacity:0.3;fill:url(#linearGradient10186);fill-opacity:1;stroke:none" + inkscape:connector-curvature="0" /> diff --git a/icons/Symbolic/scalable/gimp-reset-symbolic.svg b/icons/Symbolic/scalable/gimp-reset-symbolic.svg index 4afc08e0f6..a41684d7ae 100644 --- a/icons/Symbolic/scalable/gimp-reset-symbolic.svg +++ b/icons/Symbolic/scalable/gimp-reset-symbolic.svg @@ -9,13 +9,13 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - viewBox="0 0 15.999999 16" + viewBox="0 0 16.014003 16" id="svg7384" height="16" - width="16" + width="16.014004" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="gimp-reset.svg"> + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="gimp-reset-symbolic.svg"> + inkscape:window-maximized="1" + inkscape:current-layer="svg7384" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> @@ -44,7 +48,7 @@ image/svg+xml - + Barbara Muraus, Jakub Steiner, Klaus Staedtler @@ -133,33 +137,63 @@ x1="2" id="linearGradient7308" xlink:href="#linearGradient19282-4" /> + + + - - - - - + id="gimp-reset" + transform="matrix(1.0008752,0,0,1.000209,0,-1036.5822)"> + + + + diff --git a/icons/Symbolic/scalable/gimp-tool-cage-symbolic.svg b/icons/Symbolic/scalable/gimp-tool-cage-symbolic.svg index 192b08637b..c6d7129d0b 100644 --- a/icons/Symbolic/scalable/gimp-tool-cage-symbolic.svg +++ b/icons/Symbolic/scalable/gimp-tool-cage-symbolic.svg @@ -14,8 +14,8 @@ height="16.000004" width="16" version="1.1" - inkscape:version="0.91+devel r" - sodipodi:docname="gimp-tool-cage.svg"> + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="gimp-tool-cage-symbolic.svg"> + inkscape:current-layer="svg7384" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> @@ -44,7 +48,7 @@ image/svg+xml - + Barbara Muraus, Jakub Steiner, Klaus Staedtler @@ -119,55 +123,114 @@ x1="-178.03125" id="linearGradient7363" xlink:href="#linearGradient19282-4" /> + + + + + + - - - - - - - - + id="gimp-tool-cage" + inkscape:label="gimp-tool-cage" + transform="matrix(0.99805136,0,0,1,-80.826755,-217)"> + + + + + + + diff --git a/icons/Symbolic/scalable/view-refresh-symbolic.svg b/icons/Symbolic/scalable/view-refresh-symbolic.svg index 183c6dece1..670312ab9b 100644 --- a/icons/Symbolic/scalable/view-refresh-symbolic.svg +++ b/icons/Symbolic/scalable/view-refresh-symbolic.svg @@ -12,8 +12,8 @@ viewBox="0 0 16 16" id="svg30571" version="1.1" - inkscape:version="0.92pre1 unknown" - sodipodi:docname="gimp-revert.svg"> + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="view-refresh-symbolic.svg"> + showguides="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + id="grid4233" + originx="7.793192" + originy="0.73493093" /> @@ -78,36 +84,33 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1036.3622)"> + transform="translate(7.793192,-1037.0971)"> + style="display:inline" + id="view-refresh" + transform="matrix(1.03125,0,0,1.03125,-8.043192,-31.901378)" + inkscape:label="view-refresh"> + id="refresh-9"> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.0031178;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m -30.235797,1004.5251 c -0.996217,-0.1684 -2.032889,-0.1679 -3.074472,0.023 -4.166332,0.7652 -7.277625,4.3678 -7.491874,8.6265 -0.214247,4.2585 2.518556,8.0975 6.58982,9.1986 4.071265,1.1012 8.401403,-0.843 10.376348,-4.6325 l -2.660994,-1.3652 c -1.335872,2.5633 -4.186789,3.8316 -6.900738,3.0975 -2.713948,-0.7341 -4.551238,-3.287 -4.405725,-6.1793 0.145512,-2.8924 2.228797,-5.2829 5.004148,-5.7927 2.77535,-0.5097 5.492151,0.9867 6.565932,3.6502 l 2.785876,-1.1483 c -1.189174,-2.9498 -3.799666,-4.9732 -6.788321,-5.4782 z" + id="path4874-4" + inkscape:connector-curvature="0" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.9876411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m -24.052734,1004.125 a 1.4939699,1.4939699 0 0 0 -1.470704,1.5156 v 3.9844 h -3.984374 a 1.4939699,1.4939699 0 1 0 0,2.9863 h 6.972656 v -6.9707 a 1.4939699,1.4939699 0 0 0 -1.517578,-1.5156 z" + id="path8393-3-8-4-9-3-7-9" + inkscape:connector-curvature="0" /> + diff --git a/icons/Symbolic/symbolic-scalable.svg b/icons/Symbolic/symbolic-scalable.svg index 2d7f310393..76063ed2e2 100644 --- a/icons/Symbolic/symbolic-scalable.svg +++ b/icons/Symbolic/symbolic-scalable.svg @@ -49,13 +49,13 @@ inkscape:window-height="741" id="namedview88" showgrid="true" - inkscape:zoom="11.313709" - inkscape:cx="66.190551" - inkscape:cy="252.40004" + inkscape:zoom="16.000001" + inkscape:cx="671.525" + inkscape:cy="-192.02205" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="tools" + inkscape:current-layer="stock" showborder="false" inkscape:snap-nodes="true" inkscape:snap-bbox="true" @@ -4100,7 +4100,8 @@ y1="-1044.3207" x2="-2.553411" y2="-1044.3207" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="scale(-1)" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4848485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4848485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + style="opacity:0;fill:none;stroke:none;stroke-width:0.99989283" /> + inkscape:connector-curvature="0" />