From da6035233fc3bcfbc4a3d65075ee4099349c09d0 Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Mon, 23 Apr 2018 15:17:33 +0300 Subject: Move common definitions to shared settings Task-number: QTBUG-65302 Change-Id: I2153e2f2b4aa295e87098256354ed034480294df Reviewed-by: Teemu Holappa --- basicsuite/mediaplayer/ControlBar.qml | 3 ++- basicsuite/mediaplayer/EffectSelectionPanel.qml | 3 ++- basicsuite/mediaplayer/FileBrowser.qml | 5 +++-- basicsuite/mediaplayer/MetadataView.qml | 3 ++- basicsuite/mediaplayer/ParameterPanel.qml | 3 ++- basicsuite/mediaplayer/PlayerSlider.qml | 5 +++-- basicsuite/mediaplayer/UrlBar.qml | 3 ++- basicsuite/mediaplayer/main.qml | 1 + basicsuite/mediaplayer/mediaplayer.pro | 3 ++- 9 files changed, 19 insertions(+), 10 deletions(-) (limited to 'basicsuite/mediaplayer') diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml index e65a3a3..f05cea8 100644 --- a/basicsuite/mediaplayer/ControlBar.qml +++ b/basicsuite/mediaplayer/ControlBar.qml @@ -50,11 +50,12 @@ import QtQuick 2.0 import QtMultimedia 5.0 +import "settings.js" as Settings Rectangle { id: controlBar height: parent.height * 0.225 - color: defaultBackground + color: Settings.backgroundColor property MediaPlayer mediaPlayer: null property bool isMouseAbove: false diff --git a/basicsuite/mediaplayer/EffectSelectionPanel.qml b/basicsuite/mediaplayer/EffectSelectionPanel.qml index 68a9cac..12c8a42 100644 --- a/basicsuite/mediaplayer/EffectSelectionPanel.qml +++ b/basicsuite/mediaplayer/EffectSelectionPanel.qml @@ -48,10 +48,11 @@ ** ****************************************************************************/ import QtQuick 2.0 +import "settings.js" as Settings Rectangle { id: root - color: defaultBackground + color: Settings.backgroundColor height: 78 property int itemHeight: 25 property string effectSource: "" diff --git a/basicsuite/mediaplayer/FileBrowser.qml b/basicsuite/mediaplayer/FileBrowser.qml index 8bae836..04e821a 100644 --- a/basicsuite/mediaplayer/FileBrowser.qml +++ b/basicsuite/mediaplayer/FileBrowser.qml @@ -51,6 +51,7 @@ 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 @@ -78,7 +79,7 @@ Item { Rectangle { id: root - color: defaultBackground + color: Settings.backgroundColor property alias folder: folders.folder FolderListModel { @@ -184,7 +185,7 @@ Item { Rectangle { width: parent.width; height: 70 - color: defaultBackground + color: Settings.backgroundColor id: titleBar QtButton { diff --git a/basicsuite/mediaplayer/MetadataView.qml b/basicsuite/mediaplayer/MetadataView.qml index 79883d2..a995050 100644 --- a/basicsuite/mediaplayer/MetadataView.qml +++ b/basicsuite/mediaplayer/MetadataView.qml @@ -49,6 +49,7 @@ ****************************************************************************/ import QtQuick 2.0 import QtMultimedia 5.0 +import "settings.js" as Settings Rectangle { id: root @@ -63,7 +64,7 @@ Rectangle { Rectangle { height: column.height + 30 width: 500 - color: defaultBackground + color: Settings.backgroundColor opacity: 0.9 anchors.centerIn: parent anchors.verticalCenterOffset: -50 diff --git a/basicsuite/mediaplayer/ParameterPanel.qml b/basicsuite/mediaplayer/ParameterPanel.qml index 5b8e991..1378827 100644 --- a/basicsuite/mediaplayer/ParameterPanel.qml +++ b/basicsuite/mediaplayer/ParameterPanel.qml @@ -48,11 +48,12 @@ ** ****************************************************************************/ import QtQuick 2.0 +import "settings.js" as Settings Rectangle { id: root height: view.model.count * sliderHeight - color: defaultBackground + color: Settings.backgroundColor property color lineColor: "black" property real spacing: 10 property real sliderHeight: 50 diff --git a/basicsuite/mediaplayer/PlayerSlider.qml b/basicsuite/mediaplayer/PlayerSlider.qml index d569866..ef0556a 100644 --- a/basicsuite/mediaplayer/PlayerSlider.qml +++ b/basicsuite/mediaplayer/PlayerSlider.qml @@ -48,6 +48,7 @@ ** ****************************************************************************/ import QtQuick 2.0 +import "settings.js" as Settings Item { id: slider @@ -81,7 +82,7 @@ Item { width: slider.width anchors.verticalCenter: slider.verticalCenter height: 5 - color: "#9d9faa" + color: "red" //Settings.backgroundColor radius: 2 MouseArea { @@ -119,7 +120,7 @@ Item { anchors.right: handle.right anchors.rightMargin: handle.width / 2 visible: slider.enabled - color: "white" + color: "green" radius: 2 } diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml index 78ba6ec..ca69f69 100644 --- a/basicsuite/mediaplayer/UrlBar.qml +++ b/basicsuite/mediaplayer/UrlBar.qml @@ -49,6 +49,7 @@ ****************************************************************************/ import QtQuick 2.0 import QtQuick.Controls 2.0 +import "settings.js" as Settings Rectangle { id: root @@ -92,7 +93,7 @@ Rectangle { font.family: appFont font.styleName: "Light" background: Rectangle { - color: defaultBackground + color: Settings.backgroundColor opacity: 0.8 border.color: viewSettings.borderColor border.width: 2 diff --git a/basicsuite/mediaplayer/main.qml b/basicsuite/mediaplayer/main.qml index 5f3ff42..66d03a1 100644 --- a/basicsuite/mediaplayer/main.qml +++ b/basicsuite/mediaplayer/main.qml @@ -51,6 +51,7 @@ 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 ba174e3..3578abc 100644 --- a/basicsuite/mediaplayer/mediaplayer.pro +++ b/basicsuite/mediaplayer/mediaplayer.pro @@ -19,7 +19,8 @@ content.files = \ UrlBar.qml \ VolumeControl.qml \ Effects \ - images + images \ + ../shared/settings.js content.path = $$DESTPATH -- cgit v1.2.3