diff options
32 files changed, 152 insertions, 76 deletions
diff --git a/basicsuite/enterprise-charts/View1.qml b/basicsuite/enterprise-charts/View1.qml index f85a18e..e8c3407 100644 --- a/basicsuite/enterprise-charts/View1.qml +++ b/basicsuite/enterprise-charts/View1.qml @@ -52,6 +52,7 @@ import QtQuick 2.0 //![2] import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -65,11 +66,11 @@ Item { anchors.fill: parent PieSeries { id: pieSeries - PieSlice { label: "Volkswagen"; value: 13.5; color: defaultGreen } - PieSlice { label: "Toyota"; value: 10.9; color: mediumGreen } - PieSlice { label: "Ford"; value: 8.6; color: darkGreen } - PieSlice { label: "Skoda"; value: 8.2; color: defaultGrey } - PieSlice { label: "Volvo"; value: 6.8; color: secondaryGrey } + 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 } } } diff --git a/basicsuite/enterprise-charts/View10.qml b/basicsuite/enterprise-charts/View10.qml index 79ca4ab..6bb3eb5 100644 --- a/basicsuite/enterprise-charts/View10.qml +++ b/basicsuite/enterprise-charts/View10.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -60,9 +61,9 @@ Item { HorizontalStackedBarSeries { axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: defaultGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: defaultGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + 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] } } Component.onCompleted: { axes[0].labelsColor = "white"; diff --git a/basicsuite/enterprise-charts/View11.qml b/basicsuite/enterprise-charts/View11.qml index dd81733..c884627 100644 --- a/basicsuite/enterprise-charts/View11.qml +++ b/basicsuite/enterprise-charts/View11.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -60,9 +61,9 @@ Item { HorizontalPercentBarSeries { axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: defaultGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: defaultGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + 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] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/View12.qml b/basicsuite/enterprise-charts/View12.qml index 588ec4b..90cfa8e 100644 --- a/basicsuite/enterprise-charts/View12.qml +++ b/basicsuite/enterprise-charts/View12.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -64,8 +65,8 @@ Item { size: 0.96 holeSize: 0.7 - PieSlice { id: slice; label: "Alpha"; value: 19511; color: defaultGreen; borderColor: "#163430" } - PieSlice { label: "Epsilon"; value: 11105; color: defaultGrey; borderColor: "#3B391C" } + PieSlice { id: slice; label: "Alpha"; value: 19511; color: Settings.primaryGreen; borderColor: "#163430" } + PieSlice { label: "Epsilon"; value: 11105; color: Settings.primaryGrey; borderColor: "#3B391C" } PieSlice { label: "Psi"; value: 9352; color: darkGrey2; borderColor: "#13060C" } } @@ -73,17 +74,17 @@ Item { size: 0.7 id: pieInner holeSize: 0.25 - 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: 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: 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: secondaryGrey; borderColor: "#13060C" } + PieSlice { label: "Materials"; value: 4022; color: Settings.secondaryGrey; borderColor: "#13060C" } PieSlice { label: "Employee"; value: 3998; color: darkGrey; borderColor: "#13060C" } - PieSlice { label: "Logistics"; value: 1332; color: secondaryGrey; borderColor: "#13060C" } + PieSlice { label: "Logistics"; value: 1332; color: Settings.secondaryGrey; borderColor: "#13060C" } } } diff --git a/basicsuite/enterprise-charts/View2.qml b/basicsuite/enterprise-charts/View2.qml index 504e6a1..dbf8813 100644 --- a/basicsuite/enterprise-charts/View2.qml +++ b/basicsuite/enterprise-charts/View2.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -59,7 +60,7 @@ Item { anchors.fill: parent LineSeries { name: "LineSeries" - color: defaultGreen + color: Settings.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 8c4e862..a0894fe 100644 --- a/basicsuite/enterprise-charts/View3.qml +++ b/basicsuite/enterprise-charts/View3.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -59,7 +60,7 @@ Item { anchors.fill: parent SplineSeries { name: "SplineSeries" - color: defaultGreen + color: Settings.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 606029a..7b0b823 100644 --- a/basicsuite/enterprise-charts/View4.qml +++ b/basicsuite/enterprise-charts/View4.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -68,7 +69,7 @@ Item { AreaSeries { name: "Russian" color: mediumGrey2 - borderColor: darkGreen + borderColor: Settings.darkGreen borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { @@ -91,7 +92,7 @@ Item { AreaSeries { name: "Swedish" color: lightGrey - borderColor: mediumGreen + borderColor: Settings.mediumGreen borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { @@ -112,8 +113,8 @@ Item { AreaSeries { name: "Finnish" - color: secondaryGrey - borderColor: defaultGreen + color: Settings.secondaryGrey + borderColor: Settings.primaryGreen borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { diff --git a/basicsuite/enterprise-charts/View5.qml b/basicsuite/enterprise-charts/View5.qml index 17e9b2f..9b8ba09 100644 --- a/basicsuite/enterprise-charts/View5.qml +++ b/basicsuite/enterprise-charts/View5.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -60,7 +61,7 @@ Item { ScatterSeries { id: scatter1 name: "Scatter1" - color: defaultGreen + color: Settings.primaryGreen XYPoint { x: 1.5; y: 1.5 } XYPoint { x: 1.5; y: 1.6 } XYPoint { x: 1.57; y: 1.55 } @@ -72,7 +73,7 @@ Item { ScatterSeries { name: "Scatter2" - color: defaultGrey + color: Settings.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 23d4b70..b2ee347 100644 --- a/basicsuite/enterprise-charts/View6.qml +++ b/basicsuite/enterprise-charts/View6.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -60,9 +61,9 @@ Item { BarSeries { id: mySeries axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: defaultGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: defaultGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + 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] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/View7.qml b/basicsuite/enterprise-charts/View7.qml index 5b5426c..afcfd03 100644 --- a/basicsuite/enterprise-charts/View7.qml +++ b/basicsuite/enterprise-charts/View7.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -60,9 +61,9 @@ Item { StackedBarSeries { id: mySeries axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: defaultGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: defaultGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + 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] } } Component.onCompleted: { axes[0].labelsColor = "white"; diff --git a/basicsuite/enterprise-charts/View8.qml b/basicsuite/enterprise-charts/View8.qml index ff7bed7..81fc60a 100644 --- a/basicsuite/enterprise-charts/View8.qml +++ b/basicsuite/enterprise-charts/View8.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -59,9 +60,9 @@ Item { anchors.fill: parent PercentBarSeries { axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: defaultGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: defaultGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + 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] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/View9.qml b/basicsuite/enterprise-charts/View9.qml index 89a20b6..ab68c5c 100644 --- a/basicsuite/enterprise-charts/View9.qml +++ b/basicsuite/enterprise-charts/View9.qml @@ -50,6 +50,7 @@ import QtQuick 2.0 import QtCharts 2.0 +import "settings.js" as Settings Item { anchors.fill: parent @@ -59,9 +60,9 @@ Item { anchors.fill: parent HorizontalBarSeries { axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; color: defaultGreen; values: [2, 2, 3, 4, 5, 6] } - BarSet { label: "Susan"; color: defaultGrey; values: [5, 1, 2, 4, 1, 7] } - BarSet { label: "James"; color: secondaryGrey; values: [3, 5, 8, 13, 5, 8] } + 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] } } Component.onCompleted: { diff --git a/basicsuite/enterprise-charts/enterprise-charts.pro b/basicsuite/enterprise-charts/enterprise-charts.pro index 803feb0..cef306b 100644 --- a/basicsuite/enterprise-charts/enterprise-charts.pro +++ b/basicsuite/enterprise-charts/enterprise-charts.pro @@ -18,7 +18,8 @@ content.files = \ View6.qml \ View7.qml \ View8.qml \ - View9.qml + View9.qml \ + ../shared/settings.js content.path = $$DESTPATH diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index 6c16b82..03b822e 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -51,12 +51,13 @@ //![1] import QtQuick 2.0 //![1] +import "settings.js" as Settings Rectangle { width: 600 height: 400 property bool sourceLoaded: false - color: defaultBackground + color: Settings.backgroundColor property string darkGrey: "#222840" property string darkGrey2: "#53586b" diff --git a/basicsuite/graphicaleffects/graphicaleffects.pro b/basicsuite/graphicaleffects/graphicaleffects.pro index 2c51fe7..3fe7c51 100644 --- a/basicsuite/graphicaleffects/graphicaleffects.pro +++ b/basicsuite/graphicaleffects/graphicaleffects.pro @@ -17,7 +17,8 @@ content.files = \ effect_OpacityMask.qml \ effect_ThresholdMask.qml \ main.qml \ - images + images \ + ../shared/settings.js content.path = $$DESTPATH diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml index a1ee5e8..9da3676 100644 --- a/basicsuite/graphicaleffects/main.qml +++ b/basicsuite/graphicaleffects/main.qml @@ -48,6 +48,7 @@ ** ****************************************************************************/ import QtQuick 2.0 +import "settings.js" as Settings Item { id: root @@ -73,7 +74,7 @@ Item { anchors.right: checkers.left anchors.top: parent.top anchors.bottom: parent.bottom - color: defaultBackground + color: Settings.backgroundColor } ListModel { @@ -120,7 +121,7 @@ Item { property bool isSelected: list.currentIndex == index Text { - color: parent.isSelected ? defaultGreen : "white" + color: parent.isSelected ? Settings.primaryGreen : "white" font.pixelSize: parent.height * 0.625 font.family: appFont font.styleName: parent.isSelected ? "Bold" : "Regular" @@ -158,7 +159,7 @@ Item { var margin = canvas.padding; var segmentSize = 4 - ctx.strokeStyle = defaultGrey + ctx.strokeStyle = Settings.primaryGrey ctx.beginPath(); ctx.moveTo(margin, margin); ctx.lineTo(margin, h-margin); @@ -178,7 +179,7 @@ Item { } Rectangle { - color: defaultGreen + color: Settings.primaryGreen width: parent.width / 20 height: width radius: width / 2 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 diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml index 91dd074..bb8c231 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml @@ -59,28 +59,22 @@ Item { property int toolBarSize: 80 property string uiColor: settingsView.privateBrowsingEnabled ? "#3a4055" : "#09102b" - //property string uiColor: "#09102b" - //property string uiSeparatorColor: settingsView.privateBrowsingEnabled ? "#717273" : "#7ebee5" property string uiSeparatorColor: "#9d9faa" - //property string toolBarSeparatorColor: settingsView.privateBrowsingEnabled ? "#929495" : "#a3d1ed" property string toolBarSeparatorColor: "#9d9faa" property string toolBarFillColor: settingsView.privateBrowsingEnabled ? "#3a4055" : "#09102b" - //property string toolBarFillColor: "#09102b" - //property string buttonPressedColor: settingsView.privateBrowsingEnabled ? "#3b3c3e" : "#3f91c4" property string buttonPressedColor: "#41cd52" property string emptyBackgroundColor: "#09102b" - //property string uiHighlightColor: "#fddd5c" property string uiHighlightColor: "#41cd52" property string inactivePagerColor: "#bcbdbe" property string textFieldStrokeColor: "#9d9faa" property string placeholderColor: "#a0a1a2" property string iconOverlayColor: "#0e202c" property string iconStrokeColor: "#9d9faa" - property string defaultFontFamily: appFont //"Open Sans" + property string defaultFontFamily: appFont property int gridViewPageItemCount: 8 property int gridViewMaxBookmarks: 3 * gridViewPageItemCount diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml index d73f940..7f8f674 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml @@ -35,6 +35,7 @@ Switch { property alias indicatorWidth: indicatorImg.width property alias indicatorHeight: indicatorImg.height + property string switchTextColor: "#3b4155" indicator: Image { id: indicatorImg @@ -54,7 +55,7 @@ Switch { fontSizeMode: Text.Fit minimumPixelSize: 1 font.pixelSize: parent.height * 0.55 - color: "#3b4155" + color: switchTextColor text: "OFF" font.family: defaultFontFamily } @@ -68,7 +69,7 @@ Switch { fontSizeMode: Text.Fit minimumPixelSize: 1 font.pixelSize: parent.height * 0.55 - color: "#3b4155" + color: switchTextColor text: "ON" font.family: defaultFontFamily } @@ -90,7 +91,7 @@ Switch { anchors.verticalCenter: parent.verticalCenter width: parent.width * 0.475 height: parent.height * 0.9 - fillColor: control.checked ? "#41cd52" : "#9d9faa"//viewSettings.buttonGreenColor : viewSettings.buttonGrayColor + fillColor: control.checked ? buttonPressedColor : toolBarSeparatorColor text: control.checked ? "ON" : "OFF" borderColor: "transparent" Behavior on x { diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml index 678b966..81397fd 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml @@ -73,7 +73,7 @@ Rectangle { } Rectangle{ - color: "#9d9faa" + color: toolBarSeparatorColor height: 2 anchors.top: root.top anchors.right: root.right diff --git a/basicsuite/shared/SharedMain.qml b/basicsuite/shared/SharedMain.qml index d9f38a8..ec6d13b 100644 --- a/basicsuite/shared/SharedMain.qml +++ b/basicsuite/shared/SharedMain.qml @@ -60,15 +60,6 @@ Window { color: "black" - property string defaultGreen: "#41cd52" - property string mediumGreen: "#21be2b" - property string darkGreen: "#17a81a" - - property string defaultBackground: "#09102b" - - property string defaultGrey: "#9d9faa" - property string secondaryGrey: "#3a4055" - Item { id: root anchors.centerIn: window.contentItem diff --git a/basicsuite/shared/settings.js b/basicsuite/shared/settings.js new file mode 100644 index 0000000..8dcc976 --- /dev/null +++ b/basicsuite/shared/settings.js @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +.pragma library + +var backgroundColor = "#09102b" + +var primaryGreen = "#41cd52" +var mediumGreen = "#21be2b" +var darkGreen = "#17a81a" + +var primaryGrey = "#9d9faa" +var secondaryGrey = "#3a4055" + diff --git a/basicsuite/shared/settings.qrc b/basicsuite/shared/settings.qrc new file mode 100644 index 0000000..576a1e9 --- /dev/null +++ b/basicsuite/shared/settings.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>settings.js</file> + </qresource> +</RCC> diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index 05e0ba8..223bb02 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -6,7 +6,7 @@ qtHaveModule(webengine) { QT += webengine } -DESTPATH = /data/user/$$TARGET +DESTPATH = /data/user/qt/$$TARGET target.path = $$DESTPATH SOURCES += $$PWD/main.cpp \ |