diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-06-15 14:42:56 +0300 |
|---|---|---|
| committer | Juho Annunen <juho.annunen@qt.io> | 2018-06-18 11:35:09 +0000 |
| commit | 0b0d77ed36616ec7c10d7ceb5ea90196b11d4ff8 (patch) | |
| tree | 265d45b63f7074a22f42ed8d36a78eaac63e9f54 /basicsuite | |
| parent | a60797871ea11ade6b583869e361ffef88e2213b (diff) | |
Fix mediaplayer color definitions
Task-number: QTBUG-68471
Change-Id: I292f40ce195f0e2f914353cb237e3009774c11bb
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Diffstat (limited to 'basicsuite')
| -rw-r--r-- | basicsuite/mediaplayer/PlaybackControl.qml | 5 | ||||
| -rw-r--r-- | basicsuite/mediaplayer/UrlBar.qml | 2 | ||||
| -rw-r--r-- | basicsuite/mediaplayer/VolumeControl.qml | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/basicsuite/mediaplayer/PlaybackControl.qml b/basicsuite/mediaplayer/PlaybackControl.qml index 5fff05f..7c90fa6 100644 --- a/basicsuite/mediaplayer/PlaybackControl.qml +++ b/basicsuite/mediaplayer/PlaybackControl.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtDeviceUtilities.QtButtonImageProvider 1.0 +import "settings.js" as Settings Row { anchors.leftMargin: parent.width * 0.02 @@ -72,7 +73,7 @@ Row { height: width anchors.bottom: parent.bottom anchors.bottomMargin: root.spacing - fillColor: viewSettings.buttonGreenColor + fillColor: Settings.primaryGreen Image{ anchors.centerIn: parent width: parent.width * 0.5 @@ -91,7 +92,7 @@ Row { height: width anchors.bottom: parent.bottom anchors.bottomMargin: root.spacing - fillColor: viewSettings.buttonGreenColor + fillColor: Settings.primaryGreen Image{ anchors.centerIn: parent width: parent.width * 0.5 diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml index 80a9259..cb822ff 100644 --- a/basicsuite/mediaplayer/UrlBar.qml +++ b/basicsuite/mediaplayer/UrlBar.qml @@ -95,7 +95,7 @@ Rectangle { background: Rectangle { color: Settings.backgroundColor opacity: 0.8 - border.color: viewSettings.borderColor + border.color: Settings.primaryGrey border.width: 2 } onAccepted: root.urlAccepted(urlInput.text); diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml index 3a83491..9536d12 100644 --- a/basicsuite/mediaplayer/VolumeControl.qml +++ b/basicsuite/mediaplayer/VolumeControl.qml @@ -69,7 +69,7 @@ Item { anchors.bottom: parent.bottom anchors.bottomMargin: controlBar.width * 0.02 anchors.horizontalCenter: parent.horizontalCenter - fillColor: viewSettings.buttonGreenColor + fillColor: Settings.primaryGreen Image{ anchors.centerIn: parent @@ -104,7 +104,7 @@ Item { width: controlBar.width * 0.06 height: width anchors.bottom: parent.bottom - fillColor: viewSettings.buttonGrayColor + fillColor: Settings.primaryGrey borderColor: "transparent" Image{ anchors.centerIn: parent |