From 4e2003f36f0e257d25b77e6d565fd6a46534889f Mon Sep 17 00:00:00 2001
From: cutefishd <cutefishos@foxmail.com>
Date: Tue, 16 Mar 2021 20:35:27 +0800
Subject: [PATCH] ControlCenter: HD display icon

---
 qml/CardItem.qml                             | 10 ++--
 qml/{ControlCenter.qml => ControlDialog.qml} | 14 +++--
 qml/main.qml                                 |  2 +-
 resources.qrc                                |  4 +-
 svg/dark/bluetooth-symbolic.svg              | 61 ++++++++++++++++++++
 svg/dark/dark-mode.svg                       | 59 +++++++++++++++++++
 translations/en_US.ts                        | 26 ++++++---
 translations/zh_CN.ts                        | 21 +++----
 8 files changed, 167 insertions(+), 30 deletions(-)
 rename qml/{ControlCenter.qml => ControlDialog.qml} (93%)
 create mode 100644 svg/dark/bluetooth-symbolic.svg
 create mode 100644 svg/dark/dark-mode.svg

diff --git a/qml/CardItem.qml b/qml/CardItem.qml
index e747b1b..aeeecb1 100644
--- a/qml/CardItem.qml
+++ b/qml/CardItem.qml
@@ -81,11 +81,11 @@ Item {
             Layout.alignment: Qt.AlignCenter
             Layout.topMargin: Meui.Units.largeSpacing
 
-            ColorOverlay {
-                anchors.fill: _image
-                source: _image
-                color: control.checked ? Meui.Theme.highlightedTextColor : Meui.Theme.disabledTextColor
-            }
+//            ColorOverlay {
+//                anchors.fill: _image
+//                source: _image
+//                color: control.checked ? Meui.Theme.highlightedTextColor : Meui.Theme.disabledTextColor
+//            }
         }
 
         Item {
diff --git a/qml/ControlCenter.qml b/qml/ControlDialog.qml
similarity index 93%
rename from qml/ControlCenter.qml
rename to qml/ControlDialog.qml
index 36b6426..a7309e2 100644
--- a/qml/ControlCenter.qml
+++ b/qml/ControlDialog.qml
@@ -86,7 +86,10 @@ ControlCenterDialog {
     ColumnLayout {
         id: _mainLayout
         anchors.fill: parent
-        anchors.margins: Meui.Units.largeSpacing * 2
+        anchors.leftMargin: Meui.Units.largeSpacing * 2
+        anchors.topMargin: Meui.Units.largeSpacing * 2
+        anchors.rightMargin: Meui.Units.largeSpacing * 2
+        anchors.bottomMargin: Meui.Units.largeSpacing
         spacing: Meui.Units.largeSpacing
 
         Item {
@@ -168,7 +171,8 @@ ControlCenterDialog {
                     id: wirelessItem
                     Layout.fillHeight: true
                     Layout.preferredWidth: contentItem.width / 3 - Meui.Units.largeSpacing * 2
-                    icon: "qrc:/svg/dark/network-wireless-connected-100.svg"
+                    icon: Meui.Theme.darkMode || checked ? "qrc:/svg/dark/network-wireless-connected-100.svg"
+                                                         : "qrc:/svg/light/network-wireless-connected-100.svg"
                     visible: network.wirelessHardwareEnabled
                     checked: network.wirelessEnabled
                     label: qsTr("Wi-Fi")
@@ -182,7 +186,8 @@ ControlCenterDialog {
                     id: bluetoothItem
                     Layout.fillHeight: true
                     Layout.preferredWidth: contentItem.width / 3 - Meui.Units.largeSpacing * 2
-                    icon: "qrc:/svg/light/bluetooth-symbolic.svg"
+                    icon: Meui.Theme.darkMode || checked ? "qrc:/svg/dark/bluetooth-symbolic.svg"
+                                                         : "qrc:/svg/light/bluetooth-symbolic.svg"
                     checked: false
                     label: qsTr("Bluetooth")
                     text: qsTr("Off")
@@ -192,7 +197,8 @@ ControlCenterDialog {
                     id: darkModeItem
                     Layout.fillHeight: true
                     Layout.preferredWidth: contentItem.width / 3 - Meui.Units.largeSpacing * 2
-                    icon: "qrc:/svg/light/dark-mode.svg"
+                    icon: Meui.Theme.darkMode || checked ? "qrc:/svg/dark/dark-mode.svg"
+                                                         : "qrc:/svg/light/dark-mode.svg"
                     checked: Meui.Theme.darkMode
                     label: qsTr("Dark Mode")
                     text: Meui.Theme.darkMode ? qsTr("On") : qsTr("Off")
diff --git a/qml/main.qml b/qml/main.qml
index 9927c9c..1354bd4 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -214,7 +214,7 @@ Item {
         }
     }
 
-    ControlCenter {
+    ControlDialog {
         id: controlCenter
     }
 
diff --git a/resources.qrc b/resources.qrc
index 3ec4aa3..754c47a 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -67,7 +67,7 @@
         <file>svg/dark/restore_normal.svg</file>
         <file>svg/dark/system-shutdown-symbolic.svg</file>
         <file>qml/StandardItem.qml</file>
-        <file>qml/ControlCenter.qml</file>
+        <file>qml/ControlDialog.qml</file>
         <file>svg/dark/brightness.svg</file>
         <file>svg/light/brightness.svg</file>
         <file>qml/IconButton.qml</file>
@@ -100,5 +100,7 @@
         <file>svg/light/media-skip-forward-symbolic.svg</file>
         <file>qml/ControlCenterItem.qml</file>
         <file>svg/light/dark-mode.svg</file>
+        <file>svg/dark/dark-mode.svg</file>
+        <file>svg/dark/bluetooth-symbolic.svg</file>
     </qresource>
 </RCC>
diff --git a/svg/dark/bluetooth-symbolic.svg b/svg/dark/bluetooth-symbolic.svg
new file mode 100644
index 0000000..f6dcc96
--- /dev/null
+++ b/svg/dark/bluetooth-symbolic.svg
@@ -0,0 +1,61 @@
+<?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="svg9"
+   sodipodi:docname="bluetooth-symbolic.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <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="1304"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="45.9375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <metadata
+     id="metadata2">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5">
+    <style
+       id="current-color-scheme"
+       type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
+  </defs>
+  <path
+     class="ColorScheme-Text"
+     d="m7.9981 2e-5v7.041l-3.293-3.293-2e-3 2e-3c-0.35575-0.35595-0.99605-0.99609-0.99605-0.99609l-0.70703 0.70703 4.5449 4.541-4.5449 4.541 0.70703 0.70703s0.64035-0.64009 0.99609-0.99609h2e-3l3.2949-3.293v7.0391h1l4-4-4-4 4-4-4-4zm1.002 1.416 2.5859 2.5859-2.5859 2.5859zm0 8 2.5859 2.5859-2.5859 2.5859z"
+     color="#ffffff"
+     fill="#ffffff"
+     id="path7"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/svg/dark/dark-mode.svg b/svg/dark/dark-mode.svg
new file mode 100644
index 0000000..18dc84b
--- /dev/null
+++ b/svg/dark/dark-mode.svg
@@ -0,0 +1,59 @@
+<?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="svg9"
+   sodipodi:docname="dark-mode.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <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="1304"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="45.9375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9"
+     inkscape:document-rotation="0" />
+  <metadata
+     id="metadata2">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5">
+    <style
+       id="current-color-scheme"
+       type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
+  </defs>
+  <path
+     d="M 8.00028,1 C 4.140704,1 1,4.13971 1,7.9993 1,11.859394 4.140732,15 8.00028,15 11.859814,15 15,11.859394 15,7.9993 15,4.13971 11.859842,1 8.00028,1 Z m 0,12.593196 c -0.007,0 -0.014,-9.62e-4 -0.02058,-9.62e-4 V 2.407812 c 0.007,0 0.014,-0.00101 0.02058,-0.00101 3.083822,0 5.592902,2.508702 5.592902,5.592496 0,3.084326 -2.50908,5.593896 -5.592902,5.593896 z"
+     id="path2"
+     style="stroke-width:0.0287544;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/translations/en_US.ts b/translations/en_US.ts
index c284102..91ec4e5 100644
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@@ -25,32 +25,40 @@
     </message>
 </context>
 <context>
-    <name>ControlCenter</name>
+    <name>ApplicationModel</name>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="174"/>
+        <location filename="../src/applicationmodel.cpp" line="279"/>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ControlDialog</name>
+    <message>
+        <location filename="../qml/ControlDialog.qml" line="177"/>
         <source>Wi-Fi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="177"/>
-        <location filename="../qml/ControlCenter.qml" line="198"/>
+        <location filename="../qml/ControlDialog.qml" line="180"/>
+        <location filename="../qml/ControlDialog.qml" line="201"/>
         <source>On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="177"/>
-        <location filename="../qml/ControlCenter.qml" line="188"/>
-        <location filename="../qml/ControlCenter.qml" line="198"/>
+        <location filename="../qml/ControlDialog.qml" line="180"/>
+        <location filename="../qml/ControlDialog.qml" line="191"/>
+        <location filename="../qml/ControlDialog.qml" line="201"/>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="187"/>
+        <location filename="../qml/ControlDialog.qml" line="190"/>
         <source>Bluetooth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="197"/>
+        <location filename="../qml/ControlDialog.qml" line="200"/>
         <source>Dark Mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index 7abec32..68d01ad 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -27,37 +27,38 @@
 <context>
     <name>ApplicationModel</name>
     <message>
+        <location filename="../src/applicationmodel.cpp" line="279"/>
         <source>Launcher</source>
-        <translation type="vanished">应用启动器</translation>
+        <translation>应用启动器</translation>
     </message>
 </context>
 <context>
-    <name>ControlCenter</name>
+    <name>ControlDialog</name>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="174"/>
+        <location filename="../qml/ControlDialog.qml" line="177"/>
         <source>Wi-Fi</source>
         <translation>无线网络</translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="177"/>
-        <location filename="../qml/ControlCenter.qml" line="198"/>
+        <location filename="../qml/ControlDialog.qml" line="180"/>
+        <location filename="../qml/ControlDialog.qml" line="201"/>
         <source>On</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="177"/>
-        <location filename="../qml/ControlCenter.qml" line="188"/>
-        <location filename="../qml/ControlCenter.qml" line="198"/>
+        <location filename="../qml/ControlDialog.qml" line="180"/>
+        <location filename="../qml/ControlDialog.qml" line="191"/>
+        <location filename="../qml/ControlDialog.qml" line="201"/>
         <source>Off</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="187"/>
+        <location filename="../qml/ControlDialog.qml" line="190"/>
         <source>Bluetooth</source>
         <translation>蓝牙</translation>
     </message>
     <message>
-        <location filename="../qml/ControlCenter.qml" line="197"/>
+        <location filename="../qml/ControlDialog.qml" line="200"/>
         <source>Dark Mode</source>
         <translation>深色模式</translation>
     </message>