Control the current theme in the preferences

eplatonoff · Sep 16, 2024 · cf00541 · cf00541
1 parent d0c47d9
commit cf00541
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 54 deletions.
diff --git a/src/Components/Preferences.qml b/src/Components/Preferences.qml
@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Controls
 
 import "Preferences"
 
@@ -160,25 +161,27 @@ Item {
         }
 
         Item {
-            id: followSystemTheme
+            visible: Qt.platform.os === "osx"
+
+            id: showInDock
             height: preferences.cellHeight
             anchors.right: parent.right
             anchors.rightMargin: 0
             anchors.left: parent.left
             anchors.leftMargin: 0
 
             Checkbox {
-                id: followSystemThemeCheck
-                checked: appSettings.followSystemTheme
+                id: showInDockCheck
+                checked: appSettings.showInDock
             }
 
             Text {
-                id: followSystemThemeLabel
+                id: showInDockLabel
                 height: 19
-                text: qsTr("Follow system color theme")
+                text: qsTr("Show app in Dock")
                 anchors.right: parent.right
                 anchors.rightMargin: 0
-                anchors.left: followSystemThemeCheck.right
+                anchors.left: showInDockCheck.right
                 anchors.leftMargin: 0
                 color: colors.getColor("dark")
                 anchors.verticalCenter: parent.verticalCenter
@@ -187,61 +190,57 @@ Item {
                 font.pixelSize: fontSize
 
                 renderType: Text.NativeRendering
-
             }
 
             MouseArea {
-                id: followSystemThemeTrigger
+                id: showInDockCheckTrigger
                 anchors.fill: parent
                 cursorShape: Qt.PointingHandCursor
 
                 onReleased: {
-                    appSettings.followSystemTheme = !appSettings.followSystemTheme
+                    appSettings.showInDock = !appSettings.showInDock
                 }
             }
         }
-
+        
         Item {
-            visible: Qt.platform.os === "osx"
-
-            id: showInDock
+            id: colorTheme
             height: preferences.cellHeight
             anchors.right: parent.right
             anchors.rightMargin: 0
             anchors.left: parent.left
             anchors.leftMargin: 0
 
-            Checkbox {
-                id: showInDockCheck
-                checked: appSettings.showInDock
-            }
-
             Text {
-                id: showInDockLabel
+                id: colorThemeLabel
                 height: 19
-                text: qsTr("Show app in Dock")
-                anchors.right: parent.right
-                anchors.rightMargin: 0
-                anchors.left: showInDockCheck.right
+                text: qsTr("Color theme")
+                anchors.left: parent.left
                 anchors.leftMargin: 0
-                color: colors.getColor("dark")
                 anchors.verticalCenter: parent.verticalCenter
+                color: colors.getColor("dark")
 
                 font.family: localFont.name
                 font.pixelSize: fontSize
 
                 renderType: Text.NativeRendering
             }
 
-            MouseArea {
-                id: showInDockCheckTrigger
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-
-                onReleased: {
-                    appSettings.showInDock = !appSettings.showInDock
+            ComboBox {
+                id: colorThemeCombo
+                model: ["Light", "Dark", "System"]
+                currentIndex: {
+                    var index = colorThemeCombo.model.indexOf(appSettings.colorTheme);
+                    return index !== -1 ? index : 0;
+                }
+                anchors.left: colorThemeLabel.right
+                anchors.leftMargin: 10
+                anchors.verticalCenter: parent.verticalCenter
+                onActivated: {
+                    appSettings.colorTheme = colorThemeCombo.currentText
                 }
             }
+
         }
     }
 

diff --git a/src/main.qml b/src/main.qml
@@ -53,19 +53,23 @@ ApplicationWindow {
     SystemPalette{
         id: systemPalette
 
-        property color lightColor: '#ffffff'
         property bool sysemDarkMode: Application.styleHints.colorScheme === Qt.ColorScheme.Dark
-        property alias follow: appSettings.followSystemTheme
+        property alias colorTheme: appSettings.colorTheme
 
-        onSysemDarkModeChanged: setSystemColors()
-        onFollowChanged: setSystemColors()
-        Component.onCompleted: setSystemColors()
+        onColorThemeChanged: updateTheme()
+        onSysemDarkModeChanged: updateTheme()
+        Component.onCompleted: updateTheme()
 
-
-        function setSystemColors(){
-            if(appSettings.followSystemTheme){
+        function updateTheme(){
+            if(systemPalette.colorTheme === "System"){
                 appSettings.darkMode = sysemDarkMode
             }
+            else if (systemPalette.colorTheme === "Dark") {
+                appSettings.darkMode = true
+            }
+            else {
+                appSettings.darkMode = false
+            }
         }
     }
 
@@ -114,7 +118,7 @@ ApplicationWindow {
         id: appSettings
 
         property bool darkMode: false
-        property bool followSystemTheme: true
+        property string colorTheme: "System"
         property bool showInDock: false
 
         property alias soundMuted: notifications.soundMuted
@@ -256,20 +260,6 @@ ApplicationWindow {
                 id: digitalClock
             }
 
-            Icon {
-                id: darkModeButton
-                glyph: appSettings.darkMode ? "\uea05" : "\uea0a"
-                anchors.top: parent.top
-                anchors.topMargin: 0
-                anchors.right: parent.right
-                anchors.rightMargin: 0
-
-                onReleased: {
-                    appSettings.darkMode = !appSettings.darkMode
-                }
-            }
-
-
             Icon {
                 id: soundButton
                 glyph: notifications.soundMuted ? "\uea09" : "\uea06"