merge lp:~inkscape.dev/inkscape/simplify-lpe-pencil-toolbar into lp:inkscape

(bzr r14259)

3 files changed, 12 insertions, 0 deletions

diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index 35ef6ab8c..7c2a479ba 100644
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -3954,4 +3954,8 @@ http://www.inkscape.org/</dc:description>
 <path style="fill:none;stroke:#c8c8c8;stroke-width:1px;stroke-linecap:square" d="m 12.5,14.5 0,-9" id="path5602-7" />
 <path style="fill:#ffffff;fill-rule:evenodd;stroke:url(#linearGradient5799-9);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round" d="m 9.5,0.5 4,4 -4,0 0,-4 z" id="path4681-4" />
 </g>
+<g inkscape:label="#interactive_simplify" id="interactive_simplify-8" transform="translate(2.8103663,-3.4622352)">
+<rect style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect17937-7" width="15.721" height="15.721" x="284.96881" y="535.60986"/>
+<path 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;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;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;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;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 290.17927,536.29791 c -0.73508,-0.0198 -1.39622,0.2336 -1.84159,0.74177 -0.44531,0.50792 -0.64525,1.18194 -0.72765,1.87328 -0.16506,1.38275 0.0895,2.98886 0.35184,4.5721 0.26249,1.58323 0.54397,3.14418 0.5465,4.16017 0.002,0.50783 -0.0816,0.85395 -0.14524,0.96912 -0.0636,0.11498 -0.0413,0.13606 -0.31741,0.12818 -0.62469,-0.018 -0.83827,-0.25596 -1.06003,-0.78451 -0.2217,-0.52866 -0.31969,-1.38583 -0.29946,-2.27495 0.0406,-1.77813 0.11807,-2.13825 0.11807,-2.13825 l -1.38194,-0.0121 c 0,0 -0.0337,0.44001 -0.0806,2.49766 -0.0235,1.02877 -0.0407,1.70852 0.34882,2.63692 0.38958,0.92839 1.22621,1.68264 2.3192,1.71432 0.63526,0.0182 1.2607,-0.33475 1.56909,-0.89219 0.30839,-0.55754 0.36843,-1.18568 0.36682,-1.84935 -0.004,-1.32684 -0.31391,-2.90454 -0.57194,-4.461 -0.25796,-1.55655 -0.45229,-3.08947 -0.33837,-4.04395 0.057,-0.47747 0.17846,-0.77307 0.3189,-0.93322 0.14036,-0.16024 0.32929,-0.27384 0.79054,-0.2615 0.45488,0.0122 0.69097,0.12483 0.82198,0.23928 0.13101,0.11437 0.20751,0.2532 0.26202,0.53156 0.109,0.55665 -0.0124,1.58674 -0.21261,2.6612 -0.20016,1.07473 -0.46142,2.18434 -0.43719,3.21672 0.0121,0.5163 0.098,1.05271 0.41323,1.5075 0.31537,0.45497 0.8398,0.71265 1.39541,0.74522 0.46064,0.0271 0.88102,-0.0505 1.23672,-0.27349 0.35569,-0.22306 0.61213,-0.59016 0.7531,-0.95885 0.28203,-0.73745 0.23775,-1.48168 0.21261,-2.157 -0.025,-0.67532 -0.0407,-1.30092 0.021,-1.57246 0.0307,-0.13582 0.0562,-0.15501 0.0568,-0.15554 6.1e-4,-5.1e-4 0.0216,-0.0342 0.20063,-0.029 0.21794,0.005 0.23819,0.0425 0.27101,0.0736 0.0328,0.031 0.0923,0.12248 0.19463,0.32304 0.10226,0.20058 0.24827,0.50789 0.53749,0.77427 0.28932,0.26646 0.7035,0.43865 1.17233,0.46148 1.60943,-0.27583 2.28398,-1.00425 3.4062,-0.0836 l 0,-1.66134 c -1.4875,-0.73615 -2.29389,-0.16099 -3.3448,0.10586 -0.24009,-0.0116 -0.2878,-0.0595 -0.33089,-0.0991 -0.0432,-0.0397 -0.1003,-0.12938 -0.19913,-0.32304 -0.0988,-0.19383 -0.23563,-0.49298 -0.51805,-0.76059 -0.28248,-0.26761 -0.69591,-0.43622 -1.15285,-0.44952 -0.41365,-0.0119 -0.82202,0.10779 -1.13042,0.388 -0.30846,0.28046 -0.47152,0.6683 -0.55246,1.0255 -0.16199,0.71419 -0.0912,1.41292 -0.0674,2.05446 0.0239,0.6418 -0.008,1.20669 -0.0929,1.42888 -0.0426,0.11125 -0.0664,0.13781 -0.12726,0.17604 -0.061,0.0384 -0.19635,0.0897 -0.47163,0.0736 -0.27557,-0.0162 -0.30637,-0.0703 -0.34286,-0.12306 -0.0366,-0.0526 -0.0975,-0.21662 -0.10481,-0.53499 -0.015,-0.63672 0.20013,-1.72004 0.40726,-2.83212 0.20712,-1.11192 0.4237,-2.26505 0.2096,-3.35858 -0.10709,-0.54685 -0.35815,-1.09774 -0.79203,-1.47675 -0.43396,-0.37901 -1.00009,-0.56172 -1.66043,-0.57941 z" id="path14318-5" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccccccccccsccccccccccccccccccccc"/>
+</g>
 </svg>
diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg
index bc385f460..64c8dc7b0 100644
--- a/share/icons/symbolic_icons.svg
+++ b/share/icons/symbolic_icons.svg
@@ -3464,6 +3464,10 @@
 <path inkscape:connector-curvature="0" style="fill:url(#linearGradient19282)" d="m 13.969,3 0,1 3,0 a 1,1 0 0 1 1,1 l 0,1 -2,0 2.5,3 2.5,-3 -2,0 0,-1 a 2,2 0 0 0 -2,-2 l -3,0 z" id="path40863-1" />
 <path id="path40889-9" d="m 12.969,16 0,-1 -3,0 a 1,1 0 0 1 -1,-1 l 0,-1 2,0 -2.5,-3 -2.5,3 2,0 0,1 a 2,2 0 0 0 2,2 l 3,0 z" style="fill:url(#linearGradient19282)" inkscape:connector-curvature="0" />
 </g>
+<g inkscape:label="#interactive_simplify" id="interactive_simplify-8" transform="translate(2.8103663,-3.4622352)">
+<rect style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect17937-7" width="15.721" height="15.721" x="284.96881" y="535.60986"/>
+<path 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;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;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;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;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 290.17927,536.29791 c -0.73508,-0.0198 -1.39622,0.2336 -1.84159,0.74177 -0.44531,0.50792 -0.64525,1.18194 -0.72765,1.87328 -0.16506,1.38275 0.0895,2.98886 0.35184,4.5721 0.26249,1.58323 0.54397,3.14418 0.5465,4.16017 0.002,0.50783 -0.0816,0.85395 -0.14524,0.96912 -0.0636,0.11498 -0.0413,0.13606 -0.31741,0.12818 -0.62469,-0.018 -0.83827,-0.25596 -1.06003,-0.78451 -0.2217,-0.52866 -0.31969,-1.38583 -0.29946,-2.27495 0.0406,-1.77813 0.11807,-2.13825 0.11807,-2.13825 l -1.38194,-0.0121 c 0,0 -0.0337,0.44001 -0.0806,2.49766 -0.0235,1.02877 -0.0407,1.70852 0.34882,2.63692 0.38958,0.92839 1.22621,1.68264 2.3192,1.71432 0.63526,0.0182 1.2607,-0.33475 1.56909,-0.89219 0.30839,-0.55754 0.36843,-1.18568 0.36682,-1.84935 -0.004,-1.32684 -0.31391,-2.90454 -0.57194,-4.461 -0.25796,-1.55655 -0.45229,-3.08947 -0.33837,-4.04395 0.057,-0.47747 0.17846,-0.77307 0.3189,-0.93322 0.14036,-0.16024 0.32929,-0.27384 0.79054,-0.2615 0.45488,0.0122 0.69097,0.12483 0.82198,0.23928 0.13101,0.11437 0.20751,0.2532 0.26202,0.53156 0.109,0.55665 -0.0124,1.58674 -0.21261,2.6612 -0.20016,1.07473 -0.46142,2.18434 -0.43719,3.21672 0.0121,0.5163 0.098,1.05271 0.41323,1.5075 0.31537,0.45497 0.8398,0.71265 1.39541,0.74522 0.46064,0.0271 0.88102,-0.0505 1.23672,-0.27349 0.35569,-0.22306 0.61213,-0.59016 0.7531,-0.95885 0.28203,-0.73745 0.23775,-1.48168 0.21261,-2.157 -0.025,-0.67532 -0.0407,-1.30092 0.021,-1.57246 0.0307,-0.13582 0.0562,-0.15501 0.0568,-0.15554 6.1e-4,-5.1e-4 0.0216,-0.0342 0.20063,-0.029 0.21794,0.005 0.23819,0.0425 0.27101,0.0736 0.0328,0.031 0.0923,0.12248 0.19463,0.32304 0.10226,0.20058 0.24827,0.50789 0.53749,0.77427 0.28932,0.26646 0.7035,0.43865 1.17233,0.46148 1.60943,-0.27583 2.28398,-1.00425 3.4062,-0.0836 l 0,-1.66134 c -1.4875,-0.73615 -2.29389,-0.16099 -3.3448,0.10586 -0.24009,-0.0116 -0.2878,-0.0595 -0.33089,-0.0991 -0.0432,-0.0397 -0.1003,-0.12938 -0.19913,-0.32304 -0.0988,-0.19383 -0.23563,-0.49298 -0.51805,-0.76059 -0.28248,-0.26761 -0.69591,-0.43622 -1.15285,-0.44952 -0.41365,-0.0119 -0.82202,0.10779 -1.13042,0.388 -0.30846,0.28046 -0.47152,0.6683 -0.55246,1.0255 -0.16199,0.71419 -0.0912,1.41292 -0.0674,2.05446 0.0239,0.6418 -0.008,1.20669 -0.0929,1.42888 -0.0426,0.11125 -0.0664,0.13781 -0.12726,0.17604 -0.061,0.0384 -0.19635,0.0897 -0.47163,0.0736 -0.27557,-0.0162 -0.30637,-0.0703 -0.34286,-0.12306 -0.0366,-0.0526 -0.0975,-0.21662 -0.10481,-0.53499 -0.015,-0.63672 0.20013,-1.72004 0.40726,-2.83212 0.20712,-1.11192 0.4237,-2.26505 0.2096,-3.35858 -0.10709,-0.54685 -0.35815,-1.09774 -0.79203,-1.47675 -0.43396,-0.37901 -1.00009,-0.56172 -1.66043,-0.57941 z" id="path14318-5-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccccccccccsccccccccccccccccccccc"/>
+</g>
 <g id="stock_icons">
 <g transform="translate(-270,23)" id="object-rotate-90-CW">
 <g transform="translate(223.9998,725.3622)" id="g15895" inkscape:label="stock-rotate-270">
