Fixed conflicts after merge with master

2025-08-09 14:55:08 -06:00 · 2020-08-04 09:58:19 +02:00 · 2020-08-04 09:58:19 +02:00 · 25c3552555
commit 25c3552555
parent 0840b2328a e79382c3f6
68 changed files with 4042 additions and 1798 deletions
--- a/resources/icons/cancel.svg
+++ b/resources/icons/cancel.svg
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="resin">
+	<rect x="4" y="7" fill="#ED6B21" width="8" height="8"/>
+	<path fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" d="M4.5,15h6.99c0.28,0,0.5-0.23,0.5-0.5V6
+		c0-1-2-1-2-2s0-1,0-1h1V1.5C11,1.23,10.77,1,10.5,1H5.5C5.23,1,5,1.23,5,1.5V3h1v1c0,1-2,1-2,2v8.5C4,14.77,4.23,15,4.5,15z"/>
+</g>
+</svg>
--- a/resources/icons/cross_focus_large.svg
+++ b/resources/icons/cross_focus_large.svg
@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="cross_megafocus.svg"
+   xml:space="preserve"
+   enable-background="new 0 0 16 16"
+   viewBox="0 0 16 16"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.0"><metadata
+   id="metadata16"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs14" /><sodipodi:namedview
+   inkscape:current-layer="Layer_1"
+   inkscape:window-maximized="1"
+   inkscape:window-y="-9"
+   inkscape:window-x="-9"
+   inkscape:cy="8"
+   inkscape:cx="8"
+   inkscape:zoom="47.0625"
+   showgrid="false"
+   id="namedview12"
+   inkscape:window-height="1721"
+   inkscape:window-width="3200"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0"
+   guidetolerance="10"
+   gridtolerance="10"
+   objecttolerance="10"
+   borderopacity="1"
+   bordercolor="#666666"
+   pagecolor="#ffffff" />
+<g
+   style="opacity:1;fill-opacity:1"
+   transform="matrix(1.1,0,0,1.1,-0.8,-0.8)"
+   id="cross">
+	<g
+   style="fill-opacity:1"
+   id="g4">
+		
+			<line
+   style="fill-opacity:1"
+   id="line2"
+   y2="14"
+   x2="2"
+   y1="2"
+   x1="14"
+   stroke-miterlimit="10"
+   stroke-linecap="round"
+   stroke-width="3"
+   stroke="#ed6b21"
+   fill="none" />
+	</g>
+	<g
+   style="fill-opacity:1"
+   id="g8">
+		
+			<line
+   style="fill-opacity:1"
+   id="line6"
+   y2="14"
+   x2="14"
+   y1="2"
+   x1="2"
+   stroke-miterlimit="10"
+   stroke-linecap="round"
+   stroke-width="3"
+   stroke="#ed6b21"
+   fill="none" />
+	</g>
+</g>
+</svg>
--- a/resources/icons/timer_dot.svg
+++ b/resources/icons/timer_dot.svg
@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="timer_dot.svg"
+   xml:space="preserve"
+   enable-background="new 0 0 16 16"
+   viewBox="0 0 16 16"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.0"><metadata
+   id="metadata11"><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 /></cc:Work></rdf:RDF></metadata><defs
+   id="defs9"><linearGradient
+     id="linearGradient830"
+     inkscape:collect="always"><stop
+       id="stop826"
+       offset="0"
+       style="stop-color:#000000;stop-opacity:1;" /><stop
+       id="stop828"
+       offset="1"
+       style="stop-color:#000000;stop-opacity:0;" /></linearGradient><radialGradient
+     gradientUnits="userSpaceOnUse"
+     r="3.5"
+     fy="8"
+     fx="8"
+     cy="8"
+     cx="8"
+     id="radialGradient832"
+     xlink:href="#linearGradient830"
+     inkscape:collect="always" /></defs><sodipodi:namedview
+   inkscape:document-rotation="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:window-maximized="1"
+   inkscape:window-y="-11"
+   inkscape:window-x="-11"
+   inkscape:cy="6.66147"
+   inkscape:cx="7.0304602"
+   inkscape:zoom="83.4386"
+   showgrid="false"
+   id="namedview7"
+   inkscape:window-height="2066"
+   inkscape:window-width="3840"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0"
+   guidetolerance="10"
+   gridtolerance="10"
+   objecttolerance="10"
+   borderopacity="1"
+   bordercolor="#666666"
+   pagecolor="#ffffff" />
+<g
+   transform="matrix(0.7,0,0,0.7,2.4,2.4)"
+   style="fill:#bf6637;fill-opacity:1;stroke:none;stroke-opacity:1"
+   id="g4">
+	<circle
+   style="fill:#bf6637;fill-opacity:1;stroke:none;stroke-opacity:1"
+   id="circle2"
+   r="3"
+   cy="8"
+   cx="8" />
+</g>
+</svg>
--- a/resources/icons/timer_dot_empty.svg
+++ b/resources/icons/timer_dot_empty.svg
@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="timer_dot_empty.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+   id="metadata11"><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><defs
+   id="defs9"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient830"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop826" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop828" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient830"
+     id="radialGradient832"
+     cx="8"
+     cy="8"
+     fx="8"
+     fy="8"
+     r="3.5"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="3840"
+   inkscape:window-height="2066"
+   id="namedview7"
+   showgrid="false"
+   inkscape:zoom="83.4386"
+   inkscape:cx="7.0304602"
+   inkscape:cy="6.66147"
+   inkscape:window-x="-11"
+   inkscape:window-y="-11"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<g
+   id="g4"
+   style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+   transform="matrix(0.7,0,0,0.7,2.4,2.4)">
+	<circle
+   cx="8"
+   cy="8"
+   r="3"
+   id="circle2"
+   style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
+</g>
+</svg>