add: added colorful system tray icon, fixed #214

This commit is contained in:
Qv2ray-dev 2020-04-17 22:06:56 +08:00
parent 5783c9eb61
commit 51e80b841c
16 changed files with 1365 additions and 21 deletions

View File

@ -0,0 +1,310 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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="22"
height="22"
viewBox="0 0 5.8208333 5.8208333"
version="1.1"
id="svg8"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="tray-connected.svg"
inkscape:export-xdpi="558.54999"
inkscape:export-ydpi="558.54999"
inkscape:export-filename="/media/Storage/Projects/Qv2ray/assets/icons/ui_dark/design/tray-connected.svg.png">
<defs
id="defs2">
<linearGradient
id="linearGradient841"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop839" />
</linearGradient>
<linearGradient
id="linearGradient5057"
inkscape:collect="always">
<stop
id="stop5053"
offset="0"
style="stop-color:#3c3c3c;stop-opacity:1;" />
<stop
id="stop5055"
offset="1"
style="stop-color:#282728;stop-opacity:0.6574803" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4713">
<stop
style="stop-color:#3de256;stop-opacity:1"
offset="0"
id="stop4709" />
<stop
style="stop-color:#2fbeba;stop-opacity:1"
offset="1"
id="stop4711" />
</linearGradient>
<linearGradient
gradientTransform="translate(38.574145,1.3181723)"
gradientUnits="userSpaceOnUse"
y2="39.934193"
x2="108.00179"
y1="19.458199"
x1="89.965836"
id="linearGradient4707"
xlink:href="#linearGradient4713"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="94.022179"
x2="140.26065"
y1="48.940449"
x1="92.227142"
id="linearGradient5059"
xlink:href="#linearGradient5057"
inkscape:collect="always" />
<clipPath
id="clipPath922"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<clipPath
id="clipPath922-6"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924-2"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1510">
<feFlood
flood-opacity="0.976471"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1500" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1502" />
<feGaussianBlur
in="composite1"
stdDeviation="0.1"
result="blur"
id="feGaussianBlur1504" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1506" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1508" />
</filter>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1859">
<feFlood
flood-opacity="0.266667"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1849" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1851" />
<feGaussianBlur
in="composite1"
stdDeviation="0.2"
result="blur"
id="feGaussianBlur1853" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1855" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1857" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.627417"
inkscape:cx="-5.2209634"
inkscape:cy="5.0686426"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-bottom="5"
fit-margin-right="5"
inkscape:snap-global="true"
inkscape:object-paths="false"
inkscape:snap-intersection-paths="false"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-grids="false"
inkscape:snap-object-midpoints="true"
showguides="true"
inkscape:guide-bbox="true"
scale-x="1"
guidecolor="#00ffff"
guideopacity="0.49803922"
guidehicolor="#ff5184"
guidehiopacity="0.62745098"
inkscape:snap-nodes="true"
inkscape:snap-others="false">
<inkscape:grid
type="xygrid"
id="grid815"
originx="0"
originy="0"
color="#3f513e"
opacity="0.04313725"
empcolor="#3f3742"
empopacity="0.16470588"
empspacing="5"
dotted="false" />
<sodipodi:guide
position="28.284675,2.8909227"
orientation="1,0"
id="guide924"
inkscape:locked="false" />
<sodipodi:guide
position="26.141,6.3542733"
orientation="1,0"
id="guide932"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,255,236)" />
<sodipodi:guide
position="0.79375,4.4979166"
orientation="1,0"
id="guide1884"
inkscape:locked="false" />
<sodipodi:guide
position="3.96875,5.0270833"
orientation="0,1"
id="guide1886"
inkscape:locked="false" />
<sodipodi:guide
position="5.0270833,0.26458333"
orientation="1,0"
id="guide1888"
inkscape:locked="false" />
<sodipodi:guide
position="4.4979166,0.79375"
orientation="0,1"
id="guide1890"
inkscape:locked="false" />
</sodipodi:namedview>
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-1.9173392,-290.74464)">
<path
id="path1962"
transform="matrix(0.26458333,0,0,0.26458333,1.9173392,290.74464)"
style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7,11 6.2929688,11.707031 8.5859375,14 H 18 V 13 H 9 Z M 6.2929688,11.707031 5,13 H 4 v 1 H 5.4140625 L 7,12.414062 Z M 3,3 V 18.999988 H 19 V 3 Z M 3.9999999,3.9999875 H 18 V 18 H 3.9999999 Z" />
<rect
style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:0.04583338;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect844"
width="5.8208332"
height="5.8208447"
x="1.9173392"
y="290.74463"
inkscape:export-xdpi="64"
inkscape:export-ydpi="64" />
<path
style="fill:#ececec;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.5631726,292.06756 -0.2645834,0.26459 v 0.52916 l 0.2645834,-0.26458 v 0.26458 0.52917 l 0.5291666,0.79375 0.5291667,1.32291 v -0.79374 l 0.2645833,-0.26459 -0.2645833,-0.52916 v -0.79375 l -0.2645833,-0.52917 z"
id="path1934"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccc" />
<g
id="g868" />
<g
id="g873"
transform="translate(0.24804686,0.57052501)" />
<circle
style="fill:#999999;stroke-width:0.18761367;fill-opacity:1"
id="path43"
cx="6.2250867"
cy="295.03583"
r="0.96738303" />
<ellipse
cy="295.03583"
cx="6.2250867"
id="path43-3"
style="fill:#2edf46;fill-opacity:1;stroke-width:0.15462632"
rx="0.79291928"
ry="0.80168903" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 9.3 KiB

