Merge branch 'feature/upstream' into develop

1 files changed, 301 insertions, 0 deletions

diff --git a/app/bin/bitmaps/svg/circle.svg b/app/bin/bitmaps/svg/circle.svg
new file mode 100644
index 0000000..660e7fd
--- /dev/null
+++ b/app/bin/bitmaps/svg/circle.svg
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata2607"><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="defs2605"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1130"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1126"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1118"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.7756386,23.899697 5.5479404,-6.428566 28.268076,0.264187 5.636002,6.340504 -6.340502,6.60469 -28.0038892,-0.176125 z"
+       id="path1120" /><path
+       id="lpe_path-effect1126"
+       style="fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -0.81667071,-1.0453595 H 49.139391 V 48.910703 H -0.81667071 Z m 5.59230931,24.9450565 5.1076272,6.60469 28.0038892,0.176125 6.340502,-6.60469 -5.636002,-6.340504 -28.268076,-0.264187 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1122"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.7756386,23.899697 5.5479404,-6.428566 28.268076,0.264187 5.636002,6.340504 -6.340502,6.60469 -28.0038892,-0.176125 z"
+       id="path1124" /><path
+       id="lpe_path-effect1130"
+       style="fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -2,-2.5284135 H 50.322721 V 50.393757 H -2 Z m 6.7756386,26.4281105 5.1076272,6.60469 28.0038892,0.176125 6.340502,-6.60469 -5.636002,-6.340504 -28.268076,-0.264187 z" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1594"
+   inkscape:window-height="933"
+   id="namedview2603"
+   showgrid="false"
+   inkscape:zoom="10.631993"
+   inkscape:cx="24.031242"
+   inkscape:cy="23.843131"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="false"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2554">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st4{fill:#FB0000;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g2669"
+   inkscape:label="ties"
+   transform="matrix(1.1036179,0,0,1.0877739,-2.4767987,-1.9863076)"
+   clip-path="url(#clipPath1122)"
+   inkscape:path-effect="#path-effect1130"><line
+     class="st0"
+     x1="32"
+     y1="43.900002"
+     x2="28.799999"
+     y2="35.900002"
+     id="line2586"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 32,43.900002 -3.200001,-8" /><line
+     class="st0"
+     x1="23.9"
+     y1="2.482697"
+     x2="24"
+     y2="11.482697"
+     id="line2556"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 23.9,2.482697 0.1,9" /><line
+     class="st0"
+     x1="23.900255"
+     y1="36.408672"
+     x2="23.999744"
+     y2="45.382671"
+     id="line2558"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 23.900255,36.408672 0.09949,8.973999" /><line
+     class="st0"
+     x1="36.5"
+     y1="24"
+     x2="45.299999"
+     y2="24.200001"
+     id="line2560"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 36.5,24 8.799999,0.200001" /><line
+     class="st0"
+     x1="3"
+     y1="25"
+     x2="12"
+     y2="25"
+     id="line2562"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 3,25 h 9" /><line
+     class="st0"
+     x1="8.3002796"
+     y1="9.5427513"
+     x2="14.785051"
+     y2="15.379046"
+     id="line2564"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 8.3002796,9.5427513 14.785051,15.379046" /><line
+     class="st0"
+     x1="38.767326"
+     y1="8.2077475"
+     x2="32.819508"
+     y2="15.283601"
+     id="line2566"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 38.767326,8.2077475 32.819508,15.283601" /><line
+     class="st0"
+     x1="32.130051"
+     y1="4.2333679"
+     x2="28.829287"
+     y2="12.58843"
+     id="line2568"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 32.130051,4.2333679 28.829287,12.58843" /><line
+     class="st0"
+     x1="43.299999"
+     y1="14.7"
+     x2="35.099998"
+     y2="19"
+     id="line2570"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 43.299999,14.7 35.099998,19" /><line
+     class="st0"
+     x1="14.7"
+     y1="4.9000001"
+     x2="18.6"
+     y2="12.6"
+     id="line2572"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 14.7,4.9000001 18.6,12.6" /><line
+     class="st0"
+     x1="4.0999999"
+     y1="16.9"
+     x2="12.4"
+     y2="19.700001"
+     id="line2574"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 4.0999999,16.9 12.4,19.700001" /><line
+     class="st0"
+     x1="8.6999998"
+     y1="39"
+     x2="15.3"
+     y2="32.799999"
+     id="line2576"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 8.6999998,39 15.3,32.799999" /><line
+     class="st0"
+     x1="4.5999999"
+     y1="32.799999"
+     x2="12.8"
+     y2="28.9"
+     id="line2578"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 4.5999999,32.799999 12.8,28.9" /><line
+     class="st0"
+     x1="15.3"
+     y1="43.900002"
+     x2="19.4"
+     y2="35.400002"
+     id="line2580"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 15.3,43.900002 4.1,-8.5" /><line
+     class="st0"
+     x1="39.200001"
+     y1="39.599998"
+     x2="32.400002"
+     y2="33.5"
+     id="line2582"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 39.200001,39.599998 32.400002,33.5" /><line
+     class="st0"
+     x1="43.900002"
+     y1="32.799999"
+     x2="34.700001"
+     y2="29.6"
+     id="line2584"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 43.900002,32.799999 34.700001,29.6" /></g>
+<g
+   id="g2682"
+   inkscape:label="rail"
+   transform="matrix(1.1036179,0,0,1.0877739,-2.4767987,-1.9863076)"
+   style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+   clip-path="url(#clipPath1118)"
+   inkscape:path-effect="#path-effect1126"><path
+     class="st1"
+     d="m 43.203111,23.932672 c 0,10.53579 -8.50596,19.041751 -19.041752,19.041751 -10.53579,0 -19.0417497,-8.505961 -19.0417497,-19.041751 0,-10.535792 8.5059597,-19.0417515 19.0417497,-19.0417515 10.535792,0 19.041752,8.5059595 19.041752,19.0417515 z"
+     id="path2588"
+     style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 43.203111,23.932672 c 0,10.53579 -8.50596,19.041751 -19.041752,19.041751 -10.53579,0 -19.0417497,-8.505961 -19.0417497,-19.041751 0,-10.535792 8.5059597,-19.0417515 19.0417497,-19.0417515 10.535792,0 19.041752,8.5059595 19.041752,19.0417515 z" /><path
+     class="st1"
+     d="m 38.997085,23.932672 c 0,8.230037 -6.605687,14.835726 -14.835725,14.835726 -8.230037,0 -14.8357248,-6.605689 -14.8357248,-14.835726 0,-8.230038 6.6056878,-14.8357262 14.8357248,-14.8357262 8.121748,0 14.835725,6.6056882 14.835725,14.8357262 z"
+     id="path2590"
+     style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 38.997085,23.932672 c 0,8.230037 -6.605687,14.835726 -14.835725,14.835726 -8.230037,0 -14.8357248,-6.605689 -14.8357248,-14.835726 0,-8.230038 6.6056878,-14.8357262 14.8357248,-14.8357262 8.121748,0 14.835725,6.6056882 14.835725,14.8357262 z" /></g>
+
+
+
+
+
+<text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Calibri;-inkscape-font-specification:'Calibri Bold'"
+   x="14.594995"
+   y="29.897146"
+   id="text2688"><tspan
+     sodipodi:role="line"
+     id="tspan2686"
+     x="14.594995"
+     y="29.897146">30</tspan></text><g
+   id="g2674"
+   inkscape:label="larrow"
+   transform="translate(-0.94356603,-0.07462151)"><line
+     class="st2"
+     x1="7.8782554"
+     y1="24.262081"
+     x2="14.726001"
+     y2="24.237926"
+     id="line2594"
+     style="stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st3"
+     points="10.2,20.9 7.5,24.5 10.2,28.1 "
+     id="polyline2596"
+     transform="matrix(1.3546522,0,0,1.2105618,-2.4320948,-5.5707793)"
+     style="stroke:#cc0000;stroke-width:2.34268;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+   id="g2679"
+   inkscape:label="rarrow"
+   transform="translate(1.5967442,-0.1432525)"><polyline
+     class="st3"
+     points="37.4,27.7 40.4,24.2 37.4,20.9 "
+     id="polyline2598"
+     transform="matrix(1.3089049,0,0,1.3063324,-12.571103,-7.6491877)"
+     style="stroke:#cc0000;stroke-width:2.29425;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><line
+     class="st2"
+     x1="32.984512"
+     y1="23.985939"
+     x2="39.342487"
+     y2="23.961742"
+     id="line2594-8"
+     style="fill:none;stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>