Set default accent color

Author: adazem009

src/app/CMakeLists.txt

@@ -10,11 +10,14 @@ qt_add_executable(${APP_TARGET}
     libraryinfo.h
 )
 
+set_source_files_properties(qml/Colors.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
+
 qt_add_qml_module(${APP_TARGET}
     URI ScratchCPP
     VERSION 1.0
     QML_FILES
         qml/main.qml
+        qml/Colors.qml
         qml/dialogs/AboutDialog.qml
         qml/dialogs/ProjectSettingsDialog.qml
         qml/dialogs/PreferencesDialog.qml

src/app/qml/Colors.qml

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+pragma Singleton
+import QtQuick
+import ScratchCPP.Ui
+
+QtObject {
+    readonly property list<color> darkAccentColors: [
+        Qt.rgba(0.85, 0.31, 0.33, 1),
+        Qt.rgba(0.85, 0.62, 0.31, 1),
+        Qt.rgba(0.85, 0.84, 0.31, 1),
+        Qt.rgba(0.39, 0.85, 0.31, 1),
+        Qt.rgba(0.31, 0.75, 0.85, 1),
+        Qt.rgba(0.32, 0.32, 0.85, 1),
+        Qt.rgba(0.68, 0.31, 0.85, 1),
+    ]
+
+    readonly property list<color> lightAccentColors: [
+        Qt.rgba(0.75, 0.08, 0.09, 1),
+        Qt.rgba(0.75, 0.47, 0.08, 1),
+        Qt.rgba(0.75, 0.74, 0.08, 1),
+        Qt.rgba(0.17, 0.75, 0.08, 1),
+        Qt.rgba(0.08, 0.63, 0.75, 1),
+        Qt.rgba(0.08, 0.08, 0.75, 1),
+        Qt.rgba(0.54, 0.08, 0.75, 1),
+    ]
+
+    readonly property color defaultAccentColor: ThemeEngine.theme == ThemeEngine.DarkTheme ? darkAccentColors[1] : lightAccentColors[1]
+}

src/app/qml/dialogs/PreferencesDialog.qml

@@ -7,6 +7,8 @@ import ScratchCPP.Global
 import ScratchCPP.Ui
 import ScratchCPP.UiComponents
 
+import ".."
+
 CustomDialog {
     title: qsTr("Preferences")
     standardButtons: Dialog.Cancel | Dialog.Ok
@@ -20,26 +22,6 @@ CustomDialog {
     QtObject {
         id: priv
         property int accentColorIndex: -1
-
-        readonly property list<color> darkAccentColors: [
-            Qt.rgba(0.85, 0.31, 0.33, 1),
-            Qt.rgba(0.85, 0.62, 0.31, 1),
-            Qt.rgba(0.85, 0.84, 0.31, 1),
-            Qt.rgba(0.39, 0.85, 0.31, 1),
-            Qt.rgba(0.31, 0.75, 0.85, 1),
-            Qt.rgba(0.32, 0.32, 0.85, 1),
-            Qt.rgba(0.68, 0.31, 0.85, 1),
-        ]
-
-        readonly property list<color> lightAccentColors: [
-            Qt.rgba(0.75, 0.08, 0.09, 1),
-            Qt.rgba(0.75, 0.47, 0.08, 1),
-            Qt.rgba(0.75, 0.74, 0.08, 1),
-            Qt.rgba(0.17, 0.75, 0.08, 1),
-            Qt.rgba(0.08, 0.63, 0.75, 1),
-            Qt.rgba(0.08, 0.08, 0.75, 1),
-            Qt.rgba(0.54, 0.08, 0.75, 1),
-        ]
     }
 
     contentItem: ColumnLayout {
@@ -71,7 +53,7 @@ CustomDialog {
 
             Repeater {
                 id: accentColors
-                model: ThemeEngine.theme == ThemeEngine.DarkTheme ? priv.darkAccentColors : priv.lightAccentColors
+                model: ThemeEngine.theme == ThemeEngine.DarkTheme ? Colors.darkAccentColors : Colors.lightAccentColors
 
                 ColorButton {
                     required property color modelData
@@ -99,9 +81,9 @@ CustomDialog {
                 console.log(priv.accentColorIndex, ThemeEngine.theme);
 
                 if(ThemeEngine.theme == ThemeEngine.DarkTheme) {
-                    ThemeEngine.accentColor = priv.darkAccentColors[priv.accentColorIndex];
+                    ThemeEngine.accentColor = Colors.darkAccentColors[priv.accentColorIndex];
                 } else {
-                    ThemeEngine.accentColor = priv.lightAccentColors[priv.accentColorIndex];
+                    ThemeEngine.accentColor = Colors.lightAccentColors[priv.accentColorIndex];
                 }
             }
         }

src/app/qml/main.qml

@@ -172,4 +172,9 @@ ApplicationWindow {
             }
         }
     }
+
+    Component.onCompleted: {
+        if(ThemeEngine.accentColor === Qt.rgba(0, 0, 0, 0))
+            ThemeEngine.accentColor = Colors.defaultAccentColor;
+    }
 }

src/ui/uimodule.cpp

@@ -32,4 +32,5 @@ void scratchcpp::ui::UiModule::registerExports()
 void UiModule::initSettings()
 {
     INIT_SETTINGS_KEY("theme", static_cast<int>(IThemeEngine::Theme::DarkTheme));
+    INIT_SETTINGS_KEY("accentColor", QColor(0, 0, 0, 0)); // default accent color should be set by the application
 }