View File

@ -0,0 +1,309 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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="22"
height="22"
viewBox="0 0 5.8208333 5.8208333"
version="1.1"
id="svg8"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="tray-systemproxy.svg"
inkscape:export-xdpi="558.54999"
inkscape:export-ydpi="558.54999">
<defs
id="defs2">
<linearGradient
id="linearGradient841"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop839" />
</linearGradient>
<linearGradient
id="linearGradient5057"
inkscape:collect="always">
<stop
id="stop5053"
offset="0"
style="stop-color:#3c3c3c;stop-opacity:1;" />
<stop
id="stop5055"
offset="1"
style="stop-color:#282728;stop-opacity:0.6574803" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4713">
<stop
style="stop-color:#3de256;stop-opacity:1"
offset="0"
id="stop4709" />
<stop
style="stop-color:#2fbeba;stop-opacity:1"
offset="1"
id="stop4711" />
</linearGradient>
<linearGradient
gradientTransform="translate(38.574145,1.3181723)"
gradientUnits="userSpaceOnUse"
y2="39.934193"
x2="108.00179"
y1="19.458199"
x1="89.965836"
id="linearGradient4707"
xlink:href="#linearGradient4713"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="94.022179"
x2="140.26065"
y1="48.940449"
x1="92.227142"
id="linearGradient5059"
xlink:href="#linearGradient5057"
inkscape:collect="always" />
<clipPath
id="clipPath922"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<clipPath
id="clipPath922-6"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924-2"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1510">
<feFlood
flood-opacity="0.976471"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1500" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1502" />
<feGaussianBlur
in="composite1"
stdDeviation="0.1"
result="blur"
id="feGaussianBlur1504" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1506" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1508" />
</filter>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1859">
<feFlood
flood-opacity="0.266667"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1849" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1851" />
<feGaussianBlur
in="composite1"
stdDeviation="0.2"
result="blur"
id="feGaussianBlur1853" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1855" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1857" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="5.778172"
inkscape:cy="7.0536028"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-bottom="5"
fit-margin-right="5"
inkscape:snap-global="true"
inkscape:object-paths="false"
inkscape:snap-intersection-paths="false"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-grids="false"
inkscape:snap-object-midpoints="true"
showguides="true"
inkscape:guide-bbox="true"
scale-x="1"
guidecolor="#00ffff"
guideopacity="0.49803922"
guidehicolor="#ff5184"
guidehiopacity="0.62745098"
inkscape:snap-nodes="true"
inkscape:snap-others="false">
<inkscape:grid
type="xygrid"
id="grid815"
originx="0"
originy="0"
color="#3f513e"
opacity="0.04313725"
empcolor="#3f3742"
empopacity="0.16470588"
empspacing="5"
dotted="false" />
<sodipodi:guide
position="28.284675,2.8909227"
orientation="1,0"
id="guide924"
inkscape:locked="false" />
<sodipodi:guide
position="26.141,6.3542733"
orientation="1,0"
id="guide932"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,255,236)" />
<sodipodi:guide
position="0.79375,4.4979166"
orientation="1,0"
id="guide1884"
inkscape:locked="false" />
<sodipodi:guide
position="3.96875,5.0270833"
orientation="0,1"
id="guide1886"
inkscape:locked="false" />
<sodipodi:guide
position="5.0270833,0.26458333"
orientation="1,0"
id="guide1888"
inkscape:locked="false" />
<sodipodi:guide
position="4.4979166,0.79375"
orientation="0,1"
id="guide1890"
inkscape:locked="false" />
</sodipodi:namedview>
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-1.9173392,-290.74464)">
<path
id="path1962"
transform="matrix(0.26458333,0,0,0.26458333,1.9173392,290.74464)"
style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7,11 6.2929688,11.707031 8.5859375,14 H 18 V 13 H 9 Z M 6.2929688,11.707031 5,13 H 4 v 1 H 5.4140625 L 7,12.414062 Z M 3,3 V 18.999988 H 19 V 3 Z M 3.9999999,3.9999875 H 18 V 18 H 3.9999999 Z" />
<rect
style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:0.04583338;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect844"
width="5.8208332"
height="5.8208447"
x="1.9173392"
y="290.74463"
inkscape:export-xdpi="64"
inkscape:export-ydpi="64" />
<path
style="fill:#ececec;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.5631726,292.06756 -0.2645834,0.26459 v 0.52916 l 0.2645834,-0.26458 v 0.26458 0.52917 l 0.5291666,0.79375 0.5291667,1.32291 v -0.79374 l 0.2645833,-0.26459 -0.2645833,-0.52916 v -0.79375 l -0.2645833,-0.52917 z"
id="path1934"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccc" />
<g
id="g868" />
<g
id="g873"
transform="translate(0.24804686,0.57052501)" />
<circle
style="fill:#dfdfdf;stroke-width:0.18761367;fill-opacity:1"
id="path43"
cx="6.2250867"
cy="295.03583"
r="0.96738303" />
<ellipse
cy="295.03583"
cx="6.2250867"
id="path43-3"
style="fill:#4ddbf3;fill-opacity:1;stroke-width:0.15462632"
rx="0.79291928"
ry="0.80168903" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -0,0 +1,356 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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="22"
height="22"
viewBox="0 0 5.8208333 5.8208333"
version="1.1"
id="svg8"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="tray-connected.svg"
inkscape:export-xdpi="558.54999"
inkscape:export-ydpi="558.54999">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
id="linearGradient876">
<stop
style="stop-color:#31363b;stop-opacity:0.58823532"
offset="0"
id="stop872" />
<stop
style="stop-color:#31363b;stop-opacity:0;"
offset="1"
id="stop874" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient866">
<stop
style="stop-color:#31363b;stop-opacity:0.58823532"
offset="0"
id="stop862" />
<stop
style="stop-color:#31363b;stop-opacity:0;"
offset="1"
id="stop864" />
</linearGradient>
<linearGradient
id="linearGradient841"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop839" />
</linearGradient>
<linearGradient
id="linearGradient5057"
inkscape:collect="always">
<stop
id="stop5053"
offset="0"
style="stop-color:#3c3c3c;stop-opacity:1;" />
<stop
id="stop5055"
offset="1"
style="stop-color:#282728;stop-opacity:0.6574803" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4713">
<stop
style="stop-color:#3de256;stop-opacity:1"
offset="0"
id="stop4709" />
<stop
style="stop-color:#2fbeba;stop-opacity:1"
offset="1"
id="stop4711" />
</linearGradient>
<linearGradient
gradientTransform="translate(38.574145,1.3181723)"
gradientUnits="userSpaceOnUse"
y2="39.934193"
x2="108.00179"
y1="19.458199"
x1="89.965836"
id="linearGradient4707"
xlink:href="#linearGradient4713"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="94.022179"
x2="140.26065"
y1="48.940449"
x1="92.227142"
id="linearGradient5059"
xlink:href="#linearGradient5057"
inkscape:collect="always" />
<clipPath
id="clipPath922"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<clipPath
id="clipPath922-6"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924-2"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1510">
<feFlood
flood-opacity="0.976471"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1500" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1502" />
<feGaussianBlur
in="composite1"
stdDeviation="0.1"
result="blur"
id="feGaussianBlur1504" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1506" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1508" />
</filter>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1859">
<feFlood
flood-opacity="0.266667"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1849" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1851" />
<feGaussianBlur
in="composite1"
stdDeviation="0.2"
result="blur"
id="feGaussianBlur1853" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1855" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1857" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient866"
id="linearGradient868"
x1="4.2985892"
y1="292.06757"
x2="7.7381635"
y2="295.50714"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient876"
id="linearGradient878"
x1="5.6215057"
y1="294.44879"
x2="6.6798391"
y2="295.50714"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="4.561514"
inkscape:cy="3.2123107"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-bottom="5"
fit-margin-right="5"
inkscape:snap-global="true"
inkscape:object-paths="false"
inkscape:snap-intersection-paths="false"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-grids="false"
inkscape:snap-object-midpoints="true"
showguides="true"
inkscape:guide-bbox="true"
scale-x="1"
guidecolor="#00ffff"
guideopacity="0.49803922"
guidehicolor="#ff5184"
guidehiopacity="0.62745098"
inkscape:snap-nodes="true"
inkscape:snap-others="false">
<inkscape:grid
type="xygrid"
id="grid815"
originx="0"
originy="0"
color="#3f513e"
opacity="0.04313725"
empcolor="#3f3742"
empopacity="0.16470588"
empspacing="5"
dotted="false" />
<sodipodi:guide
position="11.244792,0.79375"
orientation="1,0"
id="guide924"
inkscape:locked="false" />
<sodipodi:guide
position="-1.6867187,5.0270833"
orientation="1,0"
id="guide932"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,255,236)" />
<sodipodi:guide
position="0.79375,4.4979166"
orientation="1,0"
id="guide1884"
inkscape:locked="false" />
<sodipodi:guide
position="3.96875,5.0270833"
orientation="0,1"
id="guide1886"
inkscape:locked="false" />
<sodipodi:guide
position="5.0270833,0.26458333"
orientation="1,0"
id="guide1888"
inkscape:locked="false" />
<sodipodi:guide
position="4.4979166,0.79375"
orientation="0,1"
id="guide1890"
inkscape:locked="false" />
</sodipodi:namedview>
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-1.9173392,-290.74464)">
<path
style="fill:url(#linearGradient878);stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.65"
d="m 5.6215058,295.50714 v -0.79375 l 0.2645833,-0.26458 0.79375,0.79375 v 0.26458 z"
id="path870"
inkscape:connector-curvature="0" />
<path
style="fill:url(#linearGradient868);stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.65"
d="m 4.2985892,292.86131 2.3812499,2.38125 v -1.32292 l -1.3229166,-1.32292 -0.79375,-0.52916 -0.2645833,0.26458 z"
id="path860"
inkscape:connector-curvature="0" />
<path
id="path1962"
transform="matrix(0.26458333,0,0,0.26458333,1.9173392,290.74464)"
style="fill:#31363b;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7,11 6.2929688,11.707031 8.5859375,14 H 18 V 13 H 9 Z M 6.2929688,11.707031 5,13 H 4 v 1 H 5.4140625 L 7,12.414062 Z M 3,3 V 18.999988 H 19 V 3 Z M 3.9999999,3.9999875 H 18 V 18 H 3.9999999 Z" />
<rect
style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:0.04583338;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect844"
width="5.8208332"
height="5.8208447"
x="1.9173392"
y="290.74463"
inkscape:export-xdpi="64"
inkscape:export-ydpi="64" />
<path
style="fill:#31363b;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.5631726,292.06756 -0.2645834,0.26459 v 0.52916 l 0.2645834,-0.26458 v 0.26458 0.52917 l 0.5291666,0.79375 0.5291667,1.32291 v -0.79374 l 0.2645833,-0.26459 -0.2645833,-0.52916 v -0.79375 l -0.2645833,-0.52917 z"
id="path1934"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccc" />
<circle
style="fill:#595959;fill-opacity:1;stroke-width:0.18761367"
id="path43"
cx="6.2266774"
cy="295.0452"
r="0.96738309" />
<ellipse
cy="295.0452"
cx="6.2266774"
id="path43-3"
style="fill:#2cee14;fill-opacity:1;stroke-width:0.15462632"
rx="0.79291928"
ry="0.80168903" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,359 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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="22"
height="22"
viewBox="0 0 5.8208333 5.8208333"
version="1.1"
id="svg8"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="tray-systemproxy.svg"
inkscape:export-xdpi="558.54999"
inkscape:export-ydpi="558.54999">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
id="linearGradient876">
<stop
style="stop-color:#31363b;stop-opacity:0.58823532"
offset="0"
id="stop872" />
<stop
style="stop-color:#31363b;stop-opacity:0;"
offset="1"
id="stop874" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient866">
<stop
style="stop-color:#31363b;stop-opacity:0.58823532"
offset="0"
id="stop862" />
<stop
style="stop-color:#31363b;stop-opacity:0;"
offset="1"
id="stop864" />
</linearGradient>
<linearGradient
id="linearGradient841"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop839" />
</linearGradient>
<linearGradient
id="linearGradient5057"
inkscape:collect="always">
<stop
id="stop5053"
offset="0"
style="stop-color:#3c3c3c;stop-opacity:1;" />
<stop
id="stop5055"
offset="1"
style="stop-color:#282728;stop-opacity:0.6574803" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4713">
<stop
style="stop-color:#3de256;stop-opacity:1"
offset="0"
id="stop4709" />
<stop
style="stop-color:#2fbeba;stop-opacity:1"
offset="1"
id="stop4711" />
</linearGradient>
<linearGradient
gradientTransform="translate(38.574145,1.3181723)"
gradientUnits="userSpaceOnUse"
y2="39.934193"
x2="108.00179"
y1="19.458199"
x1="89.965836"
id="linearGradient4707"
xlink:href="#linearGradient4713"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="94.022179"
x2="140.26065"
y1="48.940449"
x1="92.227142"
id="linearGradient5059"
xlink:href="#linearGradient5057"
inkscape:collect="always" />
<clipPath
id="clipPath922"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<clipPath
id="clipPath922-6"
clipPathUnits="userSpaceOnUse">
<rect
ry="1.0638391"
y="284.56458"
x="9.5367426e-08"
height="12.170834"
width="12.7"
id="rect924-2"
style="fill:none;fill-opacity:1;stroke:#23d829;stroke-width:0.044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.72265625" />
</clipPath>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1510">
<feFlood
flood-opacity="0.976471"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1500" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1502" />
<feGaussianBlur
in="composite1"
stdDeviation="0.1"
result="blur"
id="feGaussianBlur1504" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1506" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1508" />
</filter>
<filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1859">
<feFlood
flood-opacity="0.266667"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1849" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1851" />
<feGaussianBlur
in="composite1"
stdDeviation="0.2"
result="blur"
id="feGaussianBlur1853" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset1855" />
<feComposite
in="offset"
in2="SourceGraphic"
operator="out"
result="composite2"
id="feComposite1857" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient866"
id="linearGradient868"
x1="4.2985892"
y1="292.06757"
x2="7.7381635"
y2="295.50714"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient876"
id="linearGradient878"
x1="5.6215057"
y1="294.44879"
x2="6.6798391"
y2="295.50714"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="9.920889"
inkscape:cy="8.4623107"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-bottom="5"
fit-margin-right="5"
inkscape:snap-global="true"
inkscape:object-paths="false"
inkscape:snap-intersection-paths="false"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-grids="false"
inkscape:snap-object-midpoints="true"
showguides="true"
inkscape:guide-bbox="true"
scale-x="1"
guidecolor="#00ffff"
guideopacity="0.49803922"
guidehicolor="#ff5184"
guidehiopacity="0.62745098"
inkscape:snap-nodes="true"
inkscape:snap-others="false">
<inkscape:grid
type="xygrid"
id="grid815"
originx="0"
originy="0"
color="#3f513e"
opacity="0.04313725"
empcolor="#3f3742"
empopacity="0.16470588"
empspacing="5"
dotted="false" />
<sodipodi:guide
position="11.244792,0.79375"
orientation="1,0"
id="guide924"
inkscape:locked="false" />
<sodipodi:guide
position="-1.6867187,5.0270833"
orientation="1,0"
id="guide932"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,255,236)" />
<sodipodi:guide
position="0.79375,4.4979166"
orientation="1,0"
id="guide1884"
inkscape:locked="false" />
<sodipodi:guide
position="3.96875,5.0270833"
orientation="0,1"
id="guide1886"
inkscape:locked="false" />
<sodipodi:guide
position="5.0270833,0.26458333"
orientation="1,0"
id="guide1888"
inkscape:locked="false" />
<sodipodi:guide
position="4.4979166,0.79375"
orientation="0,1"
id="guide1890"
inkscape:locked="false" />
</sodipodi:namedview>
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-1.9173392,-290.74464)">
<path
style="fill:url(#linearGradient878);stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.65"
d="m 5.6215058,295.50714 v -0.79375 l 0.2645833,-0.26458 0.79375,0.79375 v 0.26458 z"
id="path870"
inkscape:connector-curvature="0" />
<path
style="fill:url(#linearGradient868);stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.65"
d="m 4.2985892,292.86131 2.3812499,2.38125 v -1.32292 l -1.3229166,-1.32292 -0.79375,-0.52916 -0.2645833,0.26458 z"
id="path860"
inkscape:connector-curvature="0" />
<path
id="path1962"
transform="matrix(0.26458333,0,0,0.26458333,1.9173392,290.74464)"
style="fill:#31363b;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7,11 6.2929688,11.707031 8.5859375,14 H 18 V 13 H 9 Z M 6.2929688,11.707031 5,13 H 4 v 1 H 5.4140625 L 7,12.414062 Z M 3,3 V 18.999988 H 19 V 3 Z M 3.9999999,3.9999875 H 18 V 18 H 3.9999999 Z" />
<rect
style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:0.04583338;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect844"
width="5.8208332"
height="5.8208447"
x="1.9173392"
y="290.74463"
inkscape:export-xdpi="64"
inkscape:export-ydpi="64" />
<path
style="fill:#31363b;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.5631726,292.06756 -0.2645834,0.26459 v 0.52916 l 0.2645834,-0.26458 v 0.26458 0.52917 l 0.5291666,0.79375 0.5291667,1.32291 v -0.79374 l 0.2645833,-0.26459 -0.2645833,-0.52916 v -0.79375 l -0.2645833,-0.52917 z"
id="path1934"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccc" />
<circle
style="fill:#595959;fill-opacity:1;stroke-width:0.18761367"
id="path43"
cx="6.2266774"
cy="295.0452"
r="0.96738309" />
<ellipse
cy="295.0452"
cx="6.2266774"
id="path43-3"
style="fill:#00c3ff;fill-opacity:1;stroke-width:0.15462632"
rx="0.79291928"
ry="0.80168903"
inkscape:export-filename="/media/Storage/Projects/Qv2ray/assets/icons/ui_light/tray-systemproxy.png"
inkscape:export-xdpi="2050.1499"
inkscape:export-ydpi="2050.1499" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -1 +1 @@
5262
5263

