created new icons

finnboeger · finnboeger · commit 4809a6d9c425 · 2020-04-28T22:53:05.000+02:00
diff --git a/client-data/tools/eraser/eraser.js b/client-data/tools/eraser/eraser.js
@@ -30,7 +30,7 @@
 
 	var currShape = null;
 	var curTool = "click";
-	var icons = ["tools/eraser/icon-red.svg", "tools/eraser/icon.svg",];
+	var icons = ["tools/eraser/icon-click.svg", "tools/eraser/icon-drag.svg",];
 	var toolNames = ["Remove single shape", "Remove all contacted shapes"];
 
 	var msg = {
@@ -133,15 +133,15 @@
 
 	Tools.add({ //The new tool
 		"name": toolNames[0],
-		//"shortcut": "e",
+		"shortcut": "e",
 		"toggle": toggle,
 		"listeners": {
 			"press": startErasing,
 			"move": erase,
 			"release": stopErasing,
 		},
 		"draw": draw,
-		"icon": "tools/eraser/icon-red.svg",
+		"icon": icons[0],
 		"mouseCursor": "crosshair",
 	});
 
diff --git a/client-data/tools/eraser/icon-click.svg b/client-data/tools/eraser/icon-click.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100mm"
+   height="100mm"
+   viewBox="0 0 100 99.999999"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="icon-drag.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-19.140832"
+     inkscape:cy="100.65562"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2067"
+     inkscape:window-x="1080"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.37652324,9.6633453)">
+    <g
+       id="g817"
+       transform="matrix(0.03527778,0,0,-0.03527778,-1.38962,80.110048)"
+       style="fill:#000000;stroke:none">
+      <path
+         id="path815"
+         d="M 1523,2381 C 1479,2353 860,1740 644,1510 546,1405 448,1293 427,1262 361,1163 117,657 86,554 78,527 113,491 193,444 413,315 914,141 1001,163 c 29,7 771,727 984,953 143,153 153,167 227,305 128,240 258,536 258,586 0,65 -153,158 -456,277 -272,107 -427,138 -491,97 z m 268,-117 c 126,-40 432,-156 492,-186 43,-21 61,-56 48,-91 -5,-13 -88,-92 -184,-175 -96,-83 -213,-188 -260,-232 -102,-96 -138,-114 -202,-100 -134,30 -571,193 -619,231 -18,14 -26,30 -26,51 0,26 19,51 123,155 130,133 292,280 377,344 67,50 100,51 251,3 z m 519,-439 c 0,-54 -191,-452 -250,-520 -23,-27 -122,-135 -218,-238 -197,-212 -238,-243 -261,-199 -12,23 49,211 111,342 39,81 52,96 292,339 270,272 326,320 326,276 z m -640,-475 c -27,-50 -123,-150 -239,-250 -70,-60 -133,-121 -140,-137 -8,-15 -30,-77 -51,-138 -81,-238 -213,-569 -236,-595 -40,-43 -25,26 67,305 54,165 104,328 110,362 15,78 1,104 -68,127 -26,9 -166,64 -310,123 -207,84 -263,111 -263,125 0,21 8,22 47,7 118,-46 622,-199 654,-199 55,0 71,10 259,159 91,72 168,131 173,131 4,0 3,-9 -3,-20 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.32132355;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(2.1539436,0,0,2.1539436,36.263169,16.610947)"
+       id="g1228">
+      <g
+         style="fill:#929292;stroke:#ffffff;stroke-opacity:1;stroke-width:2.32132355;stroke-miterlimit:4;stroke-dasharray:none"
+         id="g1226">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 16.5,10 C 14.014719,10 12,12.013568 12,14.505027 V 31 h 9 V 14.505027 C 21,12.016969 18.980224,10 16.5,10 Z m 0,1 C 14.567003,11 13,12.571014 13,14.507035 V 30 h 7 V 14.507035 C 20,12.570153 18.429063,11 16.5,11 Z m 0,1 C 15.119288,12 14,13.128554 14,14.509775 V 18 h 5 V 14.509775 C 19,13.123665 17.890338,12 16.5,12 Z m 0,1 C 15.671573,13 15,13.678546 15,14.500833 V 17 h 3 V 14.500833 C 18,13.671946 17.334203,13 16.5,13 Z M 14,21 v 1 h 5 v -1 z m 0,2 v 1 h 5 V 23 Z M 16,3 v 5 h 1 V 3 Z m 8.979585,3.3052521 -3.535534,3.5355339 0.707106,0.707107 3.535534,-3.5355341 z m 4.012358,8.6866909 h -5 v 1 h 5 z m -24.9838864,1 h 5 v -1 h -5 z M 7.3133087,7.0123589 10.848843,10.547893 11.555949,9.840786 8.0204155,6.3052521 Z"
+           id="path1224"
+           style="stroke:#ffffff;stroke-opacity:1;stroke-width:2.32132355;stroke-miterlimit:4;stroke-dasharray:none" />
+      </g>
+    </g>
+    <g
+       id="Page-1-3"
+       transform="matrix(2.1539436,0,0,2.1539436,36.263169,16.610947)"
+       style="fill:#c80000;fill-rule:evenodd;stroke:none;stroke-width:1;fill-opacity:1">
+      <g
+         id="icon-42-one-finger-click"
+         style="fill:#c80000;fill-opacity:1">
+        <path
+           id="one-finger-click"
+           d="M 16.5,10 C 14.014719,10 12,12.013568 12,14.505027 V 31 h 9 V 14.505027 C 21,12.016969 18.980224,10 16.5,10 Z m 0,1 C 14.567003,11 13,12.571014 13,14.507035 V 30 h 7 V 14.507035 C 20,12.570153 18.429063,11 16.5,11 Z m 0,1 C 15.119288,12 14,13.128554 14,14.509775 V 18 h 5 V 14.509775 C 19,13.123665 17.890338,12 16.5,12 Z m 0,1 C 15.671573,13 15,13.678546 15,14.500833 V 17 h 3 V 14.500833 C 18,13.671946 17.334203,13 16.5,13 Z M 14,21 v 1 h 5 v -1 z m 0,2 v 1 h 5 V 23 Z M 16,3 v 5 h 1 V 3 Z m 8.979585,3.3052521 -3.535534,3.5355339 0.707106,0.707107 3.535534,-3.5355341 z m 4.012358,8.6866909 h -5 v 1 h 5 z m -24.9838864,1 h 5 v -1 h -5 z M 7.3133087,7.0123589 10.848843,10.547893 11.555949,9.840786 8.0204155,6.3052521 Z"
+           inkscape:connector-curvature="0"
+           style="fill:#c80000;fill-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/client-data/tools/eraser/icon-red.svg b/client-data/tools/eraser/icon-red.svg
diff --git a/client-data/tools/eraser/icon.svg b/client-data/tools/eraser/icon.svg
diff --git a/client-data/tools/multi-eraser/icon.svg b/client-data/tools/multi-eraser/icon.svg
@@ -1,7 +1,128 @@
-<svg viewBox="0 0 72 72" xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" stroke="#000" stroke-miterlimit="10">
-        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21.38 50.39l-3.61-28.38M54.26 21.98l-3.75 28.4M40.58 22.09l8.17 10.02M30.42 22.13l17.15 20.64M22.35 24.25l21.87 26.17M23.9 37l12.03 13.63M25.32 49.4l1.36 1.35M23.23 31.23l8.58-9.13M24.61 41.88l18.24-19.75M26.89 50.63l22.49-23.92M36.57 50.63l11.55-11.95M44.22 50.75l2.12-1.79M14.91 12.03h42.05v5.95H14.91z"/>
-        <path d="M42.85 54.4h7.27"/>
-        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M50.12 54.4l-.7 5.57H22.43l-.68-5.57h28.37"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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="100mm"
+   height="100mm"
+   viewBox="0 0 100 99.999999"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <defs
+     id="defs2">
+    <pattern
+       inkscape:collect="always"
+       xlink:href="#Strips1_2"
+       id="pattern2438"
+       patternTransform="matrix(0.78398867,0.77615753,-7.2312485,7.3042091,0,0)" />
+    <pattern
+       inkscape:stockid="Stripes 1:2"
+       id="Strips1_2"
+       patternTransform="translate(0,0) scale(10,10)"
+       height="1"
+       width="3"
+       patternUnits="userSpaceOnUse"
+       inkscape:collect="always">
+      <rect
+         id="rect1710"
+         height="2"
+         width="1"
+         y="-0.5"
+         x="0"
+         style="fill:black;stroke:none" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="215.61154"
+     inkscape:cy="161.84263"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2067"
+     inkscape:window-x="1080"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.37652324,9.6633453)">
+    <rect
+       style="opacity:1;fill:url(#pattern2438);fill-opacity:1;stroke:#c80000;stroke-width:3.89573479;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect918"
+       width="69.301308"
+       height="50.946201"
+       x="22.715767"
+       y="3.9907064" />
+    <g
+       style="fill:#000000;stroke:#ffffff;stroke-width:769.21350098;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(0.01690038,0,0,-0.01690038,5.7830116,80.757532)"
+       id="g924">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 1523,2381 C 1479,2353 860,1740 644,1510 546,1405 448,1293 427,1262 361,1163 117,657 86,554 78,527 113,491 193,444 413,315 914,141 1001,163 c 29,7 771,727 984,953 143,153 153,167 227,305 128,240 258,536 258,586 0,65 -153,158 -456,277 -272,107 -427,138 -491,97 z m 268,-117 c 126,-40 432,-156 492,-186 43,-21 61,-56 48,-91 -5,-13 -88,-92 -184,-175 -96,-83 -213,-188 -260,-232 -102,-96 -138,-114 -202,-100 -134,30 -571,193 -619,231 -18,14 -26,30 -26,51 0,26 19,51 123,155 130,133 292,280 377,344 67,50 100,51 251,3 z m 519,-439 c 0,-54 -191,-452 -250,-520 -23,-27 -122,-135 -218,-238 -197,-212 -238,-243 -261,-199 -12,23 49,211 111,342 39,81 52,96 292,339 270,272 326,320 326,276 z m -640,-475 c -27,-50 -123,-150 -239,-250 -70,-60 -133,-121 -140,-137 -8,-15 -30,-77 -51,-138 -81,-238 -213,-569 -236,-595 -40,-43 -25,26 67,305 54,165 104,328 110,362 15,78 1,104 -68,127 -26,9 -166,64 -310,123 -207,84 -263,111 -263,125 0,21 8,22 47,7 118,-46 622,-199 654,-199 55,0 71,10 259,159 91,72 168,131 173,131 4,0 3,-9 -3,-20 z"
+         id="path922"
+         style="stroke:#ffffff;stroke-width:769.21350098;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
+    <g
+       id="g817"
+       transform="matrix(0.01690038,0,0,-0.01690038,5.7830116,80.757532)"
+       style="fill:#000000;fill-opacity:1;stroke:none">
+      <path
+         id="path815"
+         d="M 1523,2381 C 1479,2353 860,1740 644,1510 546,1405 448,1293 427,1262 361,1163 117,657 86,554 78,527 113,491 193,444 413,315 914,141 1001,163 c 29,7 771,727 984,953 143,153 153,167 227,305 128,240 258,536 258,586 0,65 -153,158 -456,277 -272,107 -427,138 -491,97 z m 268,-117 c 126,-40 432,-156 492,-186 43,-21 61,-56 48,-91 -5,-13 -88,-92 -184,-175 -96,-83 -213,-188 -260,-232 -102,-96 -138,-114 -202,-100 -134,30 -571,193 -619,231 -18,14 -26,30 -26,51 0,26 19,51 123,155 130,133 292,280 377,344 67,50 100,51 251,3 z m 519,-439 c 0,-54 -191,-452 -250,-520 -23,-27 -122,-135 -218,-238 -197,-212 -238,-243 -261,-199 -12,23 49,211 111,342 39,81 52,96 292,339 270,272 326,320 326,276 z m -640,-475 c -27,-50 -123,-150 -239,-250 -70,-60 -133,-121 -140,-137 -8,-15 -30,-77 -51,-138 -81,-238 -213,-569 -236,-595 -40,-43 -25,26 67,305 54,165 104,328 110,362 15,78 1,104 -68,127 -26,9 -166,64 -310,123 -207,84 -263,111 -263,125 0,21 8,22 47,7 118,-46 622,-199 654,-199 55,0 71,10 259,159 91,72 168,131 173,131 4,0 3,-9 -3,-20 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1" />
+    </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#c80000;stroke-width:1.62655199;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect926"
+       width="8.3734484"
+       height="8.3734484"
+       x="86.777077"
+       y="0.85673743" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#c80000;stroke-width:1.62653196;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect926-3"
+       width="8.3733454"
+       height="8.3733454"
+       x="86.776352"
+       y="49.696228" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#c80000;stroke-width:1.62652493;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect926-3-6"
+       width="8.3733091"
+       height="8.3733091"
+       x="19.582485"
+       y="0.85748971" />
+  </g>
 </svg>
diff --git a/client-data/tools/multi-eraser/multi-eraser.js b/client-data/tools/multi-eraser/multi-eraser.js
@@ -173,7 +173,7 @@
 
     Tools.add({ //The new tool
         "name": "Remove in Area",
-        //"shortcut": "e",
+        "shortcut": "m",
         "listeners": {
             "press": startErasing,
             "move": erase,
