From e74dc2154ed742be64400bc06f2fc0a677f55027 Mon Sep 17 00:00:00 2001
From: revenmartin <revenmartin@gmail.com>
Date: Tue, 25 May 2021 10:20:32 +0800
Subject: [PATCH] Update icons

---
 src/images/dark/checked.svg               | 10 ++--
 src/images/dark/locked.svg                | 66 +++++++++++++++++++++++
 src/images/info.svg                       | 22 ++++----
 src/images/light/checked.svg              |  8 +--
 src/images/{ => light}/locked.svg         | 32 +++++++----
 src/qml/IconButton.qml                    |  3 +-
 src/qml/Network/WifiItem.qml              | 13 ++---
 src/qml/Network/WirelessDetailsDialog.qml |  5 +-
 src/resources.qrc                         |  3 +-
 9 files changed, 118 insertions(+), 44 deletions(-)
 create mode 100644 src/images/dark/locked.svg
 rename src/images/{ => light}/locked.svg (54%)

diff --git a/src/images/dark/checked.svg b/src/images/dark/checked.svg
index 9acb058..77a683d 100644
--- a/src/images/dark/checked.svg
+++ b/src/images/dark/checked.svg
@@ -32,9 +32,9 @@
      showgrid="false"
      units="px"
      inkscape:window-width="2160"
-     inkscape:window-height="1247"
+     inkscape:window-height="1221"
      inkscape:window-x="0"
-     inkscape:window-y="35"
+     inkscape:window-y="42"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5">
@@ -44,7 +44,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,8 +53,8 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       d="M 1.9839198,4.9599263 -8.3433333e-5,2.9759226 0.26194017,2.713899 1.9839198,4.4358794 5.5588928,0.86090703 5.8209168,1.1229306 Z"
+       d="M 1.9839463,4.9598676 -1.249996e-8,2.9759208 0.26201608,2.7139047 1.9839463,4.4358357 5.5588168,0.86096576 5.8208333,1.1229818 Z"
        id="path2-3"
-       style="stroke-width:0.0107589;fill-opacity:1;fill:#ffffff" />
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.0107586" />
   </g>
 </svg>
diff --git a/src/images/dark/locked.svg b/src/images/dark/locked.svg
new file mode 100644
index 0000000..7422450
--- /dev/null
+++ b/src/images/dark/locked.svg
@@ -0,0 +1,66 @@
+<?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"
+   version="1.1"
+   viewBox="0 0 22 22"
+   id="svg7"
+   sodipodi:docname="locked.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   width="22"
+   height="22">
+  <metadata
+     id="metadata11">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2160"
+     inkscape:window-height="1221"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="33.409091"
+     inkscape:cx="14.598081"
+     inkscape:cy="11"
+     inkscape:window-x="0"
+     inkscape:window-y="42"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs3">
+    <style
+       id="current-color-scheme"
+       type="text/css">.ColorScheme-Text {
+        color:#363636;
+      }</style>
+  </defs>
+  <path
+     d="M 16.0625,20 H 5.9375 C 5.0075073,20 4.25,19.243317 4.25,18.3125 v -7.875 C 4.25,9.5066834 5.0075073,8.75 5.9375,8.75 h 10.125 c 0.929992,0 1.6875,0.7566834 1.6875,1.6875 v 7.875 C 17.75,19.243317 16.992492,20 16.0625,20 Z M 5.9375,9.875 c -0.3098145,0 -0.5625,0.251999 -0.5625,0.5625 v 7.875 c 0,0.310501 0.2526855,0.5625 0.5625,0.5625 h 10.125 c 0.309814,0 0.5625,-0.251999 0.5625,-0.5625 v -7.875 c 0,-0.310501 -0.252686,-0.5625 -0.5625,-0.5625 z m 0,0"
+     id="path2-3"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.0351562" />
+  <path
+     d="M 14.9375,9.875 C 14.626999,9.875 14.375,9.6230011 14.375,9.3125 V 6.5 C 14.375,4.6391907 12.860809,3.125 11,3.125 9.1391906,3.125 7.625,4.6391907 7.625,6.5 V 9.3125 C 7.625,9.6230011 7.3730011,9.875 7.0625,9.875 6.7519989,9.875 6.5,9.6230011 6.5,9.3125 V 6.5 C 6.5,4.0181885 8.5181885,2 11,2 c 2.481812,0 4.5,2.0181885 4.5,4.5 v 2.8125 c 0,0.3105011 -0.251999,0.5625 -0.5625,0.5625 z m 0,0"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.0351562" />
+</svg>
diff --git a/src/images/info.svg b/src/images/info.svg
index e38b4b1..9189b4f 100644
--- a/src/images/info.svg
+++ b/src/images/info.svg
@@ -7,12 +7,12 @@
    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"
+   width="22"
+   height="22"
    version="1.1"
    id="svg8"
    sodipodi:docname="info.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
   <metadata
      id="metadata14">
     <rdf:RDF>