View File

@ -32,5 +32,9 @@
<file>assets/icons/ui_light/locate.png</file>
<file>assets/icons/ui_dark/sort.png</file>
<file>assets/icons/ui_light/sort.png</file>
<file>assets/icons/ui_dark/tray-connected.png</file>
<file>assets/icons/ui_dark/tray-systemproxy.png</file>
<file>assets/icons/ui_light/tray-connected.png</file>
<file>assets/icons/ui_light/tray-systemproxy.png</file>
</qresource>
</RCC>

View File

@ -97,9 +97,11 @@ using namespace Qv2ray::base::objects::transfer;
#define ACCESS_OPTIONAL_VALUE(obj) (obj.value())
#endif
#define QV2RAY_UI_COLORSCHEME_ROOT \
#define Q_TRAYICON(name) (QIcon(GlobalConfig.uiConfig.useDarkTrayIcon ? ":/assets/icons/ui_dark/" name : ":/assets/icons/ui_light/" name))
#define QV2RAY_COLORSCHEME_ROOT \
((GlobalConfig.uiConfig.useDarkTheme) ? QStringLiteral(":/assets/icons/ui_dark/") : QStringLiteral(":/assets/icons/ui_light/"))
#define QICON_R(file) QIcon(QV2RAY_UI_COLORSCHEME_ROOT + file)
#define QICON_R(file) QIcon(QV2RAY_COLORSCHEME_ROOT + file)
#define QSTRN(num) QString::number(num)

