Move theme color definitions to one place

Task-number: QTBUG-60084
Change-Id: I344509ebc117361c09c02a36df055770332c6c24
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>

10 files changed, 20 insertions, 15 deletions

diff --git a/qml/Background.qml b/qml/Background.qml
index 3beb07f..f7f86fa 100644
--- a/qml/Background.qml
+++ b/qml/Background.qml
@@ -39,7 +39,7 @@ Image {
 
     Rectangle {
         anchors.fill: parent
-        color: "#09102b"
+        color: viewSettings.backgroundColor
         opacity: 0.9
     }
 }
diff --git a/qml/BootScreen.qml b/qml/BootScreen.qml
index 69772a1..4d4615d 100644
--- a/qml/BootScreen.qml
+++ b/qml/BootScreen.qml
@@ -30,7 +30,7 @@ import QtQuick 2.0
 
 Rectangle {
     id: bootScreen
-    color: "#09102b"
+    color: viewSettings.backgroundColor
     opacity: 0.95
 
     Column {
diff --git a/qml/BusyIndicator.qml b/qml/BusyIndicator.qml
index f590ea9..d3d75d1 100644
--- a/qml/BusyIndicator.qml
+++ b/qml/BusyIndicator.qml
@@ -39,8 +39,8 @@ CircularIndicator {
     maximumValue: 360//speedometer.maximumValue
     value: 180//speedometer.value
     padding: 23
-    backgroundColor: "#848895"
-    progressColor: "#41cd52"
+    backgroundColor: viewSettings.loaderBackgroundColor
+    progressColor: viewSettings.loaderForegroundColor
     lineWidth: width * 0.1
 
 
diff --git a/qml/DemoClosePopup.qml b/qml/DemoClosePopup.qml
index 7dd2033..c62c1e7 100644
--- a/qml/DemoClosePopup.qml
+++ b/qml/DemoClosePopup.qml
@@ -33,7 +33,7 @@ Rectangle {
     id: demoClosePopup
     width: parent.width
     height: parent.height
-    color: "#09102b"
+    color: viewSettings.backgroundColor
     opacity: 0.9
 
     function open()
@@ -48,8 +48,8 @@ Rectangle {
 
     Rectangle {
         id: frame
-        color: "#09102b"
-        border.color: "#9d9faa"
+        color: viewSettings.backgroundColor
+        border.color: viewSettings.borderColor
         border.width: 3
         anchors.centerIn: parent
         width: parent.width * 0.35
diff --git a/qml/DemoHeader.qml b/qml/DemoHeader.qml
index da0ef57..18c4016 100644
--- a/qml/DemoHeader.qml
+++ b/qml/DemoHeader.qml
@@ -32,7 +32,7 @@ Rectangle {
     id: demoHeaderBar
     width: parent.width
     height: viewSettings.demoHeaderHeight
-    color: "#09102b"
+    color: viewSettings.backgroundColor
     opacity: 0.9
     y: 0
     z: 1
diff --git a/qml/DemoInfoPopup.qml b/qml/DemoInfoPopup.qml
index fc1960e..5cc64aa 100644
--- a/qml/DemoInfoPopup.qml
+++ b/qml/DemoInfoPopup.qml
@@ -33,7 +33,7 @@ Rectangle {
     id: demoInfoPopup
     width: parent.width
     height: parent.height
-    color: "#09102b"
+    color: viewSettings.backgroundColor
     opacity: 0.9
 
     // Prevent user from interacting with the transparent demo on the background
@@ -53,8 +53,8 @@ Rectangle {
 
     Rectangle {
         id: frame
-        color: "#09102b"
-        border.color: "#9d9faa"
+        color: viewSettings.backgroundColor
+        border.color: viewSettings.borderColor
         border.width: 3
         anchors.centerIn: parent
         width: parent.width * 0.5
@@ -138,7 +138,7 @@ Rectangle {
                 contentItem: Rectangle {
                     implicitWidth: root.margin * 0.3
                     implicitHeight: root.height * 0.1
-                    color: "#41cd52"
+                    color: viewSettings.scrollBarColor
                 }
             }
         }
diff --git a/qml/DetailView.qml b/qml/DetailView.qml
index 14e7c2d..e390267 100644
--- a/qml/DetailView.qml
+++ b/qml/DetailView.qml
@@ -157,7 +157,7 @@ Item {
                 anchors.rightMargin: viewSettings.pageMargin
                 size: 0.3
                 contentItem: Rectangle{
-                    color: "#41cd52"
+                    color: viewSettings.scrollBarColor
                     implicitHeight: thumbList.height * 0.03
                 }
             }
diff --git a/qml/LaunchScreen.qml b/qml/LaunchScreen.qml
index 829fd8e..a83d524 100644
--- a/qml/LaunchScreen.qml
+++ b/qml/LaunchScreen.qml
@@ -67,7 +67,7 @@ Item {
             contentItem: Rectangle {
                 implicitWidth: viewSettings.pageMargin * 0.25
                 implicitHeight: root.height * 0.1
-                color: "#41cd52"
+                color: viewSettings.scrollBarColor
             }
         }
     }
diff --git a/qml/Main.qml b/qml/Main.qml
index 0408822..23d365c 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -41,7 +41,7 @@ Window {
     width: 800
     height: 600
 
-    color: "#09102b"
+    color: viewSettings.backgroundColor
     property alias appFont: viewSettings.appFont
 
     ViewSettings {
diff --git a/qml/ViewSettings.qml b/qml/ViewSettings.qml
index 0142266..53af6b5 100644
--- a/qml/ViewSettings.qml
+++ b/qml/ViewSettings.qml
@@ -36,7 +36,12 @@ Item {
     property real demoHeaderHeight: 2.5 * pageMargin
     property string appFont: "TitilliumWeb"
     property int stateDelay: 200;
+    property string backgroundColor: "#09102b"
+    property string borderColor: "#9d9faa"
     property string buttonGreenColor: "#41cd52"
     property string buttonGrayColor: "#9d9faa"
     property string buttonActiveColor: "#216729"
+    property string loaderBackgroundColor: "#848895"
+    property string loaderForegroundColor: "#41cd52"
+    property string scrollBarColor: "#41cd52"
 }