Merge branch 'master' of http://git.osmesh.ru/MOS/OpenBoardNEW

2 years ago · e4774424ba
parent ab27e99375 4ee61fbd17
commit e4774424ba
3 changed files with 83 additions and 83 deletions
--- a/resources/images/toolbar/dashedLine.svg
+++ b/resources/images/toolbar/dashedLine.svg
@ -32,9 +32,9 @@
     fit-margin-right="0"
     fit-margin-bottom="0"
     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="36.125"
-     inkscape:cy="25.65625"
+     inkscape:zoom="11.313708"
+     inkscape:cx="18.870913"
+     inkscape:cy="20.903845"
     inkscape:window-width="1920"
     inkscape:window-height="1003"
     inkscape:window-x="0"
@ -95,11 +95,10 @@
       id="g965"
       inkscape:label="line">
      <path
-         id="path924"
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         d="m 32.630859,5.7675781 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 0.337891,1.2441407 l -1.869141,1.8691402 a 0.75,0.75 0 0 0 0,1.060547 0.75,0.75 0 0 0 1.060547,0 l 1.91211,-1.910156 a 2.5,2.5 0 0 0 1.058593,0.236328 2.5,2.5 0 0 0 2.5,-2.4999999 2.5,2.5 0 0 0 -2.5,-2.5 z M 25.751953,14.367188 A 0.75,0.75 0 0 0 25.416016,14.5625 l -3.181641,3.179688 a 0.75,0.75 0 0 0 -0.002,1.060546 0.75,0.75 0 0 0 1.060547,0 l 3.183593,-3.179687 a 0.75,0.75 0 0 0 0,-1.060547 0.75,0.75 0 0 0 -0.724609,-0.195312 z m -6.171875,6.33789 a 0.75,0.75 0 0 0 -0.529297,0.21875 l -3.183593,3.181641 a 0.75,0.75 0 0 0 0,1.060547 0.75,0.75 0 0 0 1.060546,0 l 3.183594,-3.181641 a 0.75,0.75 0 0 0 0,-1.060547 0.75,0.75 0 0 0 -0.53125,-0.21875 z m -6.558594,6.384766 a 0.75,0.75 0 0 0 -0.335937,0.193359 v 0.002 l -2.396485,2.396485 a 2.5,2.5 0 0 0 -1.0292964,-0.222657 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 2.5000004,-2.5 2.5,2.5 0 0 0 -0.351563,-1.277343 l 2.337891,-2.333985 a 0.75,0.75 0 0 0 0,-1.060547 0.75,0.75 0 0 0 -0.72461,-0.197265 z"
-         transform="translate(152.84748,194.2822)"
-         inkscape:label="line" />
+         style="fill:none;stroke:#000000;stroke-width:3.6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:10.8,10.8;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 154.68586,234.52153 38.80777,-38.81827"
+         id="path963"
+         sodipodi:nodetypes="cc" />
    </g>
  </g>
  <metadata
--- a/resources/images/toolbar/dottedLine.svg
+++ b/resources/images/toolbar/dottedLine.svg
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="42"
-   height="42"
-   viewBox="0 0 42 42"
-   version="1.1"
-   id="svg38508"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   sodipodi:docname="dottedLine.svg"
-   inkscape:export-filename="/home/dmitry/git/OpenBoard/resources/images/stylusPalette/arrow_svg.png"
-   inkscape:export-xdpi="96"
   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/home/dmitry/git/OpenBoard/resources/images/stylusPalette/arrow_svg.png"
+   sodipodi:docname="dottedLine.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   id="svg38508"
+   version="1.1"
+   viewBox="0 0 42 42"
+   height="42"
+   width="42"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
@ -32,9 +32,9 @@
     fit-margin-right="0"
     fit-margin-bottom="0"
     units="px"
-     inkscape:zoom="15.999999"
-     inkscape:cx="11.937501"
-     inkscape:cy="21.843751"
+     inkscape:zoom="7.9999996"
+     inkscape:cx="41.437502"
+     inkscape:cy="-10.0625"
     inkscape:window-width="1920"
     inkscape:window-height="1003"
     inkscape:window-x="0"
@ -52,7 +52,40 @@
       dotted="false" />
  </sodipodi:namedview>
  <defs