View File

@ -89,14 +89,14 @@ namespace Qv2ray::components::plugins
case 104:
{
// Current Connection Name
CL.Message = GetDisplayName(ConnectionManager->CurrentConnection());
CL.Message = GetDisplayName(KernelInstance->CurrentConnection());
break;
}
case 105:
{
// Current Connection Status
CL.Message = ConnectionManager->CurrentConnection() == NullConnectionId ? QObject::tr("Not connected") :
CL.Message = KernelInstance->CurrentConnection() == NullConnectionId ? QObject::tr("Not connected") :
QObject::tr("Connected");
break;
}
@ -132,14 +132,14 @@ namespace Qv2ray::components::plugins
case 301:
{
// Total Upload
CL.Message = FormatBytes(get<0>(GetConnectionUsageAmount(ConnectionManager->CurrentConnection())));
CL.Message = FormatBytes(get<0>(GetConnectionUsageAmount(KernelInstance->CurrentConnection())));
break;
}
case 302:
{
// Total download
CL.Message = FormatBytes(get<1>(GetConnectionUsageAmount(ConnectionManager->CurrentConnection())));
CL.Message = FormatBytes(get<1>(GetConnectionUsageAmount(KernelInstance->CurrentConnection())));
break;
}
@ -160,7 +160,7 @@ namespace Qv2ray::components::plugins
case 305:
{
// Connection latency
CL.Message = QSTRN(GetConnectionLatency(ConnectionManager->CurrentConnection())) + " ms";
CL.Message = QSTRN(GetConnectionLatency(KernelInstance->CurrentConnection())) + " ms";
break;
}
default:

View File

@ -29,11 +29,6 @@ namespace Qv2ray::core::handlers
~QvConfigHandler();
public slots:
//
inline const ConnectionId CurrentConnection() const
{
return kernelHandler->CurrentConnection();
}
inline const QList<ConnectionId> Connections() const
{
return connections.keys();

View File

@ -4,8 +4,10 @@
#include "core/connection/Generation.hpp"
namespace Qv2ray::core::handlers
{
#define isConnected (vCoreInstance->KernelStarted || !activeKernels.isEmpty())
KernelInstanceHandler::KernelInstanceHandler(QObject *parent) : QObject(parent)
{
KernelInstance = this;
vCoreInstance = new V2rayKernelInstance(this);
connect(vCoreInstance, &V2rayKernelInstance::OnNewStatsDataArrived, this, &KernelInstanceHandler::OnStatsDataArrived_p);
connect(vCoreInstance, &V2rayKernelInstance::OnProcessOutputReadyRead, this, &KernelInstanceHandler::OnKernelLogAvailable_p);
@ -25,7 +27,7 @@ namespace Qv2ray::core::handlers
std::optional<QString> KernelInstanceHandler::StartConnection(const ConnectionId &id, const CONFIGROOT &root)
{
if (vCoreInstance->KernelStarted || !activeKernels.isEmpty())
if (isConnected)
{
StopConnection();
}
@ -240,7 +242,7 @@ namespace Qv2ray::core::handlers
void KernelInstanceHandler::StopConnection()
{
if (vCoreInstance->KernelStarted || !activeKernels.isEmpty())
if (isConnected)
{
PluginHost->Send_ConnectivityEvent({ GetDisplayName(currentConnectionId), {}, Events::Connectivity::QvConnecticity_Disconnecting });
if (vCoreInstance->KernelStarted)
@ -266,7 +268,10 @@ namespace Qv2ray::core::handlers
}
void KernelInstanceHandler::OnStatsDataArrived_p(const quint64 uploadSpeed, const quint64 downloadSpeed)
{
if (isConnected)
{
emit OnStatsDataAvailable(currentConnectionId, uploadSpeed, downloadSpeed);
}
}
} // namespace Qv2ray::core::handlers

View File

@ -51,11 +51,11 @@ QvMessageBusSlotImpl(MainWindow)
void MainWindow::UpdateColorScheme()
{
hTray.setIcon(QIcon(GlobalConfig.uiConfig.useDarkTrayIcon ? ":/assets/icons/ui_dark/tray.png" : ":/assets/icons/ui_light/tray.png"));
hTray.setIcon(KernelInstance->CurrentConnection() == NullConnectionId ? Q_TRAYICON("tray.png") : Q_TRAYICON("tray-connected.png"));
//
importConfigButton->setIcon(QICON_R("import.png"));
updownImageBox->setStyleSheet("image: url(" + QV2RAY_UI_COLORSCHEME_ROOT + "netspeed_arrow.png)");
updownImageBox_2->setStyleSheet("image: url(" + QV2RAY_UI_COLORSCHEME_ROOT + "netspeed_arrow.png)");
updownImageBox->setStyleSheet("image: url(" + QV2RAY_COLORSCHEME_ROOT + "netspeed_arrow.png)");
updownImageBox_2->setStyleSheet("image: url(" + QV2RAY_COLORSCHEME_ROOT + "netspeed_arrow.png)");
//
tray_action_ShowHide->setIcon(this->windowIcon());
action_RCM_Start->setIcon(QICON_R("connect.png"));
@ -583,6 +583,7 @@ void MainWindow::on_connectionListWidget_itemDoubleClicked(QTreeWidgetItem *item
void MainWindow::OnDisconnected(const ConnectionId &id)
{
Q_UNUSED(id)
hTray.setIcon(Q_TRAYICON("tray.png"));
tray_action_Start->setEnabled(true);
tray_action_Stop->setEnabled(false);
tray_action_Restart->setEnabled(false);
@ -606,6 +607,7 @@ void MainWindow::OnDisconnected(const ConnectionId &id)
void MainWindow::OnConnected(const ConnectionId &id)
{
Q_UNUSED(id)
hTray.setIcon(Q_TRAYICON("tray-connected.png"));
tray_action_Start->setEnabled(false);
tray_action_Stop->setEnabled(true);
tray_action_Restart->setEnabled(true);
@ -817,7 +819,7 @@ void MainWindow::OnGroupDeleted(const GroupId &id, const QList<ConnectionId> &co
void MainWindow::on_locateBtn_clicked()
{
auto id = ConnectionManager->CurrentConnection();
auto id = KernelInstance->CurrentConnection();
if (id != NullConnectionId)
{
connectionListWidget->setCurrentItem(connectionNodes.value(id).get());

View File

@ -16,6 +16,7 @@ void MainWindow::MWSetSystemProxy()
{
proxyAddress = "127.0.0.1";
SetSystemProxy(proxyAddress, httpPort, socksPort);
hTray.setIcon(Q_TRAYICON("tray-systemproxy.png"));
if (!GlobalConfig.uiConfig.quietMode)
{
hTray.showMessage("Qv2ray", tr("System proxy configured."));
@ -31,6 +32,7 @@ void MainWindow::MWSetSystemProxy()
void MainWindow::MWClearSystemProxy()
{
ClearSystemProxy();
hTray.setIcon(KernelInstance->CurrentConnection() == NullConnectionId ? Q_TRAYICON("tray.png") : Q_TRAYICON("tray-connected.png"));
if (!GlobalConfig.uiConfig.quietMode)
{
hTray.showMessage("Qv2ray", tr("System proxy removed."));