Use QSettings for color definitions

Task-number: QTBUG-69536
Change-Id: I4c1fa7758db6f593dd38050a75d276fcc85346ac
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

12 files changed, 25 insertions, 35 deletions

diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml
index fed8a77..e4f0665 100644
--- a/basicsuite/mediaplayer/ControlBar.qml
+++ b/basicsuite/mediaplayer/ControlBar.qml
@@ -50,12 +50,11 @@
 
 import QtQuick 2.0
 import QtMultimedia 5.0
-import "settings.js" as Settings
 
 Rectangle {
     id: controlBar
     height: parent.height * 0.225
-    color: Settings.backgroundColor
+    color: _backgroundColor
 
     property MediaPlayer mediaPlayer: null
     property bool isMouseAbove: false
diff --git a/basicsuite/mediaplayer/EffectSelectionPanel.qml b/basicsuite/mediaplayer/EffectSelectionPanel.qml
index 4daded0..0af10a5 100644
--- a/basicsuite/mediaplayer/EffectSelectionPanel.qml
+++ b/basicsuite/mediaplayer/EffectSelectionPanel.qml
@@ -48,11 +48,10 @@
 **
 ****************************************************************************/
 import QtQuick 2.0
-import "settings.js" as Settings
 
 Rectangle {
     id: root
-    color: Settings.backgroundColor
+    color: _backgroundColor
     height: 78
     property int itemHeight: 25
     property string effectSource: ""
@@ -159,7 +158,7 @@ Rectangle {
             width: parent.width
             property bool isSelected: list.currentIndex == index
             Text {
-                color: parent.isSelected ? Settings.primaryGreen : "white"
+                color: parent.isSelected ? _primaryGreen : "white"
                 text: name
                 anchors.centerIn: parent
                 font.pixelSize: 20
diff --git a/basicsuite/mediaplayer/FileBrowser.qml b/basicsuite/mediaplayer/FileBrowser.qml
index aae608f..da51001 100644
--- a/basicsuite/mediaplayer/FileBrowser.qml
+++ b/basicsuite/mediaplayer/FileBrowser.qml
@@ -51,7 +51,6 @@ import QtQuick 2.0
 import Qt.labs.folderlistmodel 2.0
 import QtQuick.Controls 1.4
 import QtDeviceUtilities.QtButtonImageProvider 1.0
-import "settings.js" as Settings
 
 Item {
     id: fileBrowser
@@ -79,7 +78,7 @@ Item {
 
         Rectangle {
             id: root
-            color: Settings.backgroundColor
+            color: _backgroundColor
             property alias folder: folders.folder
 
             FolderListModel {
@@ -113,7 +112,7 @@ Item {
                         text: fileName
                         font.pixelSize: parent.height * .1
                         font.family: appFont
-                        color: view.currentIndex === index ? Settings.primaryGreen : "white"
+                        color: view.currentIndex === index ? _primaryGreen : "white"
                         elide: Text.ElideRight
                     }
 
@@ -185,7 +184,7 @@ Item {
             Rectangle {
                 width: parent.width;
                 height: 70
-                color: Settings.backgroundColor
+                color: _backgroundColor
                 id: titleBar
 
                 QtButton {
@@ -195,6 +194,7 @@ Item {
                     anchors.leftMargin: parent.width * .05
                     anchors.verticalCenter: parent.verticalCenter
                     onClicked: up()
+                    fillColor: _primaryGreen
                 }
 
                 Text {
@@ -220,13 +220,14 @@ Item {
                     anchors.rightMargin: parent.width * .05
                     anchors.verticalCenter: parent.verticalCenter
                     onClicked: fileBrowser.selectFile("")
+                    fillColor: _primaryGreen
                 }
 
                 Rectangle {
                     width: parent.width
                     anchors.bottom: parent.bottom
                     height: 2
-                    color: Settings.primaryGrey
+                    color: _primaryGrey
                 }
             }
 
diff --git a/basicsuite/mediaplayer/ImageButton.qml b/basicsuite/mediaplayer/ImageButton.qml
index 982cc49..cb4dcb4 100644
--- a/basicsuite/mediaplayer/ImageButton.qml
+++ b/basicsuite/mediaplayer/ImageButton.qml
@@ -50,7 +50,6 @@
 
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
-import "settings.js" as Settings
 
 Item {
     id: root
@@ -81,7 +80,7 @@ Item {
         id: glowEffect
         anchors.fill: image
         source: image
-        color: pressed ? "#22000000" : checked ? Settings.primaryGreen : "white"
+        color: pressed ? "#22000000" : checked ? _primaryGreen : "white"
         visible: checked || hover || pressed
     }
 
diff --git a/basicsuite/mediaplayer/MetadataView.qml b/basicsuite/mediaplayer/MetadataView.qml
index d6f45d8..34b53b4 100644
--- a/basicsuite/mediaplayer/MetadataView.qml
+++ b/basicsuite/mediaplayer/MetadataView.qml
@@ -49,7 +49,6 @@
 ****************************************************************************/
 import QtQuick 2.0
 import QtMultimedia 5.0
-import "settings.js" as Settings
 
 Rectangle {
     id: root
@@ -64,11 +63,11 @@ Rectangle {
     Rectangle {
         height: column.height + 30
         width: 500
-        color: Settings.backgroundColor
+        color: _backgroundColor
         opacity: 0.9
         anchors.centerIn: parent
         anchors.verticalCenterOffset: -50
-        border.color: Settings.primaryGrey
+        border.color: _primaryGrey
         border.width: 2
 
         Column {
diff --git a/basicsuite/mediaplayer/ParameterPanel.qml b/basicsuite/mediaplayer/ParameterPanel.qml
index 1378827..81bba63 100644
--- a/basicsuite/mediaplayer/ParameterPanel.qml
+++ b/basicsuite/mediaplayer/ParameterPanel.qml
@@ -48,12 +48,11 @@
 **
 ****************************************************************************/
 import QtQuick 2.0
-import "settings.js" as Settings
 
 Rectangle {
     id: root
     height: view.model.count * sliderHeight
-    color: Settings.backgroundColor
+    color: _backgroundColor
     property color lineColor: "black"
     property real spacing: 10
     property real sliderHeight: 50
diff --git a/basicsuite/mediaplayer/PlaybackControl.qml b/basicsuite/mediaplayer/PlaybackControl.qml
index 7c90fa6..99b1d5c 100644
--- a/basicsuite/mediaplayer/PlaybackControl.qml
+++ b/basicsuite/mediaplayer/PlaybackControl.qml
@@ -50,7 +50,6 @@
 
 import QtQuick 2.0
 import QtDeviceUtilities.QtButtonImageProvider 1.0
-import "settings.js" as Settings
 
 Row {
     anchors.leftMargin: parent.width * 0.02
@@ -73,7 +72,7 @@ Row {
         height: width
         anchors.bottom: parent.bottom
         anchors.bottomMargin: root.spacing
-        fillColor: Settings.primaryGreen
+        fillColor: _primaryGreen
         Image{
             anchors.centerIn: parent
             width: parent.width * 0.5
@@ -92,7 +91,7 @@ Row {
         height: width
         anchors.bottom: parent.bottom
         anchors.bottomMargin: root.spacing
-        fillColor: Settings.primaryGreen
+        fillColor: _primaryGreen
         Image{
             anchors.centerIn: parent
             width: parent.width * 0.5
diff --git a/basicsuite/mediaplayer/PlayerSlider.qml b/basicsuite/mediaplayer/PlayerSlider.qml
index 68c21e1..0ec52b5 100644
--- a/basicsuite/mediaplayer/PlayerSlider.qml
+++ b/basicsuite/mediaplayer/PlayerSlider.qml
@@ -48,7 +48,6 @@
 **
 ****************************************************************************/
 import QtQuick 2.0
-import "settings.js" as Settings
 
 Item {
     id: slider
@@ -82,7 +81,7 @@ Item {
         width: slider.width
         anchors.verticalCenter: slider.verticalCenter
         height: 5
-        color: Settings.primaryGrey
+        color: _primaryGrey
         radius: 2
 
         MouseArea {
@@ -129,7 +128,7 @@ Item {
         width: 40
         height: width
         radius: width / 2
-        color: Settings.primaryGreen
+        color: _primaryGreen
         antialiasing: true
         anchors.centerIn: handle
         visible: true
diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml
index cb822ff..73e9cc5 100644
--- a/basicsuite/mediaplayer/UrlBar.qml
+++ b/basicsuite/mediaplayer/UrlBar.qml
@@ -49,7 +49,6 @@
 ****************************************************************************/
 import QtQuick 2.0
 import QtQuick.Controls 2.0
-import "settings.js" as Settings
 
 Rectangle {
     id: root
@@ -93,9 +92,9 @@ Rectangle {
         font.family: appFont
         font.styleName: "Light"
         background: Rectangle {
-            color: Settings.backgroundColor
+            color: _backgroundColor
             opacity: 0.8
-            border.color: Settings.primaryGrey
+            border.color: _primaryGrey
             border.width: 2
         }
         onAccepted: root.urlAccepted(urlInput.text);
@@ -107,7 +106,7 @@ Rectangle {
         anchors.verticalCenter: urlBar.verticalCenter
         height: 70
         width: 70
-        color: Settings.primaryGrey
+        color: _primaryGrey
         MouseArea {
             anchors.fill: parent
             onClicked: { urlInput.text = ""; urlInput.paste(); }
diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml
index 9536d12..4369d04 100644
--- a/basicsuite/mediaplayer/VolumeControl.qml
+++ b/basicsuite/mediaplayer/VolumeControl.qml
@@ -51,7 +51,6 @@
 import QtQuick 2.0
 import QtDeviceUtilities.QtButtonImageProvider 1.0
 import QtQuick.Controls 2.2
-import "settings.js" as Settings
 
 Item {
     id: root
@@ -69,7 +68,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: controlBar.width * 0.02
         anchors.horizontalCenter: parent.horizontalCenter
-        fillColor: Settings.primaryGreen
+        fillColor: _primaryGreen
 
         Image{
             anchors.centerIn: parent
@@ -104,7 +103,7 @@ Item {
             width: controlBar.width * 0.06
             height: width
             anchors.bottom: parent.bottom
-            fillColor: Settings.primaryGrey
+            fillColor: _primaryGrey
             borderColor: "transparent"
             Image{
                 anchors.centerIn: parent
@@ -140,7 +139,7 @@ Item {
                 Rectangle{
                     height: volumeSlider.visualPosition * parent.height
                     width: parent.width
-                    color: Settings.primaryGrey
+                    color: _primaryGrey
                     radius: 2
                 }
             }
@@ -150,7 +149,7 @@ Item {
                 width: sliderBackground.width * 7
                 height: width
                 radius: height * 0.5
-                color: Settings.primaryGreen
+                color: _primaryGreen
             }
         }
 
diff --git a/basicsuite/mediaplayer/main.qml b/basicsuite/mediaplayer/main.qml
index ec8719d..527e735 100644
--- a/basicsuite/mediaplayer/main.qml
+++ b/basicsuite/mediaplayer/main.qml
@@ -51,7 +51,6 @@
 import QtQuick 2.0
 import QtMultimedia 5.0
 import QtDeviceUtilities.QtButtonImageProvider 1.0
-import "settings.js" as Settings
 
 FocusScope {
     id: applicationWindow
diff --git a/basicsuite/mediaplayer/mediaplayer.pro b/basicsuite/mediaplayer/mediaplayer.pro
index 1487620..c56ba88 100644
--- a/basicsuite/mediaplayer/mediaplayer.pro
+++ b/basicsuite/mediaplayer/mediaplayer.pro
@@ -20,8 +20,7 @@ content.files = \
     UrlBar.qml \
     VolumeControl.qml \
     Effects \
-    images \
-    ../shared/settings.js
+    images
 
 content.path = $$DESTPATH