diff --git a/share/icons/tango_icons.svg b/share/icons/tango_icons.svg
index c1da77e79..ae22f5370 100644
--- a/share/icons/tango_icons.svg
+++ b/share/icons/tango_icons.svg
@@ -5277,6 +5277,10 @@ http://www.inkscape.org/</dc:description>
 <ellipse style="color:#000000;text-decoration:none;text-decoration-line:none;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="ellipse47662" cx="18.48884" cy="207.5353" rx="6.611154" ry="6.515604" transform="matrix(0.8723531,0,0,0.8723531,2.360043,26.49119)" />
 <rect y="199.5352" x="10.48884" height="15.99999" width="15.99999" id="rect47664" style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:0.531496;marker:none" />
 </g>
+<g inkscape:label="#interactive_simplify" id="interactive_simplify-8" transform="translate(2.8103663,-3.4622352)">
+<rect style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect17937-7" width="15.721" height="15.721" x="284.96881" y="535.60986"/>
+<path 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;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;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;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;fill:#555753;fill-opacity:0.98823529;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 290.17927,536.29791 c -0.73508,-0.0198 -1.39622,0.2336 -1.84159,0.74177 -0.44531,0.50792 -0.64525,1.18194 -0.72765,1.87328 -0.16506,1.38275 0.0895,2.98886 0.35184,4.5721 0.26249,1.58323 0.54397,3.14418 0.5465,4.16017 0.002,0.50783 -0.0816,0.85395 -0.14524,0.96912 -0.0636,0.11498 -0.0413,0.13606 -0.31741,0.12818 -0.62469,-0.018 -0.83827,-0.25596 -1.06003,-0.78451 -0.2217,-0.52866 -0.31969,-1.38583 -0.29946,-2.27495 0.0406,-1.77813 0.11807,-2.13825 0.11807,-2.13825 l -1.38194,-0.0121 c 0,0 -0.0337,0.44001 -0.0806,2.49766 -0.0235,1.02877 -0.0407,1.70852 0.34882,2.63692 0.38958,0.92839 1.22621,1.68264 2.3192,1.71432 0.63526,0.0182 1.2607,-0.33475 1.56909,-0.89219 0.30839,-0.55754 0.36843,-1.18568 0.36682,-1.84935 -0.004,-1.32684 -0.31391,-2.90454 -0.57194,-4.461 -0.25796,-1.55655 -0.45229,-3.08947 -0.33837,-4.04395 0.057,-0.47747 0.17846,-0.77307 0.3189,-0.93322 0.14036,-0.16024 0.32929,-0.27384 0.79054,-0.2615 0.45488,0.0122 0.69097,0.12483 0.82198,0.23928 0.13101,0.11437 0.20751,0.2532 0.26202,0.53156 0.109,0.55665 -0.0124,1.58674 -0.21261,2.6612 -0.20016,1.07473 -0.46142,2.18434 -0.43719,3.21672 0.0121,0.5163 0.098,1.05271 0.41323,1.5075 0.31537,0.45497 0.8398,0.71265 1.39541,0.74522 0.46064,0.0271 0.88102,-0.0505 1.23672,-0.27349 0.35569,-0.22306 0.61213,-0.59016 0.7531,-0.95885 0.28203,-0.73745 0.23775,-1.48168 0.21261,-2.157 -0.025,-0.67532 -0.0407,-1.30092 0.021,-1.57246 0.0307,-0.13582 0.0562,-0.15501 0.0568,-0.15554 6.1e-4,-5.1e-4 0.0216,-0.0342 0.20063,-0.029 0.21794,0.005 0.23819,0.0425 0.27101,0.0736 0.0328,0.031 0.0923,0.12248 0.19463,0.32304 0.10226,0.20058 0.24827,0.50789 0.53749,0.77427 0.28932,0.26646 0.7035,0.43865 1.17233,0.46148 1.60943,-0.27583 2.28398,-1.00425 3.4062,-0.0836 l 0,-1.66134 c -1.4875,-0.73615 -2.29389,-0.16099 -3.3448,0.10586 -0.24009,-0.0116 -0.2878,-0.0595 -0.33089,-0.0991 -0.0432,-0.0397 -0.1003,-0.12938 -0.19913,-0.32304 -0.0988,-0.19383 -0.23563,-0.49298 -0.51805,-0.76059 -0.28248,-0.26761 -0.69591,-0.43622 -1.15285,-0.44952 -0.41365,-0.0119 -0.82202,0.10779 -1.13042,0.388 -0.30846,0.28046 -0.47152,0.6683 -0.55246,1.0255 -0.16199,0.71419 -0.0912,1.41292 -0.0674,2.05446 0.0239,0.6418 -0.008,1.20669 -0.0929,1.42888 -0.0426,0.11125 -0.0664,0.13781 -0.12726,0.17604 -0.061,0.0384 -0.19635,0.0897 -0.47163,0.0736 -0.27557,-0.0162 -0.30637,-0.0703 -0.34286,-0.12306 -0.0366,-0.0526 -0.0975,-0.21662 -0.10481,-0.53499 -0.015,-0.63672 0.20013,-1.72004 0.40726,-2.83212 0.20712,-1.11192 0.4237,-2.26505 0.2096,-3.35858 -0.10709,-0.54685 -0.35815,-1.09774 -0.79203,-1.47675 -0.43396,-0.37901 -1.00009,-0.56172 -1.66043,-0.57941 z" id="path14318-5-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccccccccccsccccccccccccccccccccc"/>
+</g>
 <g style="display:inline" transform="translate(13.51115,137.9503)" id="off">
 <ellipse style="color:#000000;text-decoration:none;text-decoration-line:none;display:inline;overflow:visible;visibility:visible;fill:#a40000;fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="ellipse47668" cx="18.48884" cy="190.0497" rx="6.611154" ry="6.515604" />
 <path style="color:#000000;text-decoration:none;text-decoration-line:none;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" d="M 15.90515,187.466 21.07254,192.6334" id="path47670" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" inkscape:transform-center-x="-5.253213" inkscape:transform-center-y="3.571599" />