-     id="defs38505" />
+     id="defs38505">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter37990-9-5"
+       inkscape:label="shadowFilter"
+       x="-0.067811772"
+       y="-0.07751945"
+       width="1.1356235"
+       height="1.1873387">
+      <feGaussianBlur
+         stdDeviation="0.29999999999999999"
+         id="feGaussianBlur37992-3-6" />
+      <feOffset
+         dx="0"
+         dy="0.29999999999999999"
+         id="feOffset37994-2-2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter37990-9-5-3"
+       inkscape:label="shadowFilter"
+       x="-0.067811772"
+       y="-0.07751945"
+       width="1.1356235"
+       height="1.1873387">
+      <feGaussianBlur
+         stdDeviation="0.29999999999999999"
+         id="feGaussianBlur37992-3-6-6" />
+      <feOffset
+         dx="0"
+         dy="0.29999999999999999"
+         id="feOffset37994-2-2-7" />
+    </filter>
+  </defs>
  <g
     inkscape:label="icon"
     inkscape:groupmode="layer"
@ -62,61 +95,29 @@
       id="g965"
       inkscape:label="line">
      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="path924"
-         cx="162.10703"
-         cy="226.24127"
-         r="2.5" />
-      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle2388"
-         cx="185.47798"
-         cy="202.55002"
-         r="2.5" />
-      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle8958"
-         cx="165.07516"
-         cy="223.10866"
-         r="0.92641801" />
-      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle8960"
-         cx="168.28769"
-         cy="219.94017"
-         r="0.92641801" />
-      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle8962"
-         cx="171.36667"
-         cy="216.82213"
-         r="0.92641801"
-         inkscape:transform-center-x="3.5829441"
-         inkscape:transform-center-y="3.6870863" />
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.53588;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.878431;paint-order:stroke fill markers"
+         id="circle2549"
+         cx="157.40373"
+         cy="231.92728"
+         r="3.4577076" />
      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle8964"
-         cx="174.5519"
-         cy="213.59831"
-         r="0.92641801"
-         inkscape:transform-center-x="3.5829441"
-         inkscape:transform-center-y="3.6870863" />
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.53588;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.878431;paint-order:stroke fill markers"
+         id="circle2587"
+         cx="168.27238"
+         cy="221.2583"
+         r="3.4577076" />
      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle8966"
-         cx="177.78484"
-         cy="210.45396"
-         r="0.92641801"
-         inkscape:transform-center-x="3.5829441"
-         inkscape:transform-center-y="3.6870863" />
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.53588;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.878431;paint-order:stroke fill markers"
+         id="circle2589"
+         cx="179.28416"
+         cy="210.2368"
+         r="3.4577076" />
      <circle
-         style="fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="circle8968"
-         cx="181.0356"
-         cy="207.29105"
-         r="0.92641801"
-         inkscape:transform-center-x="3.5829441"
-         inkscape:transform-center-y="3.6870863" />
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.53588;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.878431;paint-order:stroke fill markers"
+         id="circle2591"
+         cx="190.15662"
+         cy="199.18091"
+         r="3.4577076" />
    </g>
  </g>
  <metadata
--- a/resources/images/toolbar/solidLine.svg
+++ b/resources/images/toolbar/solidLine.svg
@ -5,8 +5,8 @@
   viewBox="0 0 42 42"
   version="1.1"
   id="svg38508"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   sodipodi:docname="line.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="solidLine.svg"
   inkscape:export-filename="/home/dmitry/git/OpenBoard/resources/images/stylusPalette/arrow_svg.png"
   inkscape:export-xdpi="96"
   inkscape:export-ydpi="96"
@ -34,11 +34,11 @@
     units="px"
     inkscape:zoom="11.313708"
     inkscape:cx="18.870913"
-     inkscape:cy="20.948039"
+     inkscape:cy="20.903845"
     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:window-height="1003"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
     inkscape:window-maximized="1"
     inkscape:current-layer="g965"
     inkscape:document-rotation="0"
@ -95,10 +95,10 @@
       id="g965"
       inkscape:label="line">
      <path
-         id="path870"
-         style="opacity:1;fill:#000000;fill-opacity:0.996078;stroke:#ffffff;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 183.69862,200.789 a 2.510057,2.510057 0 0 0 -0.46874,2.87621 l -20.15377,20.26078 a 2.5100567,2.5100567 0 0 0 -2.74332,0.54642 2.5100567,2.5100567 0 0 0 0.009,3.55041 2.5100567,2.5100567 0 0 0 3.55041,-0.009 2.5100567,2.5100567 0 0 0 0.46567,-2.87926 l 20.15682,-20.26387 a 2.510057,2.510057 0 0 0 2.74334,-0.54028 2.510057,2.510057 0 0 0 -0.009,-3.5504 2.510057,2.510057 0 0 0 -3.5504,0.009 z"
-         inkscape:label="line" />
+         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 155.10847,234.22611 192.7862,196.30525"
+         id="path963"
+         sodipodi:nodetypes="cc" />
    </g>
  </g>
  <metadata