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/graphicaleffects | |
| 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/graphicaleffects')
| -rw-r--r-- | basicsuite/graphicaleffects/graphicaleffects.pro | 1 | ||||
| -rw-r--r-- | basicsuite/graphicaleffects/main.qml | 9 |
2 files changed, 4 insertions, 6 deletions
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 |