From 64d7c53de04f7e92ff288f1248cbad706bc19951 Mon Sep 17 00:00:00 2001 From: Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> Date: Fri, 19 Jul 2019 11:04:53 +1000 Subject: Fix broken or incorrect icons in Tango theme - Created draw-ellipse-chord - Take 0.92's transform-rotate, object-rows, object-columns - Take 0.92's guides, grid-axonometric, grid-rectangular - Changed xml-node-delete icon from + to x - Fix transforms in various files - Address gitlab.com/inkscape/inkscape/issues/52 --- .../scalable/actions/align-horizontal-right.svg | 2 +- .../actions/align-vertical-bottom-to-anchor.svg | 2 +- .../Tango/scalable/actions/align-vertical-node.svg | 2 +- .../Tango/scalable/actions/align-vertical-top.svg | 2 +- .../scalable/actions/distribute-graph-directed.svg | 7 +- .../Tango/scalable/actions/distribute-graph.svg | 22 +-- .../actions/distribute-vertical-baseline.svg | 24 ++- .../actions/distribute-vertical-bottom.svg | 2 +- .../actions/distribute-vertical-center.svg | 2 +- .../scalable/actions/distribute-vertical-gaps.svg | 2 +- .../scalable/actions/distribute-vertical-node.svg | 2 +- .../Tango/scalable/actions/draw-ellipse-chord.svg | 97 ++++++++++ .../Tango/scalable/actions/grid-axonometric.svg | 87 +++++++++ .../Tango/scalable/actions/grid-rectangular.svg | 78 ++++++++ share/icons/Tango/scalable/actions/guides.svg | 40 ++++ .../icons/Tango/scalable/actions/inkscape-logo.svg | 61 +++--- share/icons/Tango/scalable/actions/node-break.svg | 23 +-- .../Tango/scalable/actions/node-delete-segment.svg | 29 +-- share/icons/Tango/scalable/actions/node-join.svg | 9 +- .../Tango/scalable/actions/node-type-cusp.svg | 9 +- .../Tango/scalable/actions/node-type-symmetric.svg | 9 +- .../Tango/scalable/actions/object-columns.svg | 206 +++++++++++++++++++++ .../scalable/actions/object-flip-vertical.svg | 2 +- share/icons/Tango/scalable/actions/object-rows.svg | 206 +++++++++++++++++++++ .../Tango/scalable/actions/path-mode-bezier.svg | 9 +- share/icons/Tango/scalable/actions/powerstroke.svg | 6 +- share/icons/Tango/scalable/actions/snap-nodes.svg | 9 +- .../Tango/scalable/actions/transform-rotate.svg | 165 +++++++++++++++++ .../scalable/actions/xml-attribute-delete.svg | 18 +- .../Tango/scalable/actions/xml-node-delete.svg | 36 ++-- .../icons/Tango/scalable/actions/xml-text-new.svg | 12 +- 31 files changed, 1039 insertions(+), 141 deletions(-) create mode 100644 share/icons/Tango/scalable/actions/draw-ellipse-chord.svg create mode 100644 share/icons/Tango/scalable/actions/grid-axonometric.svg create mode 100644 share/icons/Tango/scalable/actions/grid-rectangular.svg create mode 100644 share/icons/Tango/scalable/actions/guides.svg create mode 100644 share/icons/Tango/scalable/actions/object-columns.svg create mode 100644 share/icons/Tango/scalable/actions/object-rows.svg create mode 100644 share/icons/Tango/scalable/actions/transform-rotate.svg diff --git a/share/icons/Tango/scalable/actions/align-horizontal-right.svg b/share/icons/Tango/scalable/actions/align-horizontal-right.svg index 03975b407..96873962f 100644 --- a/share/icons/Tango/scalable/actions/align-horizontal-right.svg +++ b/share/icons/Tango/scalable/actions/align-horizontal-right.svg @@ -225,7 +225,7 @@ + transform="matrix(0,1,1,0,-1328,-144)"> + transform="rotate(90,628,628)"> + transform="rotate(-90,-856,880)"> + transform="matrix(1,0,0,-1,-144,1352)"> + id="use11833" + transform="translate(17)"> + transform="translate(9,7)"> + transform="translate(9,17)"> + viewBox="0 0 24 24"> @@ -68,21 +68,21 @@ id="graph_layout" transform="translate(-176,-1640)"> + transform="translate(33,1.99998)"> + transform="translate(41,11.99998)"> + transform="translate(47,16.99998)"> + transform="translate(43,-2e-5)"> + transform="translate(33,13.99994)"> + transform="translate(50,6.99998)"> + viewBox="0 0 24 24"> @@ -175,7 +175,7 @@ + transform="translate(-192,-1520)"> + inkscape:label="#g14209" + x="0" + y="0" + transform="rotate(90,76.5,326.5)" + width="2000" + height="2000" + style="display:inline"> + inkscape:label="#g14209" + style="display:inline" + height="2000" + width="2000" + transform="rotate(90,71,332)" + y="0" + x="0"> + transform="rotate(-90,-688,760)"> + transform="rotate(-90,-664,784)"> - + diff --git a/share/icons/Tango/scalable/actions/distribute-vertical-node.svg b/share/icons/Tango/scalable/actions/distribute-vertical-node.svg index f73d4a94a..0814eff2e 100644 --- a/share/icons/Tango/scalable/actions/distribute-vertical-node.svg +++ b/share/icons/Tango/scalable/actions/distribute-vertical-node.svg @@ -205,7 +205,7 @@ + transform="matrix(0,1,1,0,-1736,-96)"> + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/grid-axonometric.svg b/share/icons/Tango/scalable/actions/grid-axonometric.svg new file mode 100644 index 000000000..ffb53dd8e --- /dev/null +++ b/share/icons/Tango/scalable/actions/grid-axonometric.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/grid-rectangular.svg b/share/icons/Tango/scalable/actions/grid-rectangular.svg new file mode 100644 index 000000000..09efece7e --- /dev/null +++ b/share/icons/Tango/scalable/actions/grid-rectangular.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/guides.svg b/share/icons/Tango/scalable/actions/guides.svg new file mode 100644 index 000000000..2f5a070d6 --- /dev/null +++ b/share/icons/Tango/scalable/actions/guides.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/inkscape-logo.svg b/share/icons/Tango/scalable/actions/inkscape-logo.svg index 40d9da5ff..988fe5814 100644 --- a/share/icons/Tango/scalable/actions/inkscape-logo.svg +++ b/share/icons/Tango/scalable/actions/inkscape-logo.svg @@ -146,60 +146,65 @@ id="path30" inkscape:connector-curvature="0" style="opacity:1;fill:#000000;filter:url(#ShadowBlur)" /> - - + - + - + - + - + + y="0" + d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 25.8,88.7 43.9,92.1 47.5,95.7 51.1,99.4 40.2,103.3 43.8,107 47.3,110.7 55.7,107.2 57.2,115.6 58.3,121.8 72.6,118.7 79,113.4 83,110 72.1,110 75.7,106.3 84.7,97.2 92.7,102.2 96,93.8 97.8,89.3 82.4,86.1 86.5,83.2 96.3,76.3 132.3,72.8 115.7,56.2 L 73,12.5 C 67.7,7.5 59,7.5 54.1,12.5 Z M 44.2,77.2 C 45.1,77.2 75,81.2 63.5,84.3 59.1,85.5 38.9,77.2 44.2,77.2 Z M 101.4,93.8 C 101.4,95.9 117.7,97.1 116.8,93.3 115.5,86.9 103.2,87.4 101.4,93.8 Z M 31.9,104.9 C 35.6,108.1 41.2,104.2 43,99.7 39.4,95 26.1,100 31.9,104.9 Z M 99.4,98.2 C 94.8,102.4 100.2,106.8 104.7,103.9 105.9,103.1 104.6,99.2 99.4,98.2 Z" + inkscape:connector-curvature="0" /> + viewBox="0 0 16 16"> @@ -233,11 +233,11 @@ id="rect6701" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient14102);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.193344;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" width="16" - x="1392" + x="1277.0001" y="192" /> + transform="matrix(-0.7272725,0,0,-0.7272725,1279.1822,514.9088)"> + transform="matrix(0.7272725,0,0,0.7272725,1290.8182,-104)"> + transform="matrix(0.7272725,0,0,0.7272725,1290.8182,-104.7272)"> + transform="translate(-51.022022,-12.99999)"> + transform="translate(6.0001775,-11)"> + inkscape:label="#g14209" + transform="translate(2)"> + transform="translate(9.0001775,3e-5)"> + viewBox="0 0 16 16"> @@ -244,18 +244,18 @@ id="rect6722" style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" width="16" - x="1320" + x="1277" y="192" /> + transform="matrix(-0.6666667,0,0,-0.6666667,1279.6673,489.3332)"> + transform="matrix(0.6666667,0,0,0.6666667,1290.3333,-78.00007)"> + transform="matrix(0.6666667,0,0,0.6666667,1290.333,-79.3334)"> + inkscape:label="#g14209" + transform="translate(2)"> + transform="translate(9,3e-5)"> + transform="translate(2,-10.99997)"> + transform="translate(9,-10.99997)"> + viewBox="0 0 16 16"> @@ -228,7 +228,7 @@ + transform="translate(-1344,-192)"> + inkscape:label="#g14209" + transform="translate(72.5)"> + viewBox="0 0 16 16"> @@ -226,7 +226,8 @@ + inkscape:label="#g14630" + transform="rotate(-45,1438.414,229.9705)"> diff --git a/share/icons/Tango/scalable/actions/node-type-symmetric.svg b/share/icons/Tango/scalable/actions/node-type-symmetric.svg index ffbb15a1a..49e9a7a33 100644 --- a/share/icons/Tango/scalable/actions/node-type-symmetric.svg +++ b/share/icons/Tango/scalable/actions/node-type-symmetric.svg @@ -9,11 +9,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" - width="34.998901" + width="16" height="16" version="1.1" sodipodi:docname="node-type-symmetric.svg" - viewBox="0 0 34.998902 16"> + viewBox="0 0 16 16"> @@ -132,7 +132,7 @@ + transform="translate(-1464,-192)"> + inkscape:label="#g14630" + transform="rotate(45,1457.407,227.9234)"> diff --git a/share/icons/Tango/scalable/actions/object-columns.svg b/share/icons/Tango/scalable/actions/object-columns.svg new file mode 100644 index 000000000..0ebc376c1 --- /dev/null +++ b/share/icons/Tango/scalable/actions/object-columns.svg @@ -0,0 +1,206 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/object-flip-vertical.svg b/share/icons/Tango/scalable/actions/object-flip-vertical.svg index 6f3bb04e5..6d050ab6e 100644 --- a/share/icons/Tango/scalable/actions/object-flip-vertical.svg +++ b/share/icons/Tango/scalable/actions/object-flip-vertical.svg @@ -73,7 +73,7 @@ + transform="rotate(-90,64.00005,455.99999)"> + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/path-mode-bezier.svg b/share/icons/Tango/scalable/actions/path-mode-bezier.svg index 347e8ffc8..e15ab71a4 100644 --- a/share/icons/Tango/scalable/actions/path-mode-bezier.svg +++ b/share/icons/Tango/scalable/actions/path-mode-bezier.svg @@ -9,11 +9,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" - width="232.9989" + width="18.552411" height="18.501411" version="1.1" sodipodi:docname="path-mode-bezier.svg" - viewBox="0 0 232.9989 18.501411"> + viewBox="0 0 18.552411 18.501411"> @@ -194,7 +194,7 @@ + transform="translate(-1659.4378,-189.49871)"> @@ -292,7 +292,8 @@ + inkscape:label="#g14630" + transform="rotate(135,1557.961,243.4972)"> diff --git a/share/icons/Tango/scalable/actions/powerstroke.svg b/share/icons/Tango/scalable/actions/powerstroke.svg index 1f06afb55..e5483fe51 100644 --- a/share/icons/Tango/scalable/actions/powerstroke.svg +++ b/share/icons/Tango/scalable/actions/powerstroke.svg @@ -82,10 +82,12 @@ Jabier Arraiza + style="opacity:1;" + transform="matrix(0.2838597,0,0,0.2838597,-231.56652,220.73235)" /> + style="opacity:0.4;" + transform="matrix(0.2838597,0,0,0.2838597,-231.56652,220.73235)" /> diff --git a/share/icons/Tango/scalable/actions/snap-nodes.svg b/share/icons/Tango/scalable/actions/snap-nodes.svg index f5cdb1e89..a1da6876d 100644 --- a/share/icons/Tango/scalable/actions/snap-nodes.svg +++ b/share/icons/Tango/scalable/actions/snap-nodes.svg @@ -9,11 +9,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" - width="82.998497" - height="75.001244" + width="16" + height="16" version="1.1" sodipodi:docname="snap-nodes.svg" - viewBox="0 0 82.998497 75.001241"> + viewBox="0 0 16 16"> @@ -192,7 +192,8 @@ + inkscape:label="#g14630" + transform="rotate(-45,1337.159,255.9115)"> diff --git a/share/icons/Tango/scalable/actions/transform-rotate.svg b/share/icons/Tango/scalable/actions/transform-rotate.svg new file mode 100644 index 000000000..86db0f6ea --- /dev/null +++ b/share/icons/Tango/scalable/actions/transform-rotate.svg @@ -0,0 +1,165 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/xml-attribute-delete.svg b/share/icons/Tango/scalable/actions/xml-attribute-delete.svg index 676166061..a85f8de07 100644 --- a/share/icons/Tango/scalable/actions/xml-attribute-delete.svg +++ b/share/icons/Tango/scalable/actions/xml-attribute-delete.svg @@ -9,11 +9,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" - width="217.2" - height="26.400002" + width="26.4" + height="26.4" version="1.1" sodipodi:docname="xml-attribute-delete.svg" - viewBox="0 0 217.2 26.400002"> + viewBox="0 0 26.4 26.4"> @@ -101,7 +101,7 @@ id="rect12920" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient12922);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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;enable-background:accumulate" width="24" - x="552" + x="360" y="1088" /> @@ -132,21 +132,21 @@ id="rect11293" style="display:inline;opacity:0.31671549;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;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" width="6.9850459" - x="562.56458" + x="370.56458" y="1103.5179" /> @@ -157,6 +157,6 @@ inkscape:radius="-0.28125" sodipodi:type="inkscape:offset" style="display:inline;overflow:visible;visibility:visible;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1.02777779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0.50001389;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" - transform="matrix(0.972973,0,0,0.972973,390.973,740.1621)" /> + transform="matrix(0.972973,0,0,0.972973,198.97272,740.1621)" /> diff --git a/share/icons/Tango/scalable/actions/xml-node-delete.svg b/share/icons/Tango/scalable/actions/xml-node-delete.svg index c0de849a4..71824c611 100644 --- a/share/icons/Tango/scalable/actions/xml-node-delete.svg +++ b/share/icons/Tango/scalable/actions/xml-node-delete.svg @@ -9,11 +9,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" - width="121.2" - height="26.400002" + width="26.4" + height="26.4" version="1.1" sodipodi:docname="xml-node-delete.svg" - viewBox="0 0 121.2 26.400002"> + viewBox="0 0 26.4 26.4"> @@ -101,7 +101,7 @@ id="rect12912" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient12914);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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;enable-background:accumulate" width="24" - x="456" + x="360" y="1088" /> @@ -129,7 +129,7 @@ + transform="translate(-539.9821,1082.999)"> + transform="translate(-539.9821,1082.999)"> - - - - + diff --git a/share/icons/Tango/scalable/actions/xml-text-new.svg b/share/icons/Tango/scalable/actions/xml-text-new.svg index 551b07a9b..01052ff52 100644 --- a/share/icons/Tango/scalable/actions/xml-text-new.svg +++ b/share/icons/Tango/scalable/actions/xml-text-new.svg @@ -9,11 +9,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" - width="73.199997" - height="26.400002" + width="26.4" + height="26.4" version="1.1" sodipodi:docname="xml-text-new.svg" - viewBox="0 0 73.199998 26.400002"> + viewBox="0 0 26.4 26.4"> @@ -128,13 +128,13 @@ y="1090.5" /> + transform="translate(-540.0179,1082.984)"> + transform="translate(-61,1)">