Change various icons and icon placements
MODIFY
resources/icons/icons.qrc
resources/icons/icons.qrc
<file>step-clock.svg</file>
<file>reverse.svg</file>
<file>reset.svg</file>
- <file>tag.svg</file>
<file>run.svg</file>
<file>cancel.svg</file>
<file>saveas.svg</file>
<file>trace.svg</file>
<file>compass.svg</file>
<file>clear.svg</file>
- <file>moon.svg</file>
<file>led.svg</file>
<file>tile.svg</file>
<file>crosshair_blue.svg</file>

DELETE
resources/icons/moon.svg
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Capa_1"
- x="0px"
- y="0px"
- viewBox="0 0 312.812 312.812"
- style="enable-background:new 0 0 312.812 312.812;"
- xml:space="preserve"
- sodipodi:docname="moon.svg"
- inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
- id="metadata918"><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="defs916" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1848"
- inkscape:window-height="1016"
- id="namedview914"
- showgrid="false"
- inkscape:zoom="2.6789253"
- inkscape:cx="156.40601"
- inkscape:cy="156.40601"
- inkscape:window-x="72"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="Capa_1" />
-<g
- id="g881"
- transform="matrix(0.85500348,0,0,0.85500348,26.319147,22.491643)"
- style="fill:#333333">
- <g
- id="g879"
- style="fill:#333333">
- <path
- d="m 305.2,178.159 c -3.2,-0.8 -6.4,0 -9.2,2 -10.4,8.8 -22.4,16 -35.6,20.8 -12.4,4.8 -26,7.2 -40.4,7.2 -32.4,0 -62,-13.2 -83.2,-34.4 -21.2,-21.2 -34.4,-50.8 -34.4,-83.2 0,-13.6 2.4,-26.8 6.4,-38.8 4.4,-12.8 10.8,-24.4 19.2,-34.4 3.6,-4.4 2.8,-10.8 -1.6,-14.4 -2.8,-2 -6,-2.8 -9.2,-2 -34,9.2 -63.6,29.6 -84.8,56.8 -20.4,26.8 -32.4,60 -32.4,96 0,43.6 17.6,83.2 46.4,112 28.8,28.8 68,46.4 112,46.4 36.8,0 70.8,-12.8 98,-34 27.6,-21.6 47.6,-52.4 56,-87.6 1.6,-5.6 -1.6,-11.2 -7.2,-12.4 z"
- id="path877"
- inkscape:connector-curvature="0"
- style="fill:#333333" />
- </g>
-</g>
-<g
- id="g883"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g885"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g887"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g889"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g891"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g893"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g895"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g897"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g899"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g901"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g903"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g905"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g907"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g909"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-<g
- id="g911"
- transform="matrix(0.91971267,0,0,0.91971267,13.16974,7.8913469)">
-</g>
-</svg>
\ No newline at end of file

MODIFY
resources/icons/step-clock.svg
resources/icons/step-clock.svg
-<?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"
- version="1.1"
- viewBox="0 0 129 129"
- enable-background="new 0 0 129 129"
- id="svg136"
- sodipodi:docname="step-clock.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <metadata
- id="metadata142">
- <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="defs140">
- <linearGradient
- inkscape:collect="always"
- id="linearGradient5017">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop5013" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop5015" />
- </linearGradient>
- <marker
- inkscape:stockid="Arrow1Lstart"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow1Lstart"
- style="overflow:visible"
- inkscape:isstock="true">
- <path
- id="path4743"
- d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
- transform="scale(0.8) translate(12.5,0)" />
- </marker>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5017"
- id="linearGradient5019"
- x1="0"
- y1="30"
- x2="60"
- y2="30"
- 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="1920"
- inkscape:window-height="1052"
- id="namedview138"
- showgrid="false"
- inkscape:zoom="7.3178294"
- inkscape:cx="57.266468"
- inkscape:cy="20.474814"
- inkscape:window-x="1920"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg136" />
- <g
- id="g134"
- transform="translate(-7.5473802,-1.8605549)">
- <path
- d="m 40.4,121.3 c -0.8,0.8 -1.8,1.2 -2.9,1.2 -1.1,0 -2.1,-0.4 -2.9,-1.2 -1.6,-1.6 -1.6,-4.2 0,-5.8 l 51,-51 -51,-51 C 33,11.9 33,9.3 34.6,7.7 c 1.6,-1.6 4.2,-1.6 5.8,0 l 53.9,53.9 c 1.6,1.6 1.6,4.2 0,5.8 z"
- id="path132"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g3908"
- transform="matrix(0.79502119,0,0,0.80100928,75.551271,70.986055)"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
- <g
- id="g3851"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
- <path
- id="path3847"
- d="M 30,0 C 13.458,0 0,13.458 0,30 0,46.542 13.458,60 30,60 46.542,60 60,46.542 60,30 60,13.458 46.542,0 30,0 Z m 0,58 C 14.561,58 2,45.439 2,30 2,14.561 14.561,2 30,2 45.439,2 58,14.561 58,30 58,45.439 45.439,58 30,58 Z"
- inkscape:connector-curvature="0"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <path
- id="path3849"
- d="M 30,6 C 29.448,6 29,6.447 29,7 V 30 H 14 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 h 16 c 0.552,0 1,-0.447 1,-1 V 7 C 31,6.447 30.552,6 30,6 Z"
- inkscape:connector-curvature="0"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
+<svg width="129" height="129" viewBox="0 0 129 129" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M106.17 60.8707C108.251 62.8427 108.251 66.1573 106.17 68.1293L75.5 97.1925L49.4392 121.888C46.2526 124.907 41 122.649 41 118.259L41 64.5L41 10.7414C41 6.35147 46.2527 4.09253 49.4392 7.11211L75.5 31.8075L106.17 60.8707Z" fill="#50B720"/>
</g>
- <g
- id="g3853"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3855"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3857"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3859"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3861"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3863"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3865"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3867"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3869"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3871"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3873"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3875"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3877"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3879"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3881"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- </g>
- <path
- style="fill:#ffffff;stroke-width:0.54661018"
- d=""
- id="path3910"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.21864407;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 97.20329,116.46055 c -8.212864,-0.86077 -15.423236,-6.67496 -18.068156,-14.56952 -0.840287,-2.508083 -1.010799,-3.64417 -1.02041,-6.798789 -0.007,-2.281709 0.04215,-3.1077 0.239624,-4.03125 0.963551,-4.506275 2.753537,-7.94385 5.753842,-11.049952 3.199516,-3.312337 7.11981,-5.399995 11.762622,-6.263899 1.889318,-0.351552 5.438978,-0.315868 7.417468,0.07457 2.48375,0.490141 4.75407,1.340303 6.80137,2.546892 9.69946,5.716432 13.40766,17.758028 8.59858,27.922028 -3.87283,8.18522 -12.55902,13.10543 -21.48494,12.16992 z m 2.95857,-19.174884 c 0.87865,-0.454369 0.83342,0.148551 0.83342,-11.108952 0,-11.265972 0.0524,-10.584636 -0.85045,-11.051534 -0.517653,-0.26769 -1.372935,-0.183374 -1.775413,0.175025 -0.655038,0.583299 -0.653796,0.56426 -0.653796,10.01699 V 94.204 h -5.746193 c -4.763185,0 -5.812012,0.03404 -6.130937,0.198959 -0.420426,0.21741 -0.831556,0.946903 -0.831556,1.475479 0,0.428783 0.524452,1.209674 0.960669,1.430402 0.532995,0.269699 13.669376,0.248253 14.194256,-0.02317 z"
- id="path2386"
- inkscape:connector-curvature="0" />
+<defs>
+<clipPath id="clip0">
+<rect width="129" height="129" fill="white"/>
+</clipPath>
+</defs>
</svg>

MODIFY
resources/icons/stop-clock.svg
resources/icons/stop-clock.svg
enable-background="new 0 0 129 129"
id="svg136"
sodipodi:docname="stop-clock.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
<metadata
id="metadata142">
<rdf:RDF>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1052"
+ inkscape:window-width="1848"
+ inkscape:window-height="1016"
id="namedview138"
showgrid="false"
- inkscape:zoom="1.2936217"
- inkscape:cx="52.168914"
- inkscape:cy="-55.608427"
- inkscape:window-x="1920"
- inkscape:window-y="0"
+ inkscape:zoom="1.8294574"
+ inkscape:cx="-13.504426"
+ inkscape:cy="10.071009"
+ inkscape:window-x="72"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg136" />
<g
id="path1606"
d="m 15.5,0 c -1.103,0 -2,0.897 -2,2 v 40 c 0,1.103 0.897,2 2,2 1.103,0 2,-0.897 2,-2 V 2 c 0,-1.103 -0.897,-2 -2,-2 z"
inkscape:connector-curvature="0" />
-
<path
id="path1608"
d="m 28.5,0 c -1.103,0 -2,0.897 -2,2 v 40 c 0,1.103 0.897,2 2,2 1.103,0 2,-0.897 2,-2 V 2 c 0,-1.103 -0.897,-2 -2,-2 z"
inkscape:connector-curvature="0" />
-
</g>
<g
- id="g1612">
-</g>
+ id="g1612" />
<g
- id="g1614">
-</g>
+ id="g1614" />
<g
- id="g1616">
-</g>
+ id="g1616" />
<g
- id="g1618">
-</g>
+ id="g1618" />
<g
- id="g1620">
-</g>
+ id="g1620" />
<g
- id="g1622">
-</g>
+ id="g1622" />
<g
- id="g1624">
-</g>
+ id="g1624" />
<g
- id="g1626">
-</g>
+ id="g1626" />
<g
- id="g1628">
-</g>
+ id="g1628" />
<g
- id="g1630">
-</g>
+ id="g1630" />
<g
- id="g1632">
-</g>
+ id="g1632" />
<g
- id="g1634">
-</g>
+ id="g1634" />
<g
- id="g1636">
-</g>
+ id="g1636" />
<g
- id="g1638">
-</g>
+ id="g1638" />
<g
- id="g1640">
-</g>
+ id="g1640" />
</g>
<path
style="fill:#ffffff;stroke-width:0.54661018"
d=""
id="path3910"
inkscape:connector-curvature="0" />
- <g
- id="g3908"
- transform="matrix(0.79502119,0,0,0.80100928,75.551271,70.986055)"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
- <g
- id="g3851"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
- <path
- id="path3847"
- d="M 30,0 C 13.458,0 0,13.458 0,30 0,46.542 13.458,60 30,60 46.542,60 60,46.542 60,30 60,13.458 46.542,0 30,0 Z m 0,58 C 14.561,58 2,45.439 2,30 2,14.561 14.561,2 30,2 45.439,2 58,14.561 58,30 58,45.439 45.439,58 30,58 Z"
- inkscape:connector-curvature="0"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <path
- id="path3849"
- d="M 30,6 C 29.448,6 29,6.447 29,7 V 30 H 14 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 h 16 c 0.552,0 1,-0.447 1,-1 V 7 C 31,6.447 30.552,6 30,6 Z"
- inkscape:connector-curvature="0"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- </g>
- <g
- id="g3853"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3855"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3857"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3859"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3861"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3863"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3865"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3867"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3869"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3871"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3873"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3875"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3877"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3879"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- <g
- id="g3881"
- style="stroke-width:2.00498837;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" />
- </g>
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.21864407;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 97.535347,116.48362 c -3.646095,-0.32353 -7.374573,-1.70244 -10.442485,-3.86198 -1.376609,-0.969 -3.917471,-3.44951 -4.820728,-4.70621 -1.073131,-1.49304 -1.889821,-2.926 -2.53924,-4.45535 -2.02848,-4.776947 -2.246856,-10.372789 -0.596974,-15.297359 2.118609,-6.323624 7.156225,-11.416507 13.385154,-13.532 2.518384,-0.855302 3.972956,-1.091973 6.764301,-1.100603 3.497285,-0.01081 5.786845,0.460547 8.827525,1.817358 3.22198,1.43771 6.65176,4.262498 8.68838,7.155792 5.16053,7.331248 5.31681,17.05105 0.39257,24.417012 -1.74294,2.6072 -3.56806,4.43152 -6.11368,6.11103 -3.07187,2.02669 -6.34325,3.15247 -10.05439,3.45999 -1.759837,0.14582 -1.760562,0.14582 -3.490433,-0.008 z m 2.546403,-19.172797 c 0.96479,-0.403117 0.91178,0.243419 0.91178,-11.120612 0,-11.228567 0.0477,-10.587058 -0.82142,-11.036524 -0.566727,-0.293064 -1.26298,-0.25547 -1.704781,0.09205 -0.7654,0.602063 -0.753458,0.442228 -0.753458,10.084955 v 8.886804 h -5.861607 -5.861608 l -0.413831,0.386577 c -0.815215,0.761523 -0.678778,2.035221 0.280673,2.620204 0.428975,0.261548 0.698709,0.271879 7.112086,0.272369 5.320838,4.1e-4 6.756205,-0.03709 7.112166,-0.185823 z"
- id="path1691"
- inkscape:connector-curvature="0" />
</svg>

DELETE
resources/icons/tag.svg
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.1.0, 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Capa_1"
- x="0px"
- y="0px"
- viewBox="0 0 487.85 487.85"
- style="enable-background:new 0 0 487.85 487.85;"
- xml:space="preserve"
- sodipodi:docname="tag.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
- id="metadata217"><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="defs215" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1853"
- inkscape:window-height="1025"
- id="namedview213"
- showgrid="false"
- inkscape:zoom="0.17103331"
- inkscape:cx="3380.4123"
- inkscape:cy="-412.7946"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="Capa_1" />
-<g
- id="g180">
- <path
- d="M479,215.275l-83.5-113.9c-11-15-33.3-26.3-51.8-26.3H39.2c-21.6,0-39.2,17.6-39.2,39.2v259.3c0,21.6,17.6,39.2,39.2,39.2 h304.5c18.6,0,40.9-11.3,51.8-26.3l83.5-113.9C490.8,256.575,490.8,231.375,479,215.275z M457.2,256.775l-83.5,113.9 c-5.8,8-20.2,15.2-30.1,15.2H39.2c-6.7,0-12.2-5.5-12.2-12.2v-259.4c0-6.7,5.5-12.2,12.2-12.2h304.5c9.9,0,24.2,7.3,30.1,15.2 l83.5,113.9C462.1,237.875,462.1,250.075,457.2,256.775z"
- id="path178" />
-</g>
-<g
- id="g182">
-</g>
-<g
- id="g184">
-</g>
-<g
- id="g186">
-</g>
-<g
- id="g188">
-</g>
-<g
- id="g190">
-</g>
-<g
- id="g192">
-</g>
-<g
- id="g194">
-</g>
-<g
- id="g196">
-</g>
-<g
- id="g198">
-</g>
-<g
- id="g200">
-</g>
-<g
- id="g202">
-</g>
-<g
- id="g204">
-</g>
-<g
- id="g206">
-</g>
-<g
- id="g208">
-</g>
-<g
- id="g210">
-</g>
-<text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- x="60.660694"
- y="324.31653"
- id="text3924"><tspan
- sodipodi:role="line"
- id="tspan3922"
- x="60.660694"
- y="324.31653"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:240px;line-height:6.25;font-family:sans-serif;-inkscape-font-specification:sans-serif">0x</tspan></text>
-</svg>
\ No newline at end of file

MODIFY
src/cachetabwidget.cpp
src/cachetabwidget.cpp
@@ -32,8 +32,7 @@ CacheTabWidget::CacheTabWidget(QWidget* parent) : QWidget(parent), m_ui(new Ui::
m_l1dShim->setNextLevelCache(m_ui->dataCacheWidget->getCacheSim());
m_l1iShim->setNextLevelCache(m_ui->instructionCacheWidget->getCacheSim());
- m_addTabIdx = m_ui->tabWidget->addTab(new QLabel("Placeholder"), QIcon((":/icons/plus.svg")),
- QString("L%1 Cache").arg(m_nextCacheLevel));
+ m_addTabIdx = m_ui->tabWidget->addTab(new QLabel("Placeholder"), QIcon((":/icons/plus.svg")), QString());
connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &CacheTabWidget::handleTabIndexChanged);
connect(m_ui->tabWidget, &QTabWidget::tabCloseRequested, this, &CacheTabWidget::handleTabCloseRequest);
@@ -63,7 +62,7 @@ void CacheTabWidget::handleTabCloseRequest(int index) {
m_ui->tabWidget->tabBar()->tabButton(newIndex, QTabBar::RightSide)->resize(m_defaultTabButtonSize);
}
m_nextCacheLevel--;
- m_ui->tabWidget->setTabText(m_addTabIdx, QString("L%1 Cache").arg(m_nextCacheLevel));
+ m_ui->tabWidget->setTabText(m_addTabIdx, QString());
}
void CacheTabWidget::handleTabIndexChanged(int index) {
@@ -78,7 +77,6 @@ void CacheTabWidget::handleTabIndexChanged(int index) {
m_ui->tabWidget->tabBar()->tabButton(m_addTabIdx - 1, QTabBar::RightSide)->resize(0, 0);
m_addTabIdx = m_ui->tabWidget->count() - 1;
m_ui->tabWidget->setCurrentIndex(index);
- m_ui->tabWidget->setTabText(m_addTabIdx, QString("L%1 Cache").arg(m_nextCacheLevel));
}
// Locate cacheWidget for the current index

MODIFY
src/edittab.cpp
src/edittab.cpp
@@ -29,9 +29,9 @@ EditTab::EditTab(QToolBar* toolbar, QWidget* parent) : RipesTab(toolbar, parent)
m_symbolNavigatorAction = new QAction(this);
m_symbolNavigatorAction->setIcon(QIcon(":/icons/compass.svg"));
- m_symbolNavigatorAction->setText("Navigate symbols");
+ m_symbolNavigatorAction->setText("Show symbol navigator");
connect(m_symbolNavigatorAction, &QAction::triggered, this, &EditTab::showSymbolNavigator);
- m_toolbar->addAction(m_symbolNavigatorAction);
+ m_ui->navigatorButton->setDefaultAction(m_symbolNavigatorAction);
m_followAction = new QAction(this);
m_followAction->setIcon(QIcon(":/icons/trace.svg"));
@@ -39,7 +39,7 @@ EditTab::EditTab(QToolBar* toolbar, QWidget* parent) : RipesTab(toolbar, parent)
m_followAction->setToolTip(
"Follow program execution.\nEnsures that the instruction present in the\nfirst stage of the processor is "
"always visible\nin the disassembled view.");
- m_toolbar->addAction(m_followAction);
+ m_ui->followButton->setDefaultAction(m_followAction);
connect(m_followAction, &QAction::triggered, m_ui->programViewer, &ProgramViewer::setFollowEnabled);
m_followAction->setChecked(RipesSettings::value(RIPES_SETTING_FOLLOW_EXEC).toBool());

MODIFY
src/edittab.ui
src/edittab.ui
</attribute>
</widget>
</item>
+ <item>
+ <widget class="QToolButton" name="followButton">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="navigatorButton">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>

MODIFY
src/mainwindow.cpp
src/mainwindow.cpp
@@ -196,6 +196,9 @@ void MainWindow::setupMenus() {
exitAction->setShortcut(QKeySequence::Quit);
connect(exitAction, &QAction::triggered, this, &MainWindow::close);
m_ui->menuFile->addAction(exitAction);
+
+ m_ui->menuView->addAction(m_processorTab->m_darkmodeAction);
+ m_ui->menuView->addAction(m_processorTab->m_displayValuesAction);
}
MainWindow::~MainWindow() {

MODIFY
src/mainwindow.ui
src/mainwindow.ui
</property>
<addaction name="actionSettings"/>
</widget>
+ <widget class="QMenu" name="menuView">
+ <property name="title">
+ <string>View</string>
+ </property>
+ </widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
+ <addaction name="menuView"/>
<addaction name="menuHelp"/>
</widget>
<action name="actionOpen_wiki">
<string>System calls</string>
</property>
</action>
+ <action name="actionView">
+ <property name="text">
+ <string>View</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>

MODIFY
src/memorytab.cpp
src/memorytab.cpp
@@ -24,8 +24,7 @@ MemoryTab::MemoryTab(QToolBar* toolbar, QWidget* parent) : RipesTab(toolbar, par
m_ui->memoryMapView->setModel(new MemoryMapModel(&IOManager::get(), this));
m_ui->memoryMapView->horizontalHeader()->setSectionResizeMode(MemoryMapModel::Name, QHeaderView::ResizeToContents);
- m_ui->memoryMapView->horizontalHeader()->setSectionResizeMode(MemoryMapModel::AddressRange,
- QHeaderView::ResizeToContents);
+ m_ui->memoryMapView->horizontalHeader()->setSectionResizeMode(MemoryMapModel::AddressRange, QHeaderView::Stretch);
m_ui->memoryMapView->horizontalHeader()->setSectionResizeMode(MemoryMapModel::Size, QHeaderView::ResizeToContents);
m_ui->splitter->setStretchFactor(0, 1);
m_ui->splitter->setStretchFactor(1, 0);

MODIFY
src/memorytab.ui
src/memorytab.ui
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <widget class="QTabWidget" name="tabWidget_2">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Memory</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item row="0" column="0">
<widget class="MemoryViewerWidget" name="memoryViewerWidget" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
- <horstretch>1</horstretch>
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>Memory map</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_4">
- <property name="leftMargin">
- <number>9</number>
- </property>
- <property name="topMargin">
- <number>9</number>
- </property>
- <property name="rightMargin">
- <number>9</number>
- </property>
- <property name="bottomMargin">
- <number>9</number>
- </property>
- <item row="0" column="0">
<widget class="QTableView" name="memoryMapView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
</widget>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="CacheTabWidget" name="cacheTabWidget" native="true"/>
</widget>
</item>
</layout>
<header>memoryviewerwidget.h</header>
<container>1</container>
</customwidget>
- <customwidget>
- <class>CacheTabWidget</class>
- <extends>QWidget</extends>
- <header>cachetabwidget.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<resources/>
<connections/>

MODIFY
src/processortab.cpp
src/processortab.cpp
@@ -242,26 +242,22 @@ void ProcessorTab::setupSimulatorActions(QToolBar* controlToolbar) {
controlToolbar->addAction(m_runAction);
// Setup processor-tab only actions
- const QIcon tagIcon = QIcon(":/icons/tag.svg");
- m_displayValuesAction = new QAction(tagIcon, "Display signal values", this);
+ m_displayValuesAction = new QAction("Show processor signal values", this);
m_displayValuesAction->setCheckable(true);
m_displayValuesAction->setChecked(false);
connect(m_displayValuesAction, &QAction::triggered, m_vsrtlWidget, &vsrtl::VSRTLWidget::setOutputPortValuesVisible);
- m_toolbar->addAction(m_displayValuesAction);
const QIcon tableIcon = QIcon(":/icons/spreadsheet.svg");
m_stageTableAction = new QAction(tableIcon, "Show stage table", this);
connect(m_stageTableAction, &QAction::triggered, this, &ProcessorTab::showStageTable);
m_toolbar->addAction(m_stageTableAction);
- const QIcon moonIcon = QIcon(":/icons/moon.svg");
- m_darkmodeAction = new QAction(moonIcon, "Toggle darkmode", this);
+ m_darkmodeAction = new QAction("Processor darkmode", this);
m_darkmodeAction->setCheckable(true);
connect(m_darkmodeAction, &QAction::toggled, m_vsrtlWidget, [=](bool checked) {
RipesSettings::setValue(RIPES_SETTING_DARKMODE, QVariant::fromValue(checked));
m_vsrtlWidget->setDarkmode(checked);
});
- m_toolbar->addAction(m_darkmodeAction);
m_darkmodeAction->setChecked(RipesSettings::value(RIPES_SETTING_DARKMODE).toBool());
}

MODIFY
src/processortab.h
src/processortab.h
@@ -27,6 +27,7 @@ struct Layout;
class ProcessorTab : public RipesTab {
friend class RunDialog;
+ friend class MainWindow;
Q_OBJECT
public:

Change various icons and icon placements