@@ -21,6 +21,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -36,21 +37,22 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="2160"
-     inkscape:window-height="1312"
+     inkscape:window-height="1221"
      id="namedview10"
      showgrid="false"
-     inkscape:zoom="45.9375"
-     inkscape:cx="8"
-     inkscape:cy="8"
+     inkscape:zoom="22.96875"
+     inkscape:cx="0.21325476"
+     inkscape:cy="11.014041"
      inkscape:window-x="0"
-     inkscape:window-y="30"
+     inkscape:window-y="42"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg8" />
+     inkscape:current-layer="svg8"
+     inkscape:document-rotation="0" />
   <g
      fill="#1d99f3"
      id="g6"
      style="fill:#2272e6;fill-opacity:1"
-     transform="matrix(1.3333333,0,0,1.3333333,-2.6666664,-2.6666664)">
+     transform="matrix(1.8333333,0,0,1.8333333,-3.6666664,-3.6666664)">
     <path
        d="M 8,2 A 6,6 0 1 0 8,14 6,6 0 0 0 8,2 Z M 8,3 A 5,5 0 1 1 8,13 5,5 0 0 1 8,3 Z"
        id="path2"
diff --git a/src/images/light/checked.svg b/src/images/light/checked.svg
index 7291791..69838c3 100644
--- a/src/images/light/checked.svg
+++ b/src/images/light/checked.svg
@@ -32,9 +32,9 @@
      showgrid="false"
      units="px"
      inkscape:window-width="2160"
-     inkscape:window-height="1247"
+     inkscape:window-height="1221"
      inkscape:window-x="0"
-     inkscape:window-y="35"
+     inkscape:window-y="42"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5">
@@ -53,8 +53,8 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       d="M 1.9839198,4.9599263 -8.3433333e-5,2.9759226 0.26194017,2.713899 1.9839198,4.4358794 5.5588928,0.86090703 5.8209168,1.1229306 Z"
+       d="M 1.9839465,4.9598675 1.6666666e-8,2.9759207 0.26201611,2.7139047 1.9839465,4.4358356 5.5588169,0.86096581 5.8208333,1.1229818 Z"
        id="path2-3"
-       style="stroke-width:0.0107589;fill-opacity:1;fill:#000000" />
+       style="fill:#000000;fill-opacity:1;stroke-width:0.0107586" />
   </g>
 </svg>
diff --git a/src/images/locked.svg b/src/images/light/locked.svg
similarity index 54%
rename from src/images/locked.svg
rename to src/images/light/locked.svg
index 9862b6e..fe3a5b7 100644
--- a/src/images/locked.svg
+++ b/src/images/light/locked.svg
@@ -11,7 +11,9 @@
    viewBox="0 0 22 22"
    id="svg7"
    sodipodi:docname="locked.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   width="22"
+   height="22">
   <metadata
      id="metadata11">
     <rdf:RDF>
@@ -20,6 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -33,16 +36,17 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="2160"
-     inkscape:window-height="1312"
+     inkscape:window-height="1221"
      id="namedview9"
      showgrid="false"
      inkscape:zoom="33.409091"
-     inkscape:cx="11"
+     inkscape:cx="14.598081"
      inkscape:cy="11"
      inkscape:window-x="0"
-     inkscape:window-y="30"
+     inkscape:window-y="42"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
+     inkscape:current-layer="svg7"
+     inkscape:document-rotation="0" />
   <defs
      id="defs3">
     <style
@@ -51,10 +55,16 @@
         color:#363636;
       }</style>
   </defs>
-  <path
-     d="M 11,0 C 7.749867,0 5.1333333,2.6165333 5.1333333,5.8666667 V 8.8 C 3.5082667,8.8 2.2,10.108267 2.2,11.733333 v 7.333334 C 2.2,20.691733 3.5082667,22 5.1333333,22 H 16.866667 C 18.491733,22 19.8,20.691733 19.8,19.066667 V 11.733333 C 19.8,10.108267 18.491733,8.8 16.866667,8.8 V 5.8666667 C 16.866667,2.6165333 14.250133,0 11,0 Z m 0,1.4666667 c 2.4376,0 4.4,1.9624 4.4,4.4 V 8.8 H 6.6 V 5.8666667 c 0,-2.4376 1.9624,-4.4 4.4,-4.4 z M 5.1333333,10.266667 H 16.866667 c 0.812533,0 1.466666,0.654133 1.466666,1.466666 v 7.333334 c 0,0.812533 -0.654133,1.466666 -1.466666,1.466666 H 5.1333333 c -0.8125333,0 -1.4666666,-0.654133 -1.4666666,-1.466666 v -7.333334 c 0,-0.812533 0.6541333,-1.466666 1.4666666,-1.466666 z"
-     class="ColorScheme-Text"
-     fill="currentColor"
-     id="path5"
-     style="stroke-width:1.46667" />
+  <g
+     id="g859"
+     transform="matrix(0.03515625,0,0,0.03515625,4.25,2)">
+    <path
+       d="M 336,512 H 48 C 21.546875,512 0,490.47656 0,464 V 240 c 0,-26.47656 21.546875,-48 48,-48 h 288 c 26.45312,0 48,21.52344 48,48 v 224 c 0,26.47656 -21.54688,48 -48,48 z M 48,224 c -8.8125,0 -16,7.16797 -16,16 v 224 c 0,8.83203 7.1875,16 16,16 h 288 c 8.8125,0 16,-7.16797 16,-16 V 240 c 0,-8.83203 -7.1875,-16 -16,-16 z m 0,0"
+       id="path2-3"
+       style="fill:#363636;fill-opacity:1" />
+    <path
+       d="m 304,224 c -8.83203,0 -16,-7.16797 -16,-16 V 128 C 288,75.070312 244.92969,32 192,32 139.07031,32 96,75.070312 96,128 v 80 c 0,8.83203 -7.167969,16 -16,16 -8.832031,0 -16,-7.16797 -16,-16 V 128 C 64,57.40625 121.40625,0 192,0 262.59375,0 320,57.40625 320,128 v 80 c 0,8.83203 -7.16797,16 -16,16 z m 0,0"
+       id="path4"
+       style="fill:#363636;fill-opacity:1" />
+  </g>
 </svg>
diff --git a/src/qml/IconButton.qml b/src/qml/IconButton.qml
index a140f8e..b6084ea 100644
--- a/src/qml/IconButton.qml
+++ b/src/qml/IconButton.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Controls 2.4
 import QtGraphicalEffects 1.0
+import FishUI 1.0 as FishUI
 
 Item {
     id: control
@@ -14,7 +15,7 @@ Item {
     Image {
         id: image
         anchors.fill: parent
-        sourceSize: Qt.size(width, height)
+        sourceSize: Qt.size(control.width, control.height)
     }
 
     MouseArea {
diff --git a/src/qml/Network/WifiItem.qml b/src/qml/Network/WifiItem.qml
index 24ff901..ba5cf31 100644
--- a/src/qml/Network/WifiItem.qml
+++ b/src/qml/Network/WifiItem.qml
@@ -102,19 +102,11 @@ Item {
 
         // Locked
         Image {
-            width: 16
+            width: 22
             height: width
             sourceSize: Qt.size(width, height)
-            source: "qrc:/images/locked.svg"
+            source: FishUI.Theme.darkMode ? "qrc:/images/dark/locked.svg" : "qrc:/images/light/locked.svg"
             visible: (model.securityType === -1 | model.securityType === 0) ? false : true
-
-            ColorOverlay {
-                anchors.fill: parent
-                source: parent
-                color: FishUI.Theme.textColor
-                opacity: 1
-                visible: true
-            }
         }
 
         IconButton {
@@ -179,6 +171,7 @@ Item {
                     }
                 }
                 onAccepted: passwordDialog.accept()
+                Keys.onEscapePressed: passwordDialog.close()
                 Layout.fillWidth: true
             }
 
diff --git a/src/qml/Network/WirelessDetailsDialog.qml b/src/qml/Network/WirelessDetailsDialog.qml
index 8a459fa..3732624 100644
--- a/src/qml/Network/WirelessDetailsDialog.qml
+++ b/src/qml/Network/WirelessDetailsDialog.qml
@@ -13,6 +13,7 @@ Dialog {
 
     x: (parent.width - width) / 2
     y: (parent.height - height) / 2
+    height: detailsLayout.childrenRect.height + footerLayout.childrenRect.height + FishUI.Units.largeSpacing * 1.5
     modal: true
 
     signal forgetBtnClicked()
@@ -30,9 +31,9 @@ Dialog {
         }
     }
 
-    contentItem: ColumnLayout {
+    ColumnLayout {
         id: detailsLayout
-        spacing: FishUI.Units.largeSpacing
+        spacing: FishUI.Units.largeSpacing * 1.5
 
         GridLayout {
             id: gridLayout
diff --git a/src/resources.qrc b/src/resources.qrc
index cca7fb9..89e5317 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -18,7 +18,6 @@
         <file>qml/IconCheckBox.qml</file>
         <file>qml/HorizontalDivider.qml</file>
         <file>qml/LanguagePage.qml</file>
-        <file>images/locked.svg</file>
         <file>images/checked.svg</file>
         <file>images/light/network-wired.svg</file>
         <file>images/light/network-wireless-connected-00.svg</file>
@@ -94,5 +93,7 @@
         <file>qml/Battery/HistoryGraph.qml</file>
         <file>qml/Dock/Main.qml</file>
         <file>qml/Display/RotationButton.qml</file>
+        <file>images/dark/locked.svg</file>
+        <file>images/light/locked.svg</file>
     </qresource>
 </RCC>