From 28e9fdf3151b0ae971f75e9386a6ff1e3c370bf6 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Fri, 18 May 2018 16:03:30 +0300
Subject: Fix Media Player demo color definitions

Task-number: QTBUG-62791
Change-Id: I2bd15e2e873aa7343a072b846918296e7cbce205
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 basicsuite/mediaplayer/EffectSelectionPanel.qml | 2 +-
 basicsuite/mediaplayer/FileBrowser.qml          | 4 ++--
 basicsuite/mediaplayer/ImageButton.qml          | 3 ++-
 basicsuite/mediaplayer/MetadataView.qml         | 2 +-
 basicsuite/mediaplayer/UrlBar.qml               | 2 +-
 basicsuite/mediaplayer/VolumeControl.qml        | 6 ++++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/basicsuite/mediaplayer/EffectSelectionPanel.qml b/basicsuite/mediaplayer/EffectSelectionPanel.qml
index 12c8a42..4daded0 100644
--- a/basicsuite/mediaplayer/EffectSelectionPanel.qml
+++ b/basicsuite/mediaplayer/EffectSelectionPanel.qml
@@ -159,7 +159,7 @@ Rectangle {
             width: parent.width
             property bool isSelected: list.currentIndex == index
             Text {
-                color: parent.isSelected ? defaultGreen : "white"
+                color: parent.isSelected ? Settings.primaryGreen : "white"
                 text: name
                 anchors.centerIn: parent
                 font.pixelSize: 20
diff --git a/basicsuite/mediaplayer/FileBrowser.qml b/basicsuite/mediaplayer/FileBrowser.qml
index 04e821a..aae608f 100644
--- a/basicsuite/mediaplayer/FileBrowser.qml
+++ b/basicsuite/mediaplayer/FileBrowser.qml
@@ -113,7 +113,7 @@ Item {
                         text: fileName
                         font.pixelSize: parent.height * .1
                         font.family: appFont
-                        color: view.currentIndex === index ? defaultGreen : "white"
+                        color: view.currentIndex === index ? Settings.primaryGreen : "white"
                         elide: Text.ElideRight
                     }
 
@@ -226,7 +226,7 @@ Item {
                     width: parent.width
                     anchors.bottom: parent.bottom
                     height: 2
-                    color: defaultGrey
+                    color: Settings.primaryGrey
                 }
             }
 
diff --git a/basicsuite/mediaplayer/ImageButton.qml b/basicsuite/mediaplayer/ImageButton.qml
index 4e26fc1..982cc49 100644
--- a/basicsuite/mediaplayer/ImageButton.qml
+++ b/basicsuite/mediaplayer/ImageButton.qml
@@ -50,6 +50,7 @@
 
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
+import "settings.js" as Settings
 
 Item {
     id: root
@@ -80,7 +81,7 @@ Item {
         id: glowEffect
         anchors.fill: image
         source: image
-        color: pressed ? "#22000000" : checked ? defaultGreen : "white"
+        color: pressed ? "#22000000" : checked ? Settings.primaryGreen : "white"
         visible: checked || hover || pressed
     }
 
diff --git a/basicsuite/mediaplayer/MetadataView.qml b/basicsuite/mediaplayer/MetadataView.qml
index a995050..d6f45d8 100644
--- a/basicsuite/mediaplayer/MetadataView.qml
+++ b/basicsuite/mediaplayer/MetadataView.qml
@@ -68,7 +68,7 @@ Rectangle {
         opacity: 0.9
         anchors.centerIn: parent
         anchors.verticalCenterOffset: -50
-        border.color: defaultGrey
+        border.color: Settings.primaryGrey
         border.width: 2
 
         Column {
diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml
index ca69f69..80a9259 100644
--- a/basicsuite/mediaplayer/UrlBar.qml
+++ b/basicsuite/mediaplayer/UrlBar.qml
@@ -107,7 +107,7 @@ Rectangle {
         anchors.verticalCenter: urlBar.verticalCenter
         height: 70
         width: 70
-        color: defaultGrey
+        color: Settings.primaryGrey
         MouseArea {
             anchors.fill: parent
             onClicked: { urlInput.text = ""; urlInput.paste(); }
diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml
index c1f3dce..3a83491 100644
--- a/basicsuite/mediaplayer/VolumeControl.qml
+++ b/basicsuite/mediaplayer/VolumeControl.qml
@@ -51,6 +51,8 @@
 import QtQuick 2.0
 import QtDeviceUtilities.QtButtonImageProvider 1.0
 import QtQuick.Controls 2.2
+import "settings.js" as Settings
+
 Item {
     id: root
     width: parent.width * 0.1
@@ -138,7 +140,7 @@ Item {
                 Rectangle{
                     height: volumeSlider.visualPosition * parent.height
                     width: parent.width
-                    color: defaultGrey
+                    color: Settings.primaryGrey
                     radius: 2
                 }
             }
@@ -148,7 +150,7 @@ Item {
                 width: sliderBackground.width * 7
                 height: width
                 radius: height * 0.5
-                color: defaultGreen
+                color: Settings.primaryGreen
             }
         }
 
-- 
cgit v1.2.3