diff options
28 files changed, 68 insertions, 94 deletions
diff --git a/basicsuite/enterprise-charts/View1.qml b/basicsuite/enterprise-charts/View1.qml index e8c3407..dad431b 100644 --- a/basicsuite/enterprise-charts/View1.qml +++ b/basicsuite/enterprise-charts/View1.qml @@ -52,7 +52,6 @@ import QtQuick 2.0 //![2] import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -66,11 +65,11 @@ Item { anchors.fill: parent PieSeries { id: pieSeries - PieSlice { label: "Volkswagen"; value: 13.5; color: Settings.primaryGreen } - PieSlice { label: "Toyota"; value: 10.9; color: Settings.mediumGreen } - PieSlice { label: "Ford"; value: 8.6; color: Settings.darkGreen } - PieSlice { label: "Skoda"; value: 8.2; color: Settings.primaryGrey } - PieSlice { label: "Volvo"; value: 6.8; color: Settings.secondaryGrey } + PieSlice { label: "Volkswagen"; value: 13.5; color: _primaryGreen } + PieSlice { label: "Toyota"; value: 10.9; color: _mediumGreen } + PieSlice { label: "Ford"; value: 8.6; color: _darkGreen } + PieSlice { label: "Skoda"; value: 8.2; color: _primaryGrey } + PieSlice { label: "Volvo"; value: 6.8; color: _secondaryGrey } } } diff --git a/basicsuite/enterprise-charts/View10.qml b/basicsuite/enterprise-charts/View10.qml index 6bb3eb5..b61236f 100644 --- a/basicsuite/enterprise-charts/View10.qml +++ b/basicsuite/enterprise-charts/View10.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -61,9 +60,9 @@ Item { HorizontalStackedBarSeries { axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: Settings.primaryGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: Settings.primaryGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: Settings.secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + BarSet { label: "Bob"; color: _primaryGreen; values: [2, 2, 3, 4, 5, 6] } + BarSet { label: "Susan"; color: _primaryGrey; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; color: _secondaryGrey; values: [3, 5, 8, 13, 5, 8] } } Component.onCompleted: { axes[0].labelsColor = "white"; diff --git a/basicsuite/enterprise-charts/View11.qml b/basicsuite/enterprise-charts/View11.qml index c884627..319e94a 100644 --- a/basicsuite/enterprise-charts/View11.qml +++ b/basicsuite/enterprise-charts/View11.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -61,9 +60,9 @@ Item { HorizontalPercentBarSeries { axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: Settings.primaryGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: Settings.primaryGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: Settings.secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + BarSet { label: "Bob"; color: _primaryGreen; values: [2, 2, 3, 4, 5, 6] } + BarSet { label: "Susan"; color: _primaryGrey; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; color: _secondaryGrey; values: [3, 5, 8, 13, 5, 8] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/View12.qml b/basicsuite/enterprise-charts/View12.qml index 90cfa8e..bd40cbd 100644 --- a/basicsuite/enterprise-charts/View12.qml +++ b/basicsuite/enterprise-charts/View12.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -65,8 +64,8 @@ Item { size: 0.96 holeSize: 0.7 - PieSlice { id: slice; label: "Alpha"; value: 19511; color: Settings.primaryGreen; borderColor: "#163430" } - PieSlice { label: "Epsilon"; value: 11105; color: Settings.primaryGrey; borderColor: "#3B391C" } + PieSlice { id: slice; label: "Alpha"; value: 19511; color: _primaryGreen; borderColor: "#163430" } + PieSlice { label: "Epsilon"; value: 11105; color: _primaryGrey; borderColor: "#3B391C" } PieSlice { label: "Psi"; value: 9352; color: darkGrey2; borderColor: "#13060C" } } @@ -74,17 +73,17 @@ Item { size: 0.7 id: pieInner holeSize: 0.25 - PieSlice { label: "Materials"; value: 10334; color: Settings.mediumGreen; borderColor: "#163430" } - PieSlice { label: "Employee"; value: 3066; color: Settings.darkGreen; borderColor: "#163430" } - PieSlice { label: "Logistics"; value: 6111; color: Settings.mediumGreen; borderColor: "#163430" } + PieSlice { label: "Materials"; value: 10334; color: _mediumGreen; borderColor: "#163430" } + PieSlice { label: "Employee"; value: 3066; color: _darkGreen; borderColor: "#163430" } + PieSlice { label: "Logistics"; value: 6111; color: _mediumGreen; borderColor: "#163430" } PieSlice { label: "Materials"; value: 7371; color: mediumGrey2; borderColor: "#3B391C" } PieSlice { label: "Employee"; value: 2443; color: mediumGrey; borderColor: "#3B391C" } PieSlice { label: "Logistics"; value: 1291; color: mediumGrey2; borderColor: "#3B391C" } - PieSlice { label: "Materials"; value: 4022; color: Settings.secondaryGrey; borderColor: "#13060C" } + PieSlice { label: "Materials"; value: 4022; color: _secondaryGrey; borderColor: "#13060C" } PieSlice { label: "Employee"; value: 3998; color: darkGrey; borderColor: "#13060C" } - PieSlice { label: "Logistics"; value: 1332; color: Settings.secondaryGrey; borderColor: "#13060C" } + PieSlice { label: "Logistics"; value: 1332; color: _secondaryGrey; borderColor: "#13060C" } } } diff --git a/basicsuite/enterprise-charts/View2.qml b/basicsuite/enterprise-charts/View2.qml index dbf8813..8f201a6 100644 --- a/basicsuite/enterprise-charts/View2.qml +++ b/basicsuite/enterprise-charts/View2.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -60,7 +59,7 @@ Item { anchors.fill: parent LineSeries { name: "LineSeries" - color: Settings.primaryGreen + color: _primaryGreen XYPoint { x: 0; y: 0 } XYPoint { x: 1.1; y: 2.1 } XYPoint { x: 1.9; y: 3.3 } diff --git a/basicsuite/enterprise-charts/View3.qml b/basicsuite/enterprise-charts/View3.qml index a0894fe..3211e9e 100644 --- a/basicsuite/enterprise-charts/View3.qml +++ b/basicsuite/enterprise-charts/View3.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -60,7 +59,7 @@ Item { anchors.fill: parent SplineSeries { name: "SplineSeries" - color: Settings.primaryGreen + color: _primaryGreen XYPoint { x: 0; y: 0.0 } XYPoint { x: 1.1; y: 3.2 } XYPoint { x: 1.9; y: 2.4 } diff --git a/basicsuite/enterprise-charts/View4.qml b/basicsuite/enterprise-charts/View4.qml index 7b0b823..442d231 100644 --- a/basicsuite/enterprise-charts/View4.qml +++ b/basicsuite/enterprise-charts/View4.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -69,7 +68,7 @@ Item { AreaSeries { name: "Russian" color: mediumGrey2 - borderColor: Settings.darkGreen + borderColor: _darkGreen borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { @@ -92,7 +91,7 @@ Item { AreaSeries { name: "Swedish" color: lightGrey - borderColor: Settings.mediumGreen + borderColor: _mediumGreen borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { @@ -113,8 +112,8 @@ Item { AreaSeries { name: "Finnish" - color: Settings.secondaryGrey - borderColor: Settings.primaryGreen + color: _secondaryGrey + borderColor: _primaryGreen borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { diff --git a/basicsuite/enterprise-charts/View5.qml b/basicsuite/enterprise-charts/View5.qml index 9b8ba09..be7794b 100644 --- a/basicsuite/enterprise-charts/View5.qml +++ b/basicsuite/enterprise-charts/View5.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -61,7 +60,7 @@ Item { ScatterSeries { id: scatter1 name: "Scatter1" - color: Settings.primaryGreen + color: _primaryGreen XYPoint { x: 1.5; y: 1.5 } XYPoint { x: 1.5; y: 1.6 } XYPoint { x: 1.57; y: 1.55 } @@ -73,7 +72,7 @@ Item { ScatterSeries { name: "Scatter2" - color: Settings.primaryGrey + color: _primaryGrey //![1] XYPoint { x: 2.0; y: 2.0 } XYPoint { x: 2.0; y: 2.1 } diff --git a/basicsuite/enterprise-charts/View6.qml b/basicsuite/enterprise-charts/View6.qml index b2ee347..a104b8a 100644 --- a/basicsuite/enterprise-charts/View6.qml +++ b/basicsuite/enterprise-charts/View6.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -61,9 +60,9 @@ Item { BarSeries { id: mySeries axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: Settings.primaryGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: Settings.primaryGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: Settings.secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + BarSet { label: "Bob"; color: _primaryGreen; values: [2, 2, 3, 4, 5, 6] } + BarSet { label: "Susan"; color: _primaryGrey; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; color: _secondaryGrey; values: [3, 5, 8, 13, 5, 8] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/View7.qml b/basicsuite/enterprise-charts/View7.qml index afcfd03..78e5350 100644 --- a/basicsuite/enterprise-charts/View7.qml +++ b/basicsuite/enterprise-charts/View7.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -61,9 +60,9 @@ Item { StackedBarSeries { id: mySeries axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: Settings.primaryGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: Settings.primaryGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: Settings.secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + BarSet { label: "Bob"; color: _primaryGreen; values: [2, 2, 3, 4, 5, 6] } + BarSet { label: "Susan"; color: _primaryGrey; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; color: _secondaryGrey; values: [3, 5, 8, 13, 5, 8] } } Component.onCompleted: { axes[0].labelsColor = "white"; diff --git a/basicsuite/enterprise-charts/View8.qml b/basicsuite/enterprise-charts/View8.qml index 81fc60a..803b6cd 100644 --- a/basicsuite/enterprise-charts/View8.qml +++ b/basicsuite/enterprise-charts/View8.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -60,9 +59,9 @@ Item { anchors.fill: parent PercentBarSeries { axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: Settings.primaryGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: Settings.primaryGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: Settings.secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + BarSet { label: "Bob"; color: _primaryGreen; values: [2, 2, 3, 4, 5, 6] } + BarSet { label: "Susan"; color: _primaryGrey; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; color: _secondaryGrey; values: [3, 5, 8, 13, 5, 8] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/View9.qml b/basicsuite/enterprise-charts/View9.qml index ab68c5c..a85711e 100644 --- a/basicsuite/enterprise-charts/View9.qml +++ b/basicsuite/enterprise-charts/View9.qml @@ -50,7 +50,6 @@ import QtQuick 2.0 import QtCharts 2.0 -import "settings.js" as Settings Item { anchors.fill: parent @@ -60,9 +59,9 @@ Item { anchors.fill: parent HorizontalBarSeries { axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: Settings.primaryGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: Settings.primaryGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: Settings.secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + BarSet { label: "Bob"; color: _primaryGreen; values: [2, 2, 3, 4, 5, 6] } + BarSet { label: "Susan"; color: _primaryGrey; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; color: _secondaryGrey; values: [3, 5, 8, 13, 5, 8] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/enterprise-charts.pro b/basicsuite/enterprise-charts/enterprise-charts.pro index cef306b..b71e6eb 100644 --- a/basicsuite/enterprise-charts/enterprise-charts.pro +++ b/basicsuite/enterprise-charts/enterprise-charts.pro @@ -19,7 +19,6 @@ content.files = \ View7.qml \ View8.qml \ View9.qml \ - ../shared/settings.js content.path = $$DESTPATH diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index 03b822e..5fadbbd 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -51,13 +51,12 @@ //![1] import QtQuick 2.0 //![1] -import "settings.js" as Settings Rectangle { width: 600 height: 400 property bool sourceLoaded: false - color: Settings.backgroundColor + color: _backgroundColor property string darkGrey: "#222840" property string darkGrey2: "#53586b" diff --git a/basicsuite/graphicaleffects/graphicaleffects.pro b/basicsuite/graphicaleffects/graphicaleffects.pro index 3fe7c51..da9e8a3 100644 --- a/basicsuite/graphicaleffects/graphicaleffects.pro +++ b/basicsuite/graphicaleffects/graphicaleffects.pro @@ -18,7 +18,6 @@ content.files = \ effect_ThresholdMask.qml \ main.qml \ images \ - ../shared/settings.js content.path = $$DESTPATH diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml index 9da3676..4eb694d 100644 --- a/basicsuite/graphicaleffects/main.qml +++ b/basicsuite/graphicaleffects/main.qml @@ -48,7 +48,6 @@ ** ****************************************************************************/ import QtQuick 2.0 -import "settings.js" as Settings Item { id: root @@ -74,7 +73,7 @@ Item { anchors.right: checkers.left anchors.top: parent.top anchors.bottom: parent.bottom - color: Settings.backgroundColor + color: _backgroundColor } ListModel { @@ -121,7 +120,7 @@ Item { property bool isSelected: list.currentIndex == index Text { - color: parent.isSelected ? Settings.primaryGreen : "white" + color: parent.isSelected ? _primaryGreen : "white" font.pixelSize: parent.height * 0.625 font.family: appFont font.styleName: parent.isSelected ? "Bold" : "Regular" @@ -159,7 +158,7 @@ Item { var margin = canvas.padding; var segmentSize = 4 - ctx.strokeStyle = Settings.primaryGrey + ctx.strokeStyle = _primaryGrey ctx.beginPath(); ctx.moveTo(margin, margin); ctx.lineTo(margin, h-margin); @@ -179,7 +178,7 @@ Item { } Rectangle { - color: Settings.primaryGreen + color: _primaryGreen width: parent.width / 20 height: width radius: width / 2 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 |