Separate WLAN and Wired

pull/11/head
rekols 5 years ago
parent d5ad272633
commit 0f495d04f3

@ -12,7 +12,7 @@
version="1.1"
id="svg4"
sodipodi:docname="network.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata10">
<rdf:RDF>
@ -36,19 +36,20 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2160"
inkscape:window-height="1272"
inkscape:window-height="1258"
id="namedview6"
showgrid="false"
inkscape:zoom="45.9375"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-y="35"
inkscape:window-maximized="1"
inkscape:current-layer="svg4"
inkscape:document-rotation="0" />
<path
d="M 13.656906,2.3431885 C 12.145906,0.83216245 10.136906,-5e-8 8.000001,-5e-8 5.863094,-5e-8 3.854094,0.83216245 2.343094,2.3431885 0.832125,3.8541834 0,5.8631261 0,8.0000002 0,10.136874 0.832125,12.145816 2.343094,13.656811 3.854094,15.167838 5.863094,16 8.000001,16 10.136906,16 12.145906,15.167838 13.656906,13.656811 15.167875,12.145816 16,10.136874 16,8.0000002 16,5.8631261 15.167875,3.8541834 13.656906,2.3431885 Z M 8.000001,15.062775 c -0.526688,0 -1.106875,-0.710792 -1.552032,-1.901349 C 6.171438,12.42183 5.962094,11.547773 5.827719,10.592553 H 10.17225 C 10.037907,11.547773 9.828531,12.421798 9.552,13.161394 9.106907,14.351983 8.526688,15.062775 8.000001,15.062775 Z M 5.722375,9.6553586 C 5.676595,9.1192974 5.652905,8.5648657 5.652905,8.0000003 c 0,-0.7437822 0.04088,-1.4695386 0.119594,-2.1589304 h 4.455 c 0.07872,0.6894234 0.119594,1.4151794 0.119594,2.1589304 0,0.5648654 -0.02366,1.1192659 -0.06947,1.6553583 z M 0.9375,8.0000002 c 0,-0.7439385 0.114719,-1.4701635 0.334875,-2.1589304 h 3.557469 c -0.07531,0.6937345 -0.114438,1.4187409 -0.114438,2.1589304 0,0.562929 0.02269,1.1170475 0.06659,1.6553584 H 1.131969 C 1.003844,9.1194845 0.9375,8.5648657 0.9375,8.0000002 Z M 8.000001,0.93722545 c 0.526687,0 1.106906,0.71076055 1.55203,1.90134915 0.227126,0.6075409 0.408969,1.3058362 0.541157,2.065239 H 5.906813 C 6.039,4.1443795 6.220844,3.4460842 6.448,2.8385746 6.893126,1.647986 7.473282,0.93722545 8.000001,0.93722545 Z m 3.170155,4.90381325 h 3.557438 c 0.220187,0.688798 0.334906,1.4149918 0.334906,2.1589304 0,0.5648966 -0.06638,1.1194843 -0.194469,1.6553583 H 11.218 c 0.04391,-0.5383109 0.06659,-1.0924294 0.06659,-1.6553583 0,-0.7401584 -0.03912,-1.465196 -0.114438,-2.1589304 z M 14.351187,4.9038136 H 11.043219 C 10.899125,4.0238523 10.692875,3.212965 10.430188,2.5104208 10.231219,1.9782642 10.00425,1.5252719 9.755219,1.15613 c 1.214875,0.3093469 2.329031,0.9400059 3.238687,1.8496769 0.562563,0.5625852 1.018031,1.2035538 1.357281,1.8980067 z M 3.006094,3.0058069 C 3.915719,2.0961672 5.029875,1.4655081 6.244782,1.15613 5.99575,1.5252719 5.768782,1.9782642 5.569813,2.5104208 5.307125,3.212965 5.100875,4.0238523 4.956781,4.9038136 H 1.648813 C 1.988063,4.2093607 2.443531,3.5683921 3.006094,3.0058069 Z M 1.426906,10.592584 h 3.455188 c 0.143094,1.07481 0.375656,2.062271 0.68775,2.896995 0.198969,0.532157 0.425938,0.985149 0.674969,1.354291 C 5.029938,14.534523 3.91575,13.903864 3.006125,12.994193 2.309906,12.297959 1.777375,11.481824 1.426906,10.592584 Z m 11.567,2.401609 c -0.909625,0.909671 -2.023781,1.54033 -3.238687,1.849677 0.249031,-0.369142 0.476,-0.822134 0.674969,-1.354291 0.312094,-0.834724 0.544655,-1.822185 0.687749,-2.896995 h 3.455157 c -0.350469,0.88924 -0.883,1.705375 -1.579188,2.401609 z"
id="path2"
style="fill:#ffffff;fill-opacity:1;stroke-width:0.0312454" />
d="M 2.9999995,0.9999998 C 1.3379994,0.9999998 -3.75e-7,2.3379999 -3.75e-7,3.9999999 V 9.9999996 C -3.75e-7,11.662 1.3379994,13 2.9999995,13 c 0,1.108 0.892001,2 2.000001,2 H 11 c 1.108,0 2,-0.892 2,-2 1.662,0 3,-1.338 3,-3.0000004 V 3.9999999 c 0,-1.662 -1.338,-3.0000001 -3,-3.0000001 z m 0,1.0000001 H 13 c 1.108,0 2,0.892 2,2 V 9.9999996 C 15,11.108 14.108,12 13,12 h -1 v 1 c 0,0.554 -0.446,1 -1,1 H 5.0000005 c -0.5540001,0 -1,-0.446 -1,-1 V 12 H 2.9999995 C 1.8919994,12 0.99999943,11.108 0.99999943,9.9999996 V 3.9999999 c 0,-1.108 0.89199997,-2 2.00000007,-2 z m 1.000001,2 c -0.554,0 -1.000001,0.446 -1.000001,1 v 3.9999997 c 0,0.554 0.446001,1 1.000001,1 0.554,0 1,-0.446 1,-1 V 4.9999999 c 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 v 3.9999997 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 V 4.9999999 c 0,-0.554 -0.446,-1 -1,-1 z m 3.9999995,0 c -0.554,0 -1,0.446 -1,1 v 3.9999997 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 V 4.9999999 c 0,-0.554 -0.446,-1 -1,-1 z"
style="color:#363636;fill:#ffffff;fill-opacity:1"
class="ColorScheme-Text"
id="path5" />
</svg>

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
version="1.1"
id="svg4"
sodipodi:docname="wlan.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata10">
<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="defs8" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1586"
inkscape:window-height="997"
id="namedview6"
showgrid="false"
inkscape:zoom="45.9375"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="272"
inkscape:window-y="35"
inkscape:window-maximized="0"
inkscape:current-layer="svg4"
inkscape:document-rotation="0" />
<path
style="color:#363636;fill:#ffffff;fill-opacity:1;stroke:none"
class="ColorScheme-Text"
d="m 7.9997719,2.2987066 c -3.020999,0 -5.874458,1.3332678 -7.82888504,3.6583298 -0.259604,0.30878 -0.218709,0.769328 0.09057,1.028905 0.136835,0.114927 0.303107,0.170742 0.469169,0.170742 0.20844201,0 0.41511204,-0.0879 0.55973704,-0.259824 1.675373,-1.9933813 4.120877,-3.1371963 6.709412,-3.1371963 2.5885361,0 5.0340661,1.1442857 6.7094131,3.1371963 0.144651,0.171919 0.351269,0.259824 0.559737,0.259824 0.166089,0 0.333819,-0.05532 0.470654,-0.170742 0.308779,-0.259133 0.348685,-0.720622 0.08908,-1.028905 C 13.874727,3.6319744 11.020772,2.2987066 7.9997719,2.2987066 Z m 0,3.0941398 c -2.158006,0 -4.195629,0.952804 -5.591424,2.613092 -0.259578,0.30878 -0.220194,0.769328 0.08908,1.028906 0.136834,0.114926 0.30308,0.170742 0.469168,0.170742 0.208442,0 0.415582,-0.08791 0.559737,-0.259825 1.116741,-1.329078 2.747895,-2.091959 4.473437,-2.091959 1.725542,0 3.3561991,0.762881 4.4734371,2.091959 0.144651,0.172416 0.351791,0.259825 0.559736,0.259825 0.166088,0 0.332308,-0.05532 0.469168,-0.170742 0.309251,-0.259578 0.348634,-0.720597 0.08908,-1.028906 -1.396315,-1.660261 -3.433416,-2.613092 -5.5914211,-2.613092 z m 0,3.214401 c -1.295483,0 -2.518755,0.570413 -3.355448,1.5663706 -0.259604,0.308779 -0.218709,0.769328 0.09057,1.028905 0.136834,0.114926 0.30308,0.172226 0.469169,0.172226 0.208441,0 0.415581,-0.08939 0.559736,-0.261309 0.558632,-0.6648 1.373453,-1.045237 2.235976,-1.045237 0.862523,0 1.67737,0.380437 2.2359761,1.045237 0.144652,0.172416 0.351766,0.261309 0.559737,0.261309 0.166089,0 0.332334,-0.0568 0.469169,-0.172226 0.309276,-0.259604 0.350145,-0.720152 0.09057,-1.028905 C 10.518505,9.1776604 9.2952319,8.6072474 7.9997749,8.6072474 Z m -0.06236,2.7734416 c -0.571372,0.05444 -1.120902,0.481828 -1.140258,1.117988 0,0.664197 0.538441,1.202616 1.202616,1.202616 0.664176,0 1.202617,-0.538419 1.202617,-1.202616 -0.101637,-0.853922 -0.693601,-1.172429 -1.264972,-1.117988 z"
id="path4" />
</svg>

