Use QSettings for color definitions

Task-number: QTBUG-69536
Change-Id: I4c1fa7758db6f593dd38050a75d276fcc85346ac
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

14 files changed, 39 insertions, 53 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"