diff options
author | Juho Annunen <juho.annunen@qt.io> | 2018-07-30 11:27:56 +0300 |
---|---|---|
committer | Juho Annunen <juho.annunen@qt.io> | 2018-08-02 09:21:50 +0000 |
commit | 4aa85d783e7e3e729ee4a4d772869236bf60d326 (patch) | |
tree | 022bd4a4dd533010e1720c1bbc26f6feb7a75eb2 /basicsuite/enterprise-charts/View12.qml | |
parent | a60eb6782491ca42dd9139ad0a14866cdf064d40 (diff) |
Use QSettings for color definitions
Task-number: QTBUG-69536
Change-Id: I4c1fa7758db6f593dd38050a75d276fcc85346ac
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite/enterprise-charts/View12.qml')
-rw-r--r-- | basicsuite/enterprise-charts/View12.qml | 15 |
1 files changed, 7 insertions, 8 deletions
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" } } } |