After

Width:  |  Height:  |  Size: 3.4 KiB

@ -11,8 +11,8 @@
height="16"
version="1.1"
id="svg4"
sodipodi:docname="language.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
sodipodi:docname="network.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata10">
<rdf:RDF>
@ -36,19 +36,20 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2160"
inkscape:window-height="1312"
inkscape:window-height="1258"
id="namedview6"
showgrid="false"
inkscape:zoom="45.9375"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-y="35"
inkscape:window-maximized="1"
inkscape:current-layer="svg4"
inkscape:document-rotation="0" />
<path
d="M 13.656906,2.3431885 C 12.145906,0.83216245 10.136906,-5e-8 8.000001,-5e-8 5.863094,-5e-8 3.854094,0.83216245 2.343094,2.3431885 0.832125,3.8541834 0,5.8631261 0,8.0000002 0,10.136874 0.832125,12.145816 2.343094,13.656811 3.854094,15.167838 5.863094,16 8.000001,16 10.136906,16 12.145906,15.167838 13.656906,13.656811 15.167875,12.145816 16,10.136874 16,8.0000002 16,5.8631261 15.167875,3.8541834 13.656906,2.3431885 Z M 8.000001,15.062775 c -0.526688,0 -1.106875,-0.710792 -1.552032,-1.901349 C 6.171438,12.42183 5.962094,11.547773 5.827719,10.592553 H 10.17225 C 10.037907,11.547773 9.828531,12.421798 9.552,13.161394 9.106907,14.351983 8.526688,15.062775 8.000001,15.062775 Z M 5.722375,9.6553586 C 5.676595,9.1192974 5.652905,8.5648657 5.652905,8.0000003 c 0,-0.7437822 0.04088,-1.4695386 0.119594,-2.1589304 h 4.455 c 0.07872,0.6894234 0.119594,1.4151794 0.119594,2.1589304 0,0.5648654 -0.02366,1.1192659 -0.06947,1.6553583 z M 0.9375,8.0000002 c 0,-0.7439385 0.114719,-1.4701635 0.334875,-2.1589304 h 3.557469 c -0.07531,0.6937345 -0.114438,1.4187409 -0.114438,2.1589304 0,0.562929 0.02269,1.1170475 0.06659,1.6553584 H 1.131969 C 1.003844,9.1194845 0.9375,8.5648657 0.9375,8.0000002 Z M 8.000001,0.93722545 c 0.526687,0 1.106906,0.71076055 1.55203,1.90134915 0.227126,0.6075409 0.408969,1.3058362 0.541157,2.065239 H 5.906813 C 6.039,4.1443795 6.220844,3.4460842 6.448,2.8385746 6.893126,1.647986 7.473282,0.93722545 8.000001,0.93722545 Z m 3.170155,4.90381325 h 3.557438 c 0.220187,0.688798 0.334906,1.4149918 0.334906,2.1589304 0,0.5648966 -0.06638,1.1194843 -0.194469,1.6553583 H 11.218 c 0.04391,-0.5383109 0.06659,-1.0924294 0.06659,-1.6553583 0,-0.7401584 -0.03912,-1.465196 -0.114438,-2.1589304 z M 14.351187,4.9038136 H 11.043219 C 10.899125,4.0238523 10.692875,3.212965 10.430188,2.5104208 10.231219,1.9782642 10.00425,1.5252719 9.755219,1.15613 c 1.214875,0.3093469 2.329031,0.9400059 3.238687,1.8496769 0.562563,0.5625852 1.018031,1.2035538 1.357281,1.8980067 z M 3.006094,3.0058069 C 3.915719,2.0961672 5.029875,1.4655081 6.244782,1.15613 5.99575,1.5252719 5.768782,1.9782642 5.569813,2.5104208 5.307125,3.212965 5.100875,4.0238523 4.956781,4.9038136 H 1.648813 C 1.988063,4.2093607 2.443531,3.5683921 3.006094,3.0058069 Z M 1.426906,10.592584 h 3.455188 c 0.143094,1.07481 0.375656,2.062271 0.68775,2.896995 0.198969,0.532157 0.425938,0.985149 0.674969,1.354291 C 5.029938,14.534523 3.91575,13.903864 3.006125,12.994193 2.309906,12.297959 1.777375,11.481824 1.426906,10.592584 Z m 11.567,2.401609 c -0.909625,0.909671 -2.023781,1.54033 -3.238687,1.849677 0.249031,-0.369142 0.476,-0.822134 0.674969,-1.354291 0.312094,-0.834724 0.544655,-1.822185 0.687749,-2.896995 h 3.455157 c -0.350469,0.88924 -0.883,1.705375 -1.579188,2.401609 z"
id="path2"
style="fill:#363636;fill-opacity:1;stroke-width:0.0312454" />
d="M 2.9999994,0.99999965 C 1.3379994,0.99999965 -4e-7,2.3379997 -4e-7,3.9999997 V 9.9999994 C -4e-7,11.662 1.3379994,13 2.9999994,13 c 0,1.108 0.892001,2 2.000001,2 H 11 c 1.108,0 2,-0.892 2,-2 1.662,0 3,-1.338 3,-3.0000006 V 3.9999997 c 0,-1.662 -1.338,-3.00000005 -3,-3.00000005 z m 0,1.00000005 H 13 c 1.108,0 2,0.892 2,2 V 9.9999994 C 15,11.108 14.108,12 13,12 h -1 v 1 c 0,0.554 -0.446,1 -1,1 H 5.0000004 c -0.554,0 -1,-0.446 -1,-1 v -1 h -1.000001 c -1.108,0 -2,-0.892 -2,-2.0000006 V 3.9999997 c 0,-1.108 0.892,-2 2,-2 z m 1.000001,2 c -0.554,0 -1.000001,0.446 -1.000001,1 v 3.9999997 c 0,0.554 0.446001,1 1.000001,1 0.554,0 1,-0.446 1,-1 V 4.9999997 c 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 v 3.9999997 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 V 4.9999997 c 0,-0.554 -0.446,-1 -1,-1 z m 3.9999996,0 c -0.554,0 -1,0.446 -1,1 v 3.9999997 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 V 4.9999997 c 0,-0.554 -0.446,-1 -1,-1 z"
style="color:#363636;fill:currentColor"
class="ColorScheme-Text"
id="path5" />
</svg>

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
version="1.1"
id="svg4"
sodipodi:docname="wlan.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata10">
<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="defs8" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1586"
inkscape:window-height="997"
id="namedview6"
showgrid="false"
inkscape:zoom="45.9375"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="272"
inkscape:window-y="35"
inkscape:window-maximized="0"
inkscape:current-layer="svg4"
inkscape:document-rotation="0" />
<path
style="color:#363636;fill:currentColor;fill-opacity:1;stroke:none"
class="ColorScheme-Text"
d="m 7.9997719,2.2987066 c -3.020999,0 -5.874458,1.3332678 -7.82888504,3.6583298 -0.259604,0.30878 -0.218709,0.769328 0.09057,1.028905 0.136835,0.114927 0.303107,0.170742 0.469169,0.170742 0.20844201,0 0.41511204,-0.0879 0.55973704,-0.259824 1.675373,-1.9933813 4.120877,-3.1371963 6.709412,-3.1371963 2.5885361,0 5.0340661,1.1442857 6.7094131,3.1371963 0.144651,0.171919 0.351269,0.259824 0.559737,0.259824 0.166089,0 0.333819,-0.05532 0.470654,-0.170742 0.308779,-0.259133 0.348685,-0.720622 0.08908,-1.028905 C 13.874727,3.6319744 11.020772,2.2987066 7.9997719,2.2987066 Z m 0,3.0941398 c -2.158006,0 -4.195629,0.952804 -5.591424,2.613092 -0.259578,0.30878 -0.220194,0.769328 0.08908,1.028906 0.136834,0.114926 0.30308,0.170742 0.469168,0.170742 0.208442,0 0.415582,-0.08791 0.559737,-0.259825 1.116741,-1.329078 2.747895,-2.091959 4.473437,-2.091959 1.725542,0 3.3561991,0.762881 4.4734371,2.091959 0.144651,0.172416 0.351791,0.259825 0.559736,0.259825 0.166088,0 0.332308,-0.05532 0.469168,-0.170742 0.309251,-0.259578 0.348634,-0.720597 0.08908,-1.028906 -1.396315,-1.660261 -3.433416,-2.613092 -5.5914211,-2.613092 z m 0,3.214401 c -1.295483,0 -2.518755,0.570413 -3.355448,1.5663706 -0.259604,0.308779 -0.218709,0.769328 0.09057,1.028905 0.136834,0.114926 0.30308,0.172226 0.469169,0.172226 0.208441,0 0.415581,-0.08939 0.559736,-0.261309 0.558632,-0.6648 1.373453,-1.045237 2.235976,-1.045237 0.862523,0 1.67737,0.380437 2.2359761,1.045237 0.144652,0.172416 0.351766,0.261309 0.559737,0.261309 0.166089,0 0.332334,-0.0568 0.469169,-0.172226 0.309276,-0.259604 0.350145,-0.720152 0.09057,-1.028905 C 10.518505,9.1776604 9.2952319,8.6072474 7.9997749,8.6072474 Z m -0.06236,2.7734416 c -0.571372,0.05444 -1.120902,0.481828 -1.140258,1.117988 0,0.664197 0.538441,1.202616 1.202616,1.202616 0.664176,0 1.202617,-0.538419 1.202617,-1.202616 -0.101637,-0.853922 -0.693601,-1.172429 -1.264972,-1.117988 z"
id="path4" />
</svg>

After

Width:  |  Height:  |  Size: 3.4 KiB

@ -120,6 +120,7 @@ ItemPage {
RoundedItem {
visible: history.count > 2
spacing: 0
Label {
text: qsTr("History")

@ -49,9 +49,17 @@ Item {
id: listModel
ListElement {
title: qsTr("Network")
title: qsTr("WLAN")
name: "network"
page: "qrc:/qml/Network/Main.qml"
page: "qrc:/qml/WLAN/Main.qml"
iconSource: "wlan.svg"
category: qsTr("Network and connection")
}
ListElement {
title: qsTr("Wired")
name: "wired"
page: "qrc:/qml/Wired/Main.qml"
iconSource: "network.svg"
category: qsTr("Network and connection")
}
@ -148,7 +156,7 @@ Item {
spacing: FishUI.Units.smallSpacing
leftMargin: FishUI.Units.largeSpacing
rightMargin: FishUI.Units.largeSpacing
topMargin: FishUI.Units.largeSpacing
topMargin: 0
ScrollBar.vertical: ScrollBar {}
@ -164,13 +172,14 @@ Item {
section.property: "category"
section.delegate: Item {
width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
height: FishUI.Units.fontMetrics.height + FishUI.Units.smallSpacing * 3
height: FishUI.Units.fontMetrics.height + FishUI.Units.largeSpacing + FishUI.Units.smallSpacing
Text {
anchors.fill: parent
anchors.leftMargin: FishUI.Units.smallSpacing
anchors.topMargin: FishUI.Units.smallSpacing
anchors.bottomMargin: FishUI.Units.smallSpacing * 2
anchors.rightMargin: FishUI.Units.largeSpacing
anchors.topMargin: FishUI.Units.largeSpacing
anchors.bottomMargin: FishUI.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
text: section
}
@ -179,7 +188,7 @@ Item {
delegate: Item {
id: item
width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
height: FishUI.Units.fontMetrics.height + FishUI.Units.largeSpacing * 2
height: FishUI.Units.fontMetrics.height + FishUI.Units.largeSpacing * 1.5
property bool isCurrent: listView.currentIndex === index

@ -52,6 +52,8 @@ ItemPage {
spacing: FishUI.Units.largeSpacing * 2
RoundedItem {
visible: _userView.count > 0
ListView {
id: _userView
model: userModel

@ -0,0 +1,140 @@
/*
* Copyright (C) 2021 CutefishOS Team.
*
* Author: revenmartin <revenmartin@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM
import "../"
ItemPage {
id: control
headerTitle: qsTr("WLAN")
property var itemHeight: 45
property var settingsMap: ({})
NM.Handler {
id: handler
}
NM.WifiSettings {
id: wifiSettings
}
NM.NetworkModel {
id: networkModel
}
NM.EnabledConnections {
id: enabledConnections
}
NM.IdentityModel {
id: connectionModel
}
NM.Configuration {
id: configuration
}
Component.onCompleted: handler.requestScan()
Timer {
id: scanTimer
interval: 10200
repeat: true
running: control.visible
onTriggered: handler.requestScan()
}
Scrollable {
anchors.fill: parent
contentHeight: mainLayout.implicitHeight
ColumnLayout {
id: mainLayout
anchors.fill: parent
anchors.bottomMargin: FishUI.Units.largeSpacing
spacing: FishUI.Units.largeSpacing * 2
RoundedItem {
WifiView {
Layout.fillWidth: true
visible: enabledConnections.wirelessHwEnabled
}
}
// Hotspot
//
// RoundedItem {
// id: hotspotItem
// visible: handler.hotspotSupported
// RowLayout {
// Label {
// text: qsTr("Hotspot")
// color: FishUI.Theme.disabledTextColor
// }
// Item {
// Layout.fillWidth: true
// }
// Switch {
// Layout.fillHeight: true
// rightPadding: 0
// onToggled: {
// if (checked) {
// handler.createHotspot()
// } else {
// handler.stopHotspot()
// }
// }
// }
// }
// Item {
// height: FishUI.Units.largeSpacing
// }
// TextField {
// id: ssidName
// text: configuration.hotspotName
// placeholderText: qsTr("SSID")
// }
// TextField {
// id: hotspotPassword
// placeholderText: qsTr("Password")
// text: configuration.hotspotPassword
// }
// }
Item {
height: FishUI.Units.largeSpacing
}
}
}
}

@ -1,7 +1,7 @@
/*
* Copyright (C) 2021 CutefishOS Team.
*
* Author: revenmartin <revenmartin@gmail.com>
* Author: rekols <aj@cutefishos.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -29,7 +29,7 @@ import "../"
ItemPage {
id: control
headerTitle: qsTr("Network")
headerTitle: qsTr("Wired")
property var itemHeight: 45
property var settingsMap: ({})
@ -58,16 +58,6 @@ ItemPage {
id: configuration
}
Component.onCompleted: handler.requestScan()
Timer {
id: scanTimer
interval: 10200
repeat: true
running: control.visible
onTriggered: handler.requestScan()
}
Scrollable {
anchors.fill: parent
contentHeight: mainLayout.implicitHeight
@ -78,60 +68,6 @@ ItemPage {
anchors.bottomMargin: FishUI.Units.largeSpacing
spacing: FishUI.Units.largeSpacing * 2
RoundedItem {
WifiView {
Layout.fillWidth: true
visible: enabledConnections.wirelessHwEnabled
}
}
// Hotspot
//
// RoundedItem {
// id: hotspotItem
// visible: handler.hotspotSupported
// RowLayout {
// Label {
// text: qsTr("Hotspot")
// color: FishUI.Theme.disabledTextColor
// }
// Item {
// Layout.fillWidth: true
// }
// Switch {
// Layout.fillHeight: true
// rightPadding: 0
// onToggled: {
// if (checked) {
// handler.createHotspot()
// } else {
// handler.stopHotspot()
// }
// }
// }
// }
// Item {
// height: FishUI.Units.largeSpacing
// }
// TextField {
// id: ssidName
// text: configuration.hotspotName
// placeholderText: qsTr("SSID")
// }
// TextField {
// id: hotspotPassword
// placeholderText: qsTr("Password")
// text: configuration.hotspotPassword
// }
// }
// Wired connection
RoundedItem {
visible: enabledConnections.wwanHwEnabled

@ -70,11 +70,6 @@
<file>images/sidebar/light/language.svg</file>
<file>images/sidebar/light/network.svg</file>
<file>images/sidebar/light/wallpaper.svg</file>
<file>qml/Network/WifiView.qml</file>
<file>qml/Network/Main.qml</file>
<file>qml/Network/WifiItem.qml</file>
<file>qml/Network/WirelessDetailsDialog.qml</file>
<file>qml/Network/WiredItem.qml</file>
<file>qml/RoundedItem.qml</file>
<file>images/powersave.svg</file>
<file>images/performance.svg</file>
@ -98,5 +93,13 @@
<file>images/sidebar/light/power.svg</file>
<file>images/sidebar/dark/power.svg</file>
<file>images/balance.svg</file>
<file>qml/WLAN/Main.qml</file>
<file>qml/Wired/Main.qml</file>
<file>qml/Wired/WiredItem.qml</file>
<file>qml/WLAN/WifiItem.qml</file>
<file>qml/WLAN/WifiView.qml</file>
<file>qml/WLAN/WirelessDetailsDialog.qml</file>
<file>images/sidebar/light/wlan.svg</file>
<file>images/sidebar/dark/wlan.svg</file>
</qresource>
</RCC>

@ -215,27 +215,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="125"/>
<location filename="../src/qml/Battery/Main.qml" line="126"/>
<source>History</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="153"/>
<location filename="../src/qml/Battery/Main.qml" line="154"/>
<source>W</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="172"/>
<location filename="../src/qml/Battery/Main.qml" line="173"/>
<source>Last Charged to</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="178"/>
<location filename="../src/qml/Battery/Main.qml" line="179"/>
<source>Maximum Capacity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="191"/>
<location filename="../src/qml/Battery/Main.qml" line="192"/>
<source>No battery found</source>
<translation type="unfinished"></translation>
</message>
@ -321,6 +321,8 @@
</message>
<message>
<location filename="../src/qml/Network/Main.qml" line="144"/>
<location filename="../src/qml/Wired/Main.qml" line="32"/>
<location filename="../src/qml/Wired/Main.qml" line="80"/>
<source>Wired</source>
<translation type="unfinished"></translation>
</message>
@ -355,7 +357,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/User/Main.qml" line="81"/>
<location filename="../src/qml/User/Main.qml" line="83"/>
<source>Add user</source>
<translation type="unfinished"></translation>
</message>
@ -379,72 +381,83 @@
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/WLAN/Main.qml" line="32"/>
<source>WLAN</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SideBar</name>
<message>
<location filename="../src/qml/SideBar.qml" line="99"/>
<location filename="../src/qml/SideBar.qml" line="107"/>
<source>User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="67"/>
<location filename="../src/qml/SideBar.qml" line="75"/>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="52"/>
<source>Network</source>
<source>WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="56"/>
<location filename="../src/qml/SideBar.qml" line="64"/>
<source>Network and connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="71"/>
<location filename="../src/qml/SideBar.qml" line="60"/>
<source>Wired</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="79"/>
<location filename="../src/qml/SideBar.qml" line="87"/>
<location filename="../src/qml/SideBar.qml" line="95"/>
<location filename="../src/qml/SideBar.qml" line="103"/>
<source>Display and appearance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="75"/>
<location filename="../src/qml/SideBar.qml" line="83"/>
<source>Appearance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="83"/>
<location filename="../src/qml/SideBar.qml" line="91"/>
<source>Background</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="91"/>
<location filename="../src/qml/SideBar.qml" line="99"/>
<source>Dock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="103"/>
<location filename="../src/qml/SideBar.qml" line="111"/>
<location filename="../src/qml/SideBar.qml" line="119"/>
<location filename="../src/qml/SideBar.qml" line="134"/>
<location filename="../src/qml/SideBar.qml" line="127"/>
<location filename="../src/qml/SideBar.qml" line="142"/>
<source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="107"/>
<location filename="../src/qml/SideBar.qml" line="115"/>
<source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="115"/>
<location filename="../src/qml/SideBar.qml" line="123"/>
<source>Battery</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="130"/>
<location filename="../src/qml/SideBar.qml" line="138"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
@ -471,21 +484,25 @@
<name>WifiItem</name>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="184"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="184"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="204"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="204"/>
<source>Show password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="213"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="213"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="219"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="219"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@ -494,6 +511,7 @@
<name>WifiView</name>
<message>
<location filename="../src/qml/Network/WifiView.qml" line="35"/>
<location filename="../src/qml/WLAN/WifiView.qml" line="35"/>
<source>WLAN</source>
<translation type="unfinished"></translation>
</message>
@ -502,51 +520,61 @@
<name>WirelessDetailsDialog</name>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="65"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="65"/>
<source>Auto-Join</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="81"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="81"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="93"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="93"/>
<source>Signal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="105"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="105"/>
<source>IPv4 Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="119"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="119"/>
<source>IPv6 Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="133"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="133"/>
<source>MAC Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="147"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="147"/>
<source>Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="160"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="160"/>
<source>DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="177"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="177"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="183"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="183"/>
<source>Forget this network</source>
<translation type="unfinished"></translation>
</message>

@ -215,27 +215,27 @@
<translation>7</translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="125"/>
<location filename="../src/qml/Battery/Main.qml" line="126"/>
<source>History</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="153"/>
<location filename="../src/qml/Battery/Main.qml" line="154"/>
<source>W</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="172"/>
<location filename="../src/qml/Battery/Main.qml" line="173"/>
<source>Last Charged to</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="178"/>
<location filename="../src/qml/Battery/Main.qml" line="179"/>
<source>Maximum Capacity</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Battery/Main.qml" line="191"/>
<location filename="../src/qml/Battery/Main.qml" line="192"/>
<source>No battery found</source>
<translation></translation>
</message>
@ -321,6 +321,8 @@
</message>
<message>
<location filename="../src/qml/Network/Main.qml" line="144"/>
<location filename="../src/qml/Wired/Main.qml" line="32"/>
<location filename="../src/qml/Wired/Main.qml" line="80"/>
<source>Wired</source>
<translation>线</translation>
</message>
@ -355,7 +357,7 @@
<translation></translation>
</message>
<message>
<location filename="../src/qml/User/Main.qml" line="81"/>
<location filename="../src/qml/User/Main.qml" line="83"/>
<source>Add user</source>
<translation></translation>
</message>
@ -379,72 +381,87 @@
<source>Color</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/WLAN/Main.qml" line="32"/>
<source>WLAN</source>
<translation>WLAN</translation>
</message>
</context>
<context>
<name>SideBar</name>
<message>
<location filename="../src/qml/SideBar.qml" line="67"/>
<location filename="../src/qml/SideBar.qml" line="75"/>
<source>Display</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="52"/>
<source>Network</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="56"/>
<location filename="../src/qml/SideBar.qml" line="64"/>
<source>Network and connection</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="71"/>
<location filename="../src/qml/SideBar.qml" line="79"/>
<location filename="../src/qml/SideBar.qml" line="87"/>
<location filename="../src/qml/SideBar.qml" line="95"/>
<location filename="../src/qml/SideBar.qml" line="103"/>
<source>Display and appearance</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="75"/>
<location filename="../src/qml/SideBar.qml" line="83"/>
<source>Appearance</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="91"/>
<location filename="../src/qml/SideBar.qml" line="99"/>
<source>Dock</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="99"/>
<location filename="../src/qml/SideBar.qml" line="107"/>
<source>User</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="83"/>
<location filename="../src/qml/SideBar.qml" line="91"/>
<source>Background</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="103"/>
<location filename="../src/qml/SideBar.qml" line="52"/>
<source>WLAN</source>
<translation>WLAN</translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="60"/>
<source>Wired</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="111"/>
<location filename="../src/qml/SideBar.qml" line="119"/>
<location filename="../src/qml/SideBar.qml" line="134"/>
<location filename="../src/qml/SideBar.qml" line="127"/>
<location filename="../src/qml/SideBar.qml" line="142"/>
<source>System</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="107"/>
<location filename="../src/qml/SideBar.qml" line="115"/>
<source>Language</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="115"/>
<location filename="../src/qml/SideBar.qml" line="123"/>
<source>Battery</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="130"/>
<location filename="../src/qml/SideBar.qml" line="138"/>
<source>About</source>
<translation></translation>
</message>
@ -471,21 +488,25 @@
<name>WifiItem</name>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="184"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="184"/>
<source>Password</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="204"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="204"/>
<source>Show password</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="213"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="213"/>
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WifiItem.qml" line="219"/>
<location filename="../src/qml/WLAN/WifiItem.qml" line="219"/>
<source>Connect</source>
<translation></translation>
</message>
@ -494,6 +515,7 @@
<name>WifiView</name>
<message>
<location filename="../src/qml/Network/WifiView.qml" line="35"/>
<location filename="../src/qml/WLAN/WifiView.qml" line="35"/>
<source>WLAN</source>
<translation>WLAN</translation>
</message>
@ -502,51 +524,61 @@
<name>WirelessDetailsDialog</name>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="65"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="65"/>
<source>Auto-Join</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="81"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="81"/>
<source>Security</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="93"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="93"/>
<source>Signal</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="105"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="105"/>
<source>IPv4 Address</source>
<translation>IPv4</translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="119"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="119"/>
<source>IPv6 Address</source>
<translation>IPv6</translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="133"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="133"/>
<source>MAC Address</source>
<translation>MAC</translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="147"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="147"/>
<source>Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="160"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="160"/>
<source>DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="183"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="183"/>
<source>Forget this network</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="177"/>
<location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="177"/>
<source>Close</source>
<translation></translation>
</message>

Loading…
Cancel
Save