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 @@
svg/dark/restore_normal.svg
svg/dark/system-shutdown-symbolic.svg
qml/StandardItem.qml
- qml/ControlCenter.qml
+ qml/ControlDialog.qml
svg/dark/brightness.svg
svg/light/brightness.svg
qml/IconButton.qml
@@ -100,5 +100,7 @@
svg/light/media-skip-forward-symbolic.svg
qml/ControlCenterItem.qml
svg/light/dark-mode.svg
+ svg/dark/dark-mode.svg
+ svg/dark/bluetooth-symbolic.svg
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 @@
+
+
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 @@
+
+
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 @@
- ControlCenter
+ ApplicationModel
-
+
+
+
+
+
+
+ ControlDialog
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
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 @@
ApplicationModel
+
- 应用启动器
+ 应用启动器
- ControlCenter
+ ControlDialog
-
+
无线网络
-
-
+
+
打开
-
-
-
+
+
+
关闭
-
+
蓝牙
-
+
深色模式