diff options
Diffstat (limited to 'basicsuite/enterprise-charts')
-rw-r--r-- | basicsuite/enterprise-charts/View1.qml | 11 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View10.qml | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View11.qml | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View12.qml | 15 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View2.qml | 3 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View3.qml | 3 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View4.qml | 9 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View5.qml | 5 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View6.qml | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View7.qml | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View8.qml | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/View9.qml | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/enterprise-charts.pro | 3 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/main.qml | 3 |
14 files changed, 54 insertions, 40 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" |