diff --git a/imgsrc/edit-cut.svg b/imgsrc/edit-cut.svg index 13d2724fac..0bc092eeea 100644 --- a/imgsrc/edit-cut.svg +++ b/imgsrc/edit-cut.svg @@ -14,7 +14,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="edit-cut.svg"> @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="-38.266034" + inkscape:zoom="5.656854" + inkscape:cx="102.11588" inkscape:cy="95.08399" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -94,7 +94,7 @@ d="m 68.495532,983.86336 q 1.82763,0 3.1632,1.3356 1.33557,1.3356 1.33557,3.1632 0,1.8276 -1.33557,3.1632 -1.33557,1.3356 -3.1632,1.3356 -1.82763,0 -3.1632,-1.3356 -1.33557,-1.3356 -1.33557,-3.1632 0,-1.8276 1.33557,-3.1632 1.33557,-1.3356 3.1632,-1.3356 z m 21.088,4.4988 35.638728,27.97674 q 1.96821,1.4059 1.75733,3.9365 -0.35146,2.4602 -2.46026,3.5849 l -8.99755,4.4988 q -0.91382,0.4921 -2.03851,0.4921 -1.19499,0 -2.17909,-0.5624 l -48.502408,-27.2035 -7.73227,4.6393 q -0.56234,0.2812 -0.84352,0.3515 0.98411,3.4444 0.70294,6.8185 -0.49206,5.4126 -3.93643,10.3682 -3.44438,4.9557 -9.27872,8.6813 -9.27873,5.9046 -19.47126,5.9046 -9.5599,0 -15.6051202,-5.4829 -6.32639997,-5.9046 -5.55318,-14.5507 0.49206,-5.3423 3.93643,-10.3331 3.44437,-4.9909 9.2084302,-8.71644 9.27872,-5.9046 19.54155,-5.9046 5.83435,0 10.61429,2.1791 0.63264,-0.9139 1.54646,-1.5465 l 8.57579,-5.1314 -8.57579,-5.1314 q -0.91382,-0.6327 -1.54646,-1.5465 -4.77994,2.1791 -10.61429,2.1791 -10.26283,0 -19.54155,-5.9046 -5.7640602,-3.7256 -9.2084302,-8.7164 -3.44437,-4.9908 -3.93643,-10.3331 -0.35145997,-4.1473 1.08955,-7.9432 1.44101,-3.7958 4.46363,-6.5373 5.9749302,-5.5531 15.6051202,-5.5531 10.19253,0 19.47126,5.9046 5.83434,3.6553 9.27872,8.6461 3.44437,4.9908 3.93643,10.4034 0.28117,3.3741 -0.70294,6.8185 0.28118,0.07 0.84352,0.3514 l 7.73227,4.6394 48.502408,-27.2035 q 0.9841,-0.5624 2.17909,-0.5624 1.12469,0 2.03851,0.4921 l 8.99755,4.4987 q 2.1088,1.1247 2.46026,3.585 0.21088,2.5306 -1.75733,3.9364 z m -47.86976,-18.2763 q 3.23349,-2.9523 1.47616,-7.5917 -1.75734,-4.6393 -7.4511,-8.2243 -6.46699,-4.1473 -13.49632,-4.1473 -5.20171,0 -7.94315,2.5306 -3.23349,2.9523 -1.47616,7.5916 1.75734,4.6394 7.4511,8.2244 6.46698,4.1473 13.49632,4.1473 5.20171,0 7.94315,-2.5306 z m -5.97494,52.36864 q 5.69376,-3.585 7.4511,-8.2244 1.75733,-4.6393 -1.47616,-7.5916 -2.74144,-2.5306 -7.94315,-2.5306 -7.02934,0 -13.49632,4.1473 -5.69376,3.585 -7.4511,8.2243 -1.75733,4.6394 1.47616,7.5917 2.74144,2.5306 7.94315,2.5306 7.02933,0 13.49632,-4.1473 z m 12.51222,-43.08994 6.74816,4.0771 0,-0.7733 q 0,-2.5305 2.31968,-3.9364 l 0.98411,-0.5623 -5.55318,-3.3038 -1.82763,1.8276 q -0.21088,0.2109 -0.70293,0.7732 -0.49205,0.5624 -0.84352,0.8435 -0.14059,0.1406 -0.28117,0.2461 -0.14059,0.1054 -0.21088,0.1757 z m 15.74571,15.7457 6.74816,2.2494 51.735898,-40.4889 -8.99755,-4.4988 -53.985288,30.2964 0,7.9432 -11.24693,6.7481 0.63264,0.5624 q 0.14058,0.1406 0.49205,0.4217 0.28117,0.2812 0.77323,0.8436 0.49205,0.5623 0.77322,0.84354 l 1.82763,1.8276 z m 49.486508,29.24214 8.99755,-4.4988 -36.552538,-28.67974 -12.44192,9.70054 q -0.14059,0.2109 -0.91382,0.4921 z" id="path4-3" inkscape:connector-curvature="0" - style="fill:#160a02;fill-opacity:1" /> + style="fill:#888888;fill-opacity:1" /> @@ -69,17 +69,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="5.6" inkscape:cx="19.843024" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -135,7 +135,7 @@ d="m 55,1897.4872 63,0 0,-45 -29.25,0 q -2.8125,0 -4.78125,-1.9687 Q 82,1848.5497 82,1845.7372 l 0,-29.25 -27,0 0,81 z m 18,-101.25 0,-4.5 q 0,-0.9141 -0.66797,-1.582 -0.66797,-0.668 -1.58203,-0.668 l -49.5,0 q -0.91406,0 -1.58203,0.668 Q 19,1790.8231 19,1791.7372 l 0,4.5 q 0,0.9141 0.66797,1.582 0.66797,0.668 1.58203,0.668 l 49.5,0 q 0.91406,0 1.58203,-0.668 Q 73,1797.1513 73,1796.2372 Z m 18,47.25 21.02344,0 L 91,1822.4638 l 0,21.0234 z m 36,9 0,47.25 q 0,2.8125 -1.96875,4.7813 -1.96875,1.9687 -4.78125,1.9687 l -67.5,0 q -2.8125,0 -4.78125,-1.9687 Q 46,1902.5497 46,1899.7372 l 0,-11.25 -38.25,0 q -2.8125,0 -4.78125,-1.9687 Q 1,1884.5497 1,1881.7372 l 0,-94.5 q 0,-2.8125 1.96875,-4.7813 1.96875,-1.9687 4.78125,-1.9687 l 76.5,0 q 2.8125,0 4.78125,1.9687 Q 91,1784.4247 91,1787.2372 l 0,23.0625 q 1.47656,0.9141 2.53125,1.9687 l 28.6875,28.6875 q 1.96875,1.9688 3.375,5.3438 1.40625,3.375 1.40625,6.1875 z" id="path4" /> diff --git a/imgsrc/edit-select-all.svg b/imgsrc/edit-select-all.svg index 9579247c96..be9fc12271 100644 --- a/imgsrc/edit-select-all.svg +++ b/imgsrc/edit-select-all.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="edit-select-all.svg"> @@ -23,11 +23,11 @@ inkscape:collect="always" id="linearGradient4142"> @@ -48,17 +48,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="5.6" inkscape:cx="19.843024" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -115,7 +115,7 @@ id="path4" style="fill:url(#linearGradient4148);fill-opacity:1" /> diff --git a/imgsrc/format-fill-color.svg b/imgsrc/format-fill-color.svg index e271fae795..301d6babe4 100644 --- a/imgsrc/format-fill-color.svg +++ b/imgsrc/format-fill-color.svg @@ -14,7 +14,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-fill-color.svg"> @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="5.6" inkscape:cx="19.843024" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -86,51 +86,47 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-924.36216)"> - - - - - - - - - + + + + + + + diff --git a/imgsrc/format-indent-less.svg b/imgsrc/format-indent-less.svg index 007821df9e..d4fcf8ebb8 100644 --- a/imgsrc/format-indent-less.svg +++ b/imgsrc/format-indent-less.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - 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="128" @@ -15,51 +14,10 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-indent-less.svg"> - - - - - - - - + id="defs4" /> @@ -131,22 +89,23 @@ + style="fill:#2271d5;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + transform="translate(-45,0)" + style="fill:#2271d5;fill-opacity:1"> @@ -154,6 +113,6 @@ + style="fill-opacity:1;fill:#2271d5" /> diff --git a/imgsrc/format-indent-more.svg b/imgsrc/format-indent-more.svg index 9088f7eb9f..2f4b33f078 100644 --- a/imgsrc/format-indent-more.svg +++ b/imgsrc/format-indent-more.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - 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="128" @@ -15,51 +14,10 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-indent-more.svg"> - - - - - - - - + id="defs4" /> @@ -131,21 +89,22 @@ + style="fill:#2271d5;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + id="g4144" + style="fill:#2271d5;fill-opacity:1"> @@ -153,6 +112,6 @@ + style="fill-opacity:1;fill:#2271d5" /> diff --git a/imgsrc/format-justify-center.svg b/imgsrc/format-justify-center.svg index d9aad21929..2a134252c7 100644 --- a/imgsrc/format-justify-center.svg +++ b/imgsrc/format-justify-center.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-justify-center.svg"> @@ -23,15 +23,15 @@ inkscape:collect="always" id="linearGradient4139"> + style="stop-color:#b2cffa;stop-opacity:1" /> @@ -52,17 +52,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="7.919596" inkscape:cx="15.309153" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> diff --git a/imgsrc/format-justify-fill.svg b/imgsrc/format-justify-fill.svg index 39d5bfcceb..6516aa2895 100644 --- a/imgsrc/format-justify-fill.svg +++ b/imgsrc/format-justify-fill.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-justify-fill.svg"> @@ -23,15 +23,15 @@ inkscape:collect="always" id="linearGradient4139"> + style="stop-color:#0b59bd;stop-opacity:1" /> @@ -52,17 +52,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="5.6" inkscape:cx="49.38296" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> diff --git a/imgsrc/format-justify-left.svg b/imgsrc/format-justify-left.svg index b34f2ca67f..16f7552e3a 100644 --- a/imgsrc/format-justify-left.svg +++ b/imgsrc/format-justify-left.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-justify-left.svg"> @@ -23,11 +23,11 @@ inkscape:collect="always" id="linearGradient4139"> @@ -48,17 +48,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="7.919596" inkscape:cx="23.828721" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> diff --git a/imgsrc/format-justify-right.svg b/imgsrc/format-justify-right.svg index a34cf16804..e5e65e2f6d 100644 --- a/imgsrc/format-justify-right.svg +++ b/imgsrc/format-justify-right.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-justify-right.svg"> @@ -23,11 +23,11 @@ inkscape:collect="always" id="linearGradient4139"> @@ -48,17 +48,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="5.6" inkscape:cx="-10.424833" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> diff --git a/imgsrc/format-list-ordered.svg b/imgsrc/format-list-ordered.svg index db6a5b0ba4..5b298e8de0 100644 --- a/imgsrc/format-list-ordered.svg +++ b/imgsrc/format-list-ordered.svg @@ -15,19 +15,19 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="chapters.svg"> + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="format-list-ordered.svg"> @@ -48,17 +48,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="19.843024" + inkscape:zoom="5.656854" + inkscape:cx="-24.881482" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -111,19 +111,19 @@ transform="translate(0,-924.36216)"> + style="fill:#2caf45;fill-opacity:1"> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + id="linearGradient848"> + id="stop844" /> + id="stop846" /> - - - - + xlink:href="#linearGradient848" + id="linearGradient850" + x1="82.474236" + y1="944.56732" + x2="82.705093" + y2="1032.0718" + gradientUnits="userSpaceOnUse" /> @@ -145,48 +109,56 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-924.36216)"> - - - - - - - - + + + + + + + + + + + + diff --git a/imgsrc/format-text-bold.svg b/imgsrc/format-text-bold.svg index dec5345005..7ac0205cfd 100644 --- a/imgsrc/format-text-bold.svg +++ b/imgsrc/format-text-bold.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-text-bold.svg"> @@ -23,11 +23,11 @@ inkscape:collect="always" id="linearGradient4235"> @@ -50,17 +50,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.999999" + inkscape:zoom="5.6568539" inkscape:cx="29.797726" inkscape:cy="52.767291" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" showguides="false" /> @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="7.919596" inkscape:cx="53.188911" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -93,7 +93,7 @@ transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" y="732.13635" x="-634.40143" - style="fill:#0a50a9;fill-opacity:1" /> + style="fill:#2271d5;fill-opacity:1" /> @@ -23,11 +23,11 @@ inkscape:collect="always" id="linearGradient4139"> @@ -50,17 +50,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.839192" + inkscape:zoom="7.919596" inkscape:cx="61.892855" - inkscape:cy="54.756941" + inkscape:cy="82.536136" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> diff --git a/imgsrc/format-text-hr.svg b/imgsrc/format-text-hr.svg index d8b90818ae..ace5eb2377 100644 --- a/imgsrc/format-text-hr.svg +++ b/imgsrc/format-text-hr.svg @@ -14,7 +14,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.92.1 r" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-text-hr.svg"> @@ -26,16 +26,16 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="15.839192" - inkscape:cx="50.735407" + inkscape:cx="34.76237" inkscape:cy="62.616635" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -89,7 +89,7 @@ diff --git a/imgsrc/format-text-italic.svg b/imgsrc/format-text-italic.svg index 95b4fe7a7a..b434267590 100644 --- a/imgsrc/format-text-italic.svg +++ b/imgsrc/format-text-italic.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-text-italic.svg"> @@ -23,11 +23,11 @@ inkscape:collect="always" id="linearGradient4139"> @@ -50,17 +50,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.839192" + inkscape:zoom="5.6" inkscape:cx="43.191939" inkscape:cy="49.735915" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> diff --git a/imgsrc/format-text-strikethrough.svg b/imgsrc/format-text-strikethrough.svg index 125712143e..538fab184e 100644 --- a/imgsrc/format-text-strikethrough.svg +++ b/imgsrc/format-text-strikethrough.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - 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="128" @@ -15,56 +14,10 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-text-strikethrough.svg"> - - - - - - - - + id="defs4" /> @@ -133,28 +86,20 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-924.36216)"> - - - - - - - + + + diff --git a/imgsrc/format-text-subscript.svg b/imgsrc/format-text-subscript.svg index aae27b95cc..49e8de8f87 100644 --- a/imgsrc/format-text-subscript.svg +++ b/imgsrc/format-text-subscript.svg @@ -14,7 +14,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-text-subscript.svg"> @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.839192" + inkscape:zoom="5.6" inkscape:cx="61.234372" inkscape:cy="36.681475" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -89,12 +89,12 @@ diff --git a/imgsrc/format-text-superscript.svg b/imgsrc/format-text-superscript.svg index 5a083576d3..e033b7b3ee 100644 --- a/imgsrc/format-text-superscript.svg +++ b/imgsrc/format-text-superscript.svg @@ -89,12 +89,12 @@ diff --git a/imgsrc/format-text-underline.svg b/imgsrc/format-text-underline.svg index b203d40fac..ff41709eeb 100644 --- a/imgsrc/format-text-underline.svg +++ b/imgsrc/format-text-underline.svg @@ -14,7 +14,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="format-text-underline.svg"> @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.839192" + inkscape:zoom="5.6" inkscape:cx="50.735407" inkscape:cy="44.938966" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0" /> @@ -89,12 +89,12 @@ diff --git a/imgsrc/generate.py b/imgsrc/generate.py index 56a32f7791..4a4f9e1546 100755 --- a/imgsrc/generate.py +++ b/imgsrc/generate.py @@ -3,7 +3,7 @@ # License: GPLv3 Copyright: 2016, Kovid Goyal from __future__ import absolute_import, division, print_function, unicode_literals -import os, glob, subprocess, argparse +import os, glob, subprocess, argparse, json, hashlib duplicates = { 'character-set': ['languages'], @@ -26,6 +26,13 @@ skip = {'calibre'} j = os.path.join base = os.path.dirname(os.path.abspath(__file__)) output_base = j(os.path.dirname(base), 'resources', 'images') +hash_path = j(os.path.dirname(base), '.build-cache', 'imgsrc-gen.json') +if os.path.exists(hash_path): + with open(hash_path, 'rb') as f: + hashes = json.load(f) +else: + hashes = {} +src_hashes = {} def iterfiles(only=()): @@ -33,6 +40,9 @@ def iterfiles(only=()): name = os.path.relpath(src, base).rpartition('.')[0] if only and name not in only: continue + src_hashes[name] = h = hashlib.sha1(open(src, 'rb').read()).hexdigest() + if not only and h == hashes.get(name): + continue output_names = [n for n in [name] + duplicates.get(name, []) if n not in skip] output_files = [j(output_base, n) + '.png' for n in output_names] if output_files: @@ -53,6 +63,8 @@ def render(src, output_files): size = sizes.get(oname, '128') print('Rendering', oname, 'at size:', size) rsvg(src, size, dest) + name = os.path.relpath(src, base).rpartition('.')[0] + hashes[name] = src_hashes[name] def main(): @@ -61,6 +73,8 @@ def main(): args = p.parse_args() for src, ofiles in iterfiles(args.only): render(src, ofiles) + with open(hash_path, 'w') as f: + json.dump(hashes, f, indent=2, sort_keys=True) if __name__ == '__main__': diff --git a/imgsrc/insert-link.svg b/imgsrc/insert-link.svg index 0b56316157..09c7a0db9b 100644 --- a/imgsrc/insert-link.svg +++ b/imgsrc/insert-link.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="insert-link.svg"> @@ -28,7 +28,7 @@ fx="64" fy="999.36212" r="29" - gradientTransform="matrix(1,0,0,1.0000021,1.0000001e-7,16.480093)" + gradientTransform="matrix(1,0,0,1.0000021,1.0000001e-7,11.18662)" gradientUnits="userSpaceOnUse" /> - - - @@ -144,42 +111,35 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-924.36216)"> + + - - - - - - - - + id="g4145" + style="fill:#2caf45;fill-opacity:1" + transform="matrix(1.26,0,0,1.3012362,-13.737501,-323.90011)"> + + diff --git a/imgsrc/trash.svg b/imgsrc/trash.svg index dfa549db82..a9b5cd9bb4 100644 --- a/imgsrc/trash.svg +++ b/imgsrc/trash.svg @@ -14,7 +14,7 @@ viewBox="0 0 128 128" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="trash.svg"> @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" + inkscape:zoom="7.919596" inkscape:cx="16.864956" inkscape:cy="69.707741" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" - inkscape:window-width="3840" - inkscape:window-height="2128" + inkscape:window-width="2560" + inkscape:window-height="1400" inkscape:window-x="0" - inkscape:window-y="32" + inkscape:window-y="40" inkscape:window-maximized="0"> + style="fill:#2caf45;fill-opacity:1"> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> + style="fill:#2caf45;fill-opacity:1" /> diff --git a/resources/images/edit-cut.png b/resources/images/edit-cut.png index 9d1dda1b32..fc857db739 100644 Binary files a/resources/images/edit-cut.png and b/resources/images/edit-cut.png differ diff --git a/resources/images/edit-paste.png b/resources/images/edit-paste.png index 59b571dfe4..9085e3df3e 100644 Binary files a/resources/images/edit-paste.png and b/resources/images/edit-paste.png differ diff --git a/resources/images/edit-select-all.png b/resources/images/edit-select-all.png index e677bf7294..5eaa5cbb56 100644 Binary files a/resources/images/edit-select-all.png and b/resources/images/edit-select-all.png differ diff --git a/resources/images/format-fill-color.png b/resources/images/format-fill-color.png index d139e8a24f..528e840cf2 100644 Binary files a/resources/images/format-fill-color.png and b/resources/images/format-fill-color.png differ diff --git a/resources/images/format-indent-less.png b/resources/images/format-indent-less.png index b98db349d4..f202a12b82 100644 Binary files a/resources/images/format-indent-less.png and b/resources/images/format-indent-less.png differ diff --git a/resources/images/format-indent-more.png b/resources/images/format-indent-more.png index 7d171b765e..261c0cfe28 100644 Binary files a/resources/images/format-indent-more.png and b/resources/images/format-indent-more.png differ diff --git a/resources/images/format-justify-center.png b/resources/images/format-justify-center.png index 3bbb97cc99..09ce1a0452 100644 Binary files a/resources/images/format-justify-center.png and b/resources/images/format-justify-center.png differ diff --git a/resources/images/format-justify-fill.png b/resources/images/format-justify-fill.png index 9fc6a2e4f7..e98ef5fe0e 100644 Binary files a/resources/images/format-justify-fill.png and b/resources/images/format-justify-fill.png differ diff --git a/resources/images/format-justify-left.png b/resources/images/format-justify-left.png index a00a82ff6d..d6bd02703e 100644 Binary files a/resources/images/format-justify-left.png and b/resources/images/format-justify-left.png differ diff --git a/resources/images/format-justify-right.png b/resources/images/format-justify-right.png index 4638e1f50c..af8d48ef69 100644 Binary files a/resources/images/format-justify-right.png and b/resources/images/format-justify-right.png differ diff --git a/resources/images/format-list-ordered.png b/resources/images/format-list-ordered.png index 2aff6ec4df..769d3e201d 100644 Binary files a/resources/images/format-list-ordered.png and b/resources/images/format-list-ordered.png differ diff --git a/resources/images/format-list-unordered.png b/resources/images/format-list-unordered.png index f934cc207c..183d92e8cc 100644 Binary files a/resources/images/format-list-unordered.png and b/resources/images/format-list-unordered.png differ diff --git a/resources/images/format-text-bold.png b/resources/images/format-text-bold.png index d8d3c1b721..f185fe62b0 100644 Binary files a/resources/images/format-text-bold.png and b/resources/images/format-text-bold.png differ diff --git a/resources/images/format-text-color.png b/resources/images/format-text-color.png index 661457cf61..2f62ae6ded 100644 Binary files a/resources/images/format-text-color.png and b/resources/images/format-text-color.png differ diff --git a/resources/images/format-text-heading.png b/resources/images/format-text-heading.png index 79a539372d..ba93ca6b1f 100644 Binary files a/resources/images/format-text-heading.png and b/resources/images/format-text-heading.png differ diff --git a/resources/images/format-text-hr.png b/resources/images/format-text-hr.png index 1503679e6a..294df4911f 100644 Binary files a/resources/images/format-text-hr.png and b/resources/images/format-text-hr.png differ diff --git a/resources/images/format-text-italic.png b/resources/images/format-text-italic.png index bb3b94f108..c8cb520438 100644 Binary files a/resources/images/format-text-italic.png and b/resources/images/format-text-italic.png differ diff --git a/resources/images/format-text-strikethrough.png b/resources/images/format-text-strikethrough.png index 2a6f03d9b9..f623b59fde 100644 Binary files a/resources/images/format-text-strikethrough.png and b/resources/images/format-text-strikethrough.png differ diff --git a/resources/images/format-text-subscript.png b/resources/images/format-text-subscript.png index 0d743b27e9..66c1e3b2ea 100644 Binary files a/resources/images/format-text-subscript.png and b/resources/images/format-text-subscript.png differ diff --git a/resources/images/format-text-superscript.png b/resources/images/format-text-superscript.png index 90f6288004..b81337d9fa 100644 Binary files a/resources/images/format-text-superscript.png and b/resources/images/format-text-superscript.png differ diff --git a/resources/images/format-text-underline.png b/resources/images/format-text-underline.png index 0aa434d1da..8afbeb2b75 100644 Binary files a/resources/images/format-text-underline.png and b/resources/images/format-text-underline.png differ diff --git a/resources/images/insert-link.png b/resources/images/insert-link.png index 57ad099efb..12f65a2c22 100644 Binary files a/resources/images/insert-link.png and b/resources/images/insert-link.png differ diff --git a/resources/images/lookfeel.png b/resources/images/lookfeel.png index 661457cf61..2f62ae6ded 100644 Binary files a/resources/images/lookfeel.png and b/resources/images/lookfeel.png differ diff --git a/resources/images/trash.png b/resources/images/trash.png index d237e83988..3fcf940149 100644 Binary files a/resources/images/trash.png and b/resources/images/trash.png differ diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py index 7aa647e209..451ae4414f 100644 --- a/src/calibre/gui2/comments_editor.py +++ b/src/calibre/gui2/comments_editor.py @@ -1185,7 +1185,8 @@ class Editor(QWidget): # {{{ if __name__ == '__main__': - app = QApplication([]) + from calibre.gui2 import Application + app = Application([]) w = Editor() w.resize(800, 600) w.show()