Browse Source

Revise rail graphics from Pyer. Rename "Dark" theme to "High contrast dark" and "Default" to "Dark".

tags/v2.3.0
Andrew Belt 1 year ago
parent
commit
35c70e7459
5 changed files with 634 additions and 630 deletions
  1. +89
    -89
      res/ComponentLibrary/Rail-hcdark.svg
  2. +538
    -534
      res/ComponentLibrary/Rail-light.svg
  3. +2
    -2
      src/app/MenuBar.cpp
  4. +3
    -3
      src/app/RailWidget.cpp
  5. +2
    -2
      src/ui/common.cpp

res/ComponentLibrary/Rail-dark.svg → res/ComponentLibrary/Rail-hcdark.svg View File

@@ -1,80 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.0" <svg version="1.0"
id="svg57823" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:dc="http://purl.org/dc/elements/1.1/"
id="svg57823" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="304px" height="380px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="304px" height="380px"
viewBox="0 0 304 380" enable-background="new 0 0 304 380" xml:space="preserve"> viewBox="0 0 304 380" enable-background="new 0 0 304 380" xml:space="preserve">
<sodipodi:namedview bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview57825" inkscape:current-layer="svg57823" inkscape:cx="224.97394" inkscape:cy="45.320028" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="882" inkscape:window-maximized="0" inkscape:window-width="1600" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="2.2083333" objecttolerance="10" pagecolor="#ffffff" showgrid="false"> <sodipodi:namedview bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview57825" inkscape:current-layer="svg57823" inkscape:cx="224.97394" inkscape:cy="45.320028" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="882" inkscape:window-maximized="0" inkscape:window-width="1600" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="2.2083333" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
</sodipodi:namedview> </sodipodi:namedview>
<rect x="0.00002" y="0" fill="#030303" width="304" height="380"/> <rect x="0.00002" y="0" fill="#030303" width="304" height="380"/>
<g>
<g>
<rect x="0.00002" y="0" fill="#858585" width="304" height="14.93071"/>
<rect x="0.00002" y="1.65063" fill="#5E5F61" width="304" height="13.28007"/>
<rect x="0.00002" y="1.20046" fill="#797979" width="304" height="12.52979"/>
<rect x="0.00002" y="2.85109" fill="#4C4D4E" width="304" height="9.22853"/>
<rect x="0.00002" y="4.12658" fill="#858585" width="304" height="7.95304"/>
<rect x="0.00002" y="3.82646" fill="#686868" width="304" height="7.27778"/>
<rect x="0.00002" y="3.82646" opacity="0.15" enable-background="new " width="304" height="1.87572"/>
</g>
<g>
<rect x="0.00002" y="365.06931" fill="#858585" width="304" height="14.93069"/>
<rect x="0.00002" y="366.71994" fill="#5E5F61" width="304" height="13.28006"/>
<rect x="0.00002" y="366.26974" fill="#797979" width="304" height="12.52979"/>
<rect x="0.00002" y="367.92038" fill="#4C4D4E" width="304" height="9.22852"/>
<rect x="0.00002" y="369.19586" fill="#858585" width="304" height="7.95303"/>
<rect x="0.00002" y="368.89575" fill="#686868" width="304" height="7.27777"/>
<rect x="0.00002" y="368.89575" opacity="0.15" enable-background="new " width="304" height="1.87573"/>
</g>
<circle fill="#1D1D1D" cx="7.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="7.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="22.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="22.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="37.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="37.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="52.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="52.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="67.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="67.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="82.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="82.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="97.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="97.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="112.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="112.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="127.50002" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="127.50002" cy="372.63129" r="3.3375"/>
<circle fill="#1D1D1D" cx="142.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="142.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="157.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="157.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="172.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="172.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="187.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="187.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="202.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="202.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="217.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="217.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="232.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="232.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="247.50003" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="247.50003" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="262.5" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="262.5" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="277.5" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="277.5" cy="372.63129" r="3.33749"/>
<circle fill="#1D1D1D" cx="292.5" cy="7.70148" r="3.3375"/>
<circle fill="#1D1D1D" cx="292.5" cy="372.63129" r="3.33749"/>
</g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2032.56592" y1="8131.34814" x2="-2032.56592" y2="8148.44824" gradientTransform="matrix(-1 0 0 1 -1880.56592 -8116.41748)">
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2322.56592" y1="-7751.4585" x2="-2322.56592" y2="-7768.55811" gradientTransform="matrix(-1 0 0 -1 -2170.56592 -7736.52783)">
<stop offset="0" style="stop-color:#000000"/> <stop offset="0" style="stop-color:#000000"/>
<stop offset="0.96927" style="stop-color:#000000;stop-opacity:0"/> <stop offset="0.96927" style="stop-color:#000000;stop-opacity:0"/>
</linearGradient> </linearGradient>
<polygon opacity="0.28" fill="url(#SVGID_1_)" enable-background="new " points="0.00002,14.93071 304,14.93071 304,32.0307 <polygon opacity="0.28" fill="url(#SVGID_1_)" enable-background="new " points="0.00002,14.93071 304,14.93071 304,32.0307
0.00002,32.0307 "/> 0.00002,32.0307 "/>
<path id="path57596_00000115494156053334757280000005247103461293897106_" inkscape:connector-curvature="0" fill="#060606" d=" <path id="path57596_00000115494156053334757280000005247103461293897106_" inkscape:connector-curvature="0" fill="#060606" d="
M-0.00002,234.99995h304v-89.99998h-304V234.99995z"/>
M-0.00002,234.99995h304v-89.99998h-304v89.99998H-0.00002z"/>
<g> <g>
<path id="path57598_00000137812594187479097770000006177951033275154598_" inkscape:connector-curvature="0" fill="none" stroke="#0D0D0D" stroke-width="14" stroke-miterlimit="10" d=" <path id="path57598_00000137812594187479097770000006177951033275154598_" inkscape:connector-curvature="0" fill="none" stroke="#0D0D0D" stroke-width="14" stroke-miterlimit="10" d="
@@ -97,11 +37,11 @@
</g> </g>
<g> <g>
<linearGradient id="SVGID_00000152232333935986148980000004572913990076649903_" gradientUnits="userSpaceOnUse" x1="743.66235" y1="-5742.69531" x2="754.39209" y2="-5742.69531" gradientTransform="matrix(0 1 -1 0 -5637.62109 -593.38898)">
<linearGradient id="SVGID_00000142143032607166455520000001304004995492859794_" gradientUnits="userSpaceOnUse" x1="829.66235" y1="6498.58496" x2="840.39209" y2="6498.58496" gradientTransform="matrix(0 1 1 0 -6393.51074 -679.38898)">
<stop offset="0.01118" style="stop-color:#151515"/> <stop offset="0.01118" style="stop-color:#151515"/>
<stop offset="1" style="stop-color:#101010"/> <stop offset="1" style="stop-color:#101010"/>
</linearGradient> </linearGradient>
<circle fill="url(#SVGID_00000152232333935986148980000004572913990076649903_)" cx="105.07421" cy="155.63821" r="5.36487"/>
<circle fill="url(#SVGID_00000142143032607166455520000001304004995492859794_)" cx="105.07421" cy="155.63821" r="5.36487"/>
<path fill="#080808" d="M108.21395,155.01532l-1.77729-0.21294c-0.27283-0.0327-0.48788-0.24782-0.52045-0.52066l-0.21205-1.77609 <path fill="#080808" d="M108.21395,155.01532l-1.77729-0.21294c-0.27283-0.0327-0.48788-0.24782-0.52045-0.52066l-0.21205-1.77609
c-0.00925-0.07742-0.07491-0.13571-0.15288-0.13571h-0.95412c-0.07796,0-0.14361,0.05827-0.15287,0.13567l-0.21255,1.7771 c-0.00925-0.07742-0.07491-0.13571-0.15288-0.13571h-0.95412c-0.07796,0-0.14361,0.05827-0.15287,0.13567l-0.21255,1.7771
c-0.03264,0.27289-0.24779,0.48799-0.52068,0.52057l-1.77652,0.21211c-0.07742,0.00923-0.13571,0.07489-0.13571,0.15286v0.95418 c-0.03264,0.27289-0.24779,0.48799-0.52068,0.52057l-1.77652,0.21211c-0.07742,0.00923-0.13571,0.07489-0.13571,0.15286v0.95418
@@ -112,11 +52,11 @@
</g> </g>
<g> <g>
<linearGradient id="SVGID_00000090293694949603105680000009084626704732454286_" gradientUnits="userSpaceOnUse" x1="812.42181" y1="-5742.69531" x2="823.15155" y2="-5742.69531" gradientTransform="matrix(0 1 -1 0 -5637.62109 -593.38898)">
<linearGradient id="SVGID_00000182525825588052893970000003691420606631706770_" gradientUnits="userSpaceOnUse" x1="898.42175" y1="6498.58496" x2="909.15149" y2="6498.58496" gradientTransform="matrix(0 1 1 0 -6393.51074 -679.38898)">
<stop offset="0.01118" style="stop-color:#151515"/> <stop offset="0.01118" style="stop-color:#151515"/>
<stop offset="1" style="stop-color:#101010"/> <stop offset="1" style="stop-color:#101010"/>
</linearGradient> </linearGradient>
<circle fill="url(#SVGID_00000090293694949603105680000009084626704732454286_)" cx="105.07424" cy="224.39766" r="5.36487"/>
<circle fill="url(#SVGID_00000182525825588052893970000003691420606631706770_)" cx="105.07424" cy="224.39766" r="5.36487"/>
<path fill="#080808" d="M108.21398,223.77475l-1.77729-0.21294c-0.27283-0.03267-0.48788-0.24782-0.52045-0.52066l-0.21205-1.77609 <path fill="#080808" d="M108.21398,223.77475l-1.77729-0.21294c-0.27283-0.03267-0.48788-0.24782-0.52045-0.52066l-0.21205-1.77609
c-0.00925-0.07742-0.07491-0.1357-0.15288-0.1357h-0.95412c-0.07796,0-0.14361,0.05827-0.15287,0.13568l-0.21255,1.7771 c-0.00925-0.07742-0.07491-0.1357-0.15288-0.1357h-0.95412c-0.07796,0-0.14361,0.05827-0.15287,0.13568l-0.21255,1.7771
c-0.03264,0.27289-0.24779,0.48799-0.52068,0.52057l-1.77652,0.2121c-0.07742,0.00923-0.13571,0.07489-0.13571,0.15286v0.95418 c-0.03264,0.27289-0.24779,0.48799-0.52068,0.52057l-1.77652,0.2121c-0.07742,0.00923-0.13571,0.07489-0.13571,0.15286v0.95418
@@ -128,7 +68,7 @@
<path id="path57670_00000038378656340607786770000001365891972621688202_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57670_00000038378656340607786770000001365891972621688202_" inkscape:connector-curvature="0" fill="#050505" d="
M85.14844,223.47577H64.99999v-66.91406h20.14844C85.14843,156.56171,85.14843,223.47577,85.14844,223.47577z"/> M85.14844,223.47577H64.99999v-66.91406h20.14844C85.14843,156.56171,85.14843,223.47577,85.14844,223.47577z"/>
<path id="path57672_00000143607846632888743100000004800262710468564150_" inkscape:connector-curvature="0" fill="#0D0D0D" d=" <path id="path57672_00000143607846632888743100000004800262710468564150_" inkscape:connector-curvature="0" fill="#0D0D0D" d="
M82.87109,220.71796H67.27344v-61.40233h15.59766C82.87109,159.31563,82.87109,220.71796,82.87109,220.71796z"/>
M82.87109,220.71796H67.27344v-61.40233h15.59766V220.71796z"/>
<path id="path57672_00000117657245955012853610000003162947681058505346_" inkscape:connector-curvature="0" fill="#0D0D0D" d=" <path id="path57672_00000117657245955012853610000003162947681058505346_" inkscape:connector-curvature="0" fill="#0D0D0D" d="
M85.14844,196.24413h-2.27734v-12.45468h2.27734V196.24413z"/> M85.14844,196.24413h-2.27734v-12.45468h2.27734V196.24413z"/>
<g> <g>
@@ -217,69 +157,69 @@
<path id="path57674_00000132797745365060876180000013751380490251015101_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57674_00000132797745365060876180000013751380490251015101_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,169.45624h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,169.45624h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57676_00000018204439185209925070000007450497354473191308_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57676_00000018204439185209925070000007450497354473191308_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,169.45624H17.3555v-1.52344h1.52344V169.45624z"/>
M18.87893,169.45624H17.3555v-1.52344h1.52344C18.87894,167.9328,18.87894,169.45624,18.87893,169.45624z"/>
<path id="path57678_00000052811043275252158520000007658524923482873226_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57678_00000052811043275252158520000007658524923482873226_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,175.54999h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,175.54999h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57680_00000004545252685547136760000001465563669527395240_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57680_00000004545252685547136760000001465563669527395240_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,175.54999H17.3555v-1.52344h1.52344V175.54999z"/>
M18.87893,175.54999H17.3555v-1.52344h1.52344C18.87894,174.02655,18.87894,175.54999,18.87893,175.54999z"/>
<path id="path57682_00000070116950292959244690000002843439962054124475_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57682_00000070116950292959244690000002843439962054124475_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,181.63983h-1.52343v-1.51953h1.52344v1.51953H12.78908z"/> M12.78908,181.63983h-1.52343v-1.51953h1.52344v1.51953H12.78908z"/>
<path id="path57684_00000051354168221971684870000008218042868238619837_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57684_00000051354168221971684870000008218042868238619837_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,181.63983H17.3555v-1.51953h1.52344V181.63983z"/>
M18.87893,181.63983H17.3555v-1.51953h1.52344C18.87894,180.1203,18.87894,181.63983,18.87893,181.63983z"/>
<path id="path57686_00000114061296689406550080000011291395207245812156_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57686_00000114061296689406550080000011291395207245812156_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,187.73358h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,187.73358h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57688_00000176735133852367708080000005096231091031726731_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57688_00000176735133852367708080000005096231091031726731_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,187.73358H17.3555v-1.52344h1.52344V187.73358z"/>
M18.87893,187.73358H17.3555v-1.52344h1.52344C18.87894,186.21014,18.87894,187.73358,18.87893,187.73358z"/>
<path id="path57690_00000154408165241184283060000005069475132039966628_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57690_00000154408165241184283060000005069475132039966628_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,193.82733h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,193.82733h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57692_00000061441624001236654970000017607504532198926262_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57692_00000061441624001236654970000017607504532198926262_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,193.82733H17.3555v-1.52344h1.52344V193.82733z"/>
M18.87893,193.82733H17.3555v-1.52344h1.52344C18.87894,192.30389,18.87894,193.82733,18.87893,193.82733z"/>
<path id="path57694_00000067227846836946502470000008089474229870433953_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57694_00000067227846836946502470000008089474229870433953_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,199.91718h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,199.91718h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57696_00000149381799900902113830000011930801367089097367_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57696_00000149381799900902113830000011930801367089097367_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,199.91718H17.3555v-1.52344h1.52344V199.91718z"/>
M18.87893,199.91718H17.3555v-1.52344h1.52344C18.87894,198.39374,18.87894,199.91718,18.87893,199.91718z"/>
<path id="path57698_00000000933354170074596820000018275351260876171455_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57698_00000000933354170074596820000018275351260876171455_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,206.01093h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,206.01093h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57700_00000179628128021757792940000013083098924066748294_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57700_00000179628128021757792940000013083098924066748294_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,206.01093H17.3555v-1.52344h1.52344V206.01093z"/>
M18.87893,206.01093H17.3555v-1.52344h1.52344C18.87894,204.48749,18.87894,206.01093,18.87893,206.01093z"/>
<path id="path57702_00000025428254358121700700000006204476984863727803_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57702_00000025428254358121700700000006204476984863727803_" inkscape:connector-curvature="0" fill="#363636" d="
M12.78908,212.10077h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,212.10077h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57704_00000180335435804679571400000012729765049518714030_" inkscape:connector-curvature="0" fill="#363636" d=" <path id="path57704_00000180335435804679571400000012729765049518714030_" inkscape:connector-curvature="0" fill="#363636" d="
M18.87893,212.10077H17.3555v-1.52344h1.52344V212.10077z"/>
M18.87893,212.10077H17.3555v-1.52344h1.52344C18.87894,210.57733,18.87894,212.10077,18.87893,212.10077z"/>
</g> </g>
<g> <g>
<path id="path57674_00000114776796336671492920000002749239272779297952_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57674_00000114776796336671492920000002749239272779297952_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,170.97968h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,170.97968h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57676_00000051362745890484975900000011766953541757576594_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57676_00000051362745890484975900000011766953541757576594_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,170.97968H17.3555v-1.52344h1.52344V170.97968z"/>
M18.87893,170.97968H17.3555v-1.52344h1.52344C18.87894,169.45624,18.87894,170.97968,18.87893,170.97968z"/>
<path id="path57678_00000092451836080834335370000017314601756607818892_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57678_00000092451836080834335370000017314601756607818892_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,177.07343h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,177.07343h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57680_00000073003347706446158270000012586829654862665141_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57680_00000073003347706446158270000012586829654862665141_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,177.07343H17.3555v-1.52344h1.52344V177.07343z"/>
M18.87893,177.07343H17.3555v-1.52344h1.52344C18.87894,175.54999,18.87894,177.07343,18.87893,177.07343z"/>
<path id="path57682_00000168085729391854233070000016930454426379692686_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57682_00000168085729391854233070000016930454426379692686_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,183.16327h-1.52343v-1.51953h1.52344v1.51953H12.78908z"/> M12.78908,183.16327h-1.52343v-1.51953h1.52344v1.51953H12.78908z"/>
<path id="path57684_00000150086274841311194900000012957836532246223549_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57684_00000150086274841311194900000012957836532246223549_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,183.16327H17.3555v-1.51953h1.52344V183.16327z"/>
M18.87893,183.16327H17.3555v-1.51953h1.52344C18.87894,181.64374,18.87894,183.16327,18.87893,183.16327z"/>
<path id="path57686_00000107561449478268043060000009171523885701856170_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57686_00000107561449478268043060000009171523885701856170_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,189.25702h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,189.25702h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57688_00000080916160233278158170000015853569396095690925_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57688_00000080916160233278158170000015853569396095690925_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,189.25702H17.3555v-1.52344h1.52344V189.25702z"/>
M18.87893,189.25702H17.3555v-1.52344h1.52344C18.87894,187.73358,18.87894,189.25702,18.87893,189.25702z"/>
<path id="path57690_00000139267646261609276270000017059129518359540394_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57690_00000139267646261609276270000017059129518359540394_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,195.35077h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,195.35077h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57692_00000010272097023977652880000003244815635020011930_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57692_00000010272097023977652880000003244815635020011930_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,195.35077H17.3555v-1.52344h1.52344V195.35077z"/>
M18.87893,195.35077H17.3555v-1.52344h1.52344C18.87894,193.82733,18.87894,195.35077,18.87893,195.35077z"/>
<path id="path57694_00000092418165079608116910000012727371642283479734_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57694_00000092418165079608116910000012727371642283479734_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,201.44061h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,201.44061h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57696_00000100366751070978308760000011192714949547298450_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57696_00000100366751070978308760000011192714949547298450_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,201.44061H17.3555v-1.52344h1.52344V201.44061z"/>
M18.87893,201.44061H17.3555v-1.52344h1.52344C18.87894,199.91718,18.87894,201.44061,18.87893,201.44061z"/>
<path id="path57698_00000158734455979834256120000003709709900477018784_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57698_00000158734455979834256120000003709709900477018784_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,207.53436h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,207.53436h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57700_00000052791972943989567250000000990747756351837606_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57700_00000052791972943989567250000000990747756351837606_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,207.53436H17.3555v-1.52344h1.52344V207.53436z"/>
M18.87893,207.53436H17.3555v-1.52344h1.52344C18.87894,206.01093,18.87894,207.53436,18.87893,207.53436z"/>
<path id="path57702_00000081607671122993288920000011491906735479465900_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57702_00000081607671122993288920000011491906735479465900_" inkscape:connector-curvature="0" fill="#050505" d="
M12.78908,213.62421h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/> M12.78908,213.62421h-1.52343v-1.52344h1.52344v1.52344H12.78908z"/>
<path id="path57704_00000154401674229848870440000014658139415326911874_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57704_00000154401674229848870440000014658139415326911874_" inkscape:connector-curvature="0" fill="#050505" d="
M18.87893,213.62421H17.3555v-1.52344h1.52344V213.62421z"/>
M18.87893,213.62421H17.3555v-1.52344h1.52344C18.87894,212.10077,18.87894,213.62421,18.87893,213.62421z"/>
</g> </g>
<path id="path57706_00000159433138952935443420000016173109294766067385_" inkscape:connector-curvature="0" fill="none" stroke="#0D0D0D" stroke-width="2.538" stroke-linecap="round" stroke-miterlimit="10" d=" <path id="path57706_00000159433138952935443420000016173109294766067385_" inkscape:connector-curvature="0" fill="none" stroke="#0D0D0D" stroke-width="2.538" stroke-linecap="round" stroke-miterlimit="10" d="
M5.48049,229.23358h19.18359"/> M5.48049,229.23358h19.18359"/>
@@ -367,8 +307,8 @@
M125.48046,229.23358h19.18359"/> M125.48046,229.23358h19.18359"/>
<polygon fill="#101010" points="144.04727,222.0582 126.09727,222.0582 127.27345,220.71796 142.87111,220.71796 "/> <polygon fill="#101010" points="144.04727,222.0582 126.09727,222.0582 127.27345,220.71796 142.87111,220.71796 "/>
<polygon fill="#060606" points="144.04727,157.97539 126.09727,157.97539 127.27345,159.31563 142.87111,159.31563 "/> <polygon fill="#060606" points="144.04727,157.97539 126.09727,157.97539 127.27345,159.31563 142.87111,159.31563 "/>
<rect x="125.00002" y="223.47577" fill="#060606" width="20.14844" height="0.37773"/>
<rect x="125.00002" y="223.85352" fill="#030303" width="20.14844" height="3.00468"/>
<rect x="125.00002" y="223.47577" fill="#060606" width="20.14845" height="0.37773"/>
<rect x="125.00002" y="223.85352" fill="#030303" width="20.14845" height="3.00468"/>
<rect x="127.27345" y="159.31563" fill="#050505" width="15.59766" height="2.14258"/> <rect x="127.27345" y="159.31563" fill="#050505" width="15.59766" height="2.14258"/>
<rect x="142.87111" y="183.78944" fill="#101010" width="2.26953" height="1.81876"/> <rect x="142.87111" y="183.78944" fill="#101010" width="2.26953" height="1.81876"/>
<path id="path57670_00000027594546992283084890000006207756246873065150_" inkscape:connector-curvature="0" fill="#050505" d=" <path id="path57670_00000027594546992283084890000006207756246873065150_" inkscape:connector-curvature="0" fill="#050505" d="
@@ -531,10 +471,70 @@
M245.48048,229.23358h19.18358"/> M245.48048,229.23358h19.18358"/>
<polygon fill="#101010" points="264.0473,222.0582 246.09727,222.0582 247.27345,220.71796 262.87109,220.71796 "/> <polygon fill="#101010" points="264.0473,222.0582 246.09727,222.0582 247.27345,220.71796 262.87109,220.71796 "/>
<polygon fill="#060606" points="264.0473,157.97539 246.09727,157.97539 247.27345,159.31563 262.87109,159.31563 "/> <polygon fill="#060606" points="264.0473,157.97539 246.09727,157.97539 247.27345,159.31563 262.87109,159.31563 "/>
<rect x="245.00002" y="223.47577" fill="#060606" width="20.14844" height="0.37773"/>
<rect x="245.00002" y="223.85352" fill="#030303" width="20.14844" height="3.00468"/>
<rect x="247.27345" y="159.31563" fill="#050505" width="15.59766" height="2.14258"/>
<rect x="245.00002" y="223.47577" fill="#060606" width="20.14845" height="0.37773"/>
<rect x="245.00002" y="223.85352" fill="#030303" width="20.14845" height="3.00468"/>
<rect x="247.27345" y="159.31563" fill="#050505" width="15.59767" height="2.14258"/>
<rect x="262.87109" y="183.78944" fill="#101010" width="2.26953" height="1.81876"/> <rect x="262.87109" y="183.78944" fill="#101010" width="2.26953" height="1.81876"/>
<rect x="-0.00002" y="144.99997" fill="#121212" width="304.00003" height="0.89735"/> <rect x="-0.00002" y="144.99997" fill="#121212" width="304.00003" height="0.89735"/>
<rect x="-0.00002" y="234.1026" fill="#030303" width="304.00003" height="0.89735"/> <rect x="-0.00002" y="234.1026" fill="#030303" width="304.00003" height="0.89735"/>
<g>
<g>
<rect x="0.00004" y="0" fill="#DEDEDE" width="304" height="14.93071"/>
<rect x="0.00004" y="1.65063" fill="#9D9FA2" width="304" height="13.28007"/>
<rect x="0.00004" y="1.20046" fill="#C9C9C9" width="304" height="12.52979"/>
<rect x="0.00004" y="2.85109" fill="#7E8082" width="304" height="9.22853"/>
<rect x="0.00004" y="4.12658" fill="#DEDEDE" width="304" height="7.95304"/>
<rect x="0.00004" y="3.82646" fill="#ADADAD" width="304" height="7.27778"/>
<rect x="0.00004" y="3.82646" opacity="0.15" enable-background="new " width="304" height="1.87572"/>
</g>
<g>
<rect x="0.00004" y="365.06931" fill="#DEDEDE" width="304" height="14.93069"/>
<rect x="0.00004" y="366.71994" fill="#9D9FA2" width="304" height="13.28006"/>
<rect x="0.00004" y="366.26974" fill="#C9C9C9" width="304" height="12.52979"/>
<rect x="0.00004" y="367.92038" fill="#7E8082" width="304" height="9.22852"/>
<rect x="0.00004" y="369.19586" fill="#DEDEDE" width="304" height="7.95303"/>
<rect x="0.00004" y="368.89575" fill="#ADADAD" width="304" height="7.27777"/>
<rect x="0.00004" y="368.89575" opacity="0.15" enable-background="new " width="304" height="1.87573"/>
</g>
<circle fill="#303030" cx="7.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="7.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="22.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="22.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="37.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="37.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="52.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="52.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="67.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="67.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="82.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="82.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="97.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="97.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="112.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="112.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="127.50004" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="127.50004" cy="372.63129" r="3.3375"/>
<circle fill="#303030" cx="142.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="142.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="157.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="157.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="172.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="172.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="187.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="187.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="202.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="202.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="217.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="217.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="232.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="232.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="247.50005" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="247.50005" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="262.50003" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="262.50003" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="277.50003" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="277.50003" cy="372.63129" r="3.33749"/>
<circle fill="#303030" cx="292.50003" cy="7.70148" r="3.3375"/>
<circle fill="#303030" cx="292.50003" cy="372.63129" r="3.33749"/>
</g>
</svg> </svg>

+ 538
- 534
res/ComponentLibrary/Rail-light.svg
File diff suppressed because it is too large
View File


+ 2
- 2
src/app/MenuBar.cpp View File

@@ -422,8 +422,8 @@ struct ViewButton : MenuButton {
menu->addChild(new ui::MenuSeparator); menu->addChild(new ui::MenuSeparator);
menu->addChild(createMenuLabel("Appearance")); menu->addChild(createMenuLabel("Appearance"));


static const std::vector<std::string> uiThemes = {"default", "light", "dark"};
static const std::vector<std::string> uiThemeLabels = {"Default", "Light", "Dark"};
static const std::vector<std::string> uiThemes = {"dark", "light", "hcdark"};
static const std::vector<std::string> uiThemeLabels = {"Dark", "Light", "High contrast dark"};
menu->addChild(createIndexSubmenuItem("Theme", uiThemeLabels, menu->addChild(createIndexSubmenuItem("Theme", uiThemeLabels,
[=]() -> size_t { [=]() -> size_t {
auto it = std::find(uiThemes.begin(), uiThemes.end(), settings::uiTheme); auto it = std::find(uiThemes.begin(), uiThemes.end(), settings::uiTheme);


+ 3
- 3
src/app/RailWidget.cpp View File

@@ -42,11 +42,11 @@ void RailWidget::step() {
if (settings::uiTheme == "light") { if (settings::uiTheme == "light") {
railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-light.svg")); railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-light.svg"));
} }
else if (settings::uiTheme == "dark") {
railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-dark.svg"));
else if (settings::uiTheme == "hcdark") {
railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail-hcdark.svg"));
} }
else { else {
// Default
// Dark
railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail.svg")); railSvg = window::Svg::load(asset::system("res/ComponentLibrary/Rail.svg"));
} }




+ 2
- 2
src/ui/common.cpp View File

@@ -76,11 +76,11 @@ void refreshTheme() {
if (settings::uiTheme == "light") { if (settings::uiTheme == "light") {
setTheme(nvgRGB(0xf0, 0xf0, 0xf0), nvgRGB(0x04, 0x04, 0x04)); setTheme(nvgRGB(0xf0, 0xf0, 0xf0), nvgRGB(0x04, 0x04, 0x04));
} }
else if (settings::uiTheme == "dark") {
else if (settings::uiTheme == "hcdark") {
setTheme(nvgRGB(0x00, 0x00, 0x00), nvgRGB(0xff, 0xff, 0xff)); setTheme(nvgRGB(0x00, 0x00, 0x00), nvgRGB(0xff, 0xff, 0xff));
} }
else { else {
// Default
// Dark
setTheme(nvgRGB(0x20, 0x20, 0x20), nvgRGB(0xf0, 0xf0, 0xf0)); setTheme(nvgRGB(0x20, 0x20, 0x20), nvgRGB(0xf0, 0xf0, 0xf0));
} }
} }


Loading…
Cancel
Save