diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-04-23 15:17:33 +0300 |
|---|---|---|
| committer | Juho Annunen <juho.annunen@qt.io> | 2018-05-07 09:31:23 +0000 |
| commit | da6035233fc3bcfbc4a3d65075ee4099349c09d0 (patch) | |
| tree | 0419ef297d5fe3c91e216c765efb6525802be845 /basicsuite/graphicaleffects | |
| parent | e513aed3b9cb8ff3124c21ed01e45128fa686eee (diff) | |
Move common definitions to shared settings
Task-number: QTBUG-65302
Change-Id: I2153e2f2b4aa295e87098256354ed034480294df
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite/graphicaleffects')
| -rw-r--r-- | basicsuite/graphicaleffects/graphicaleffects.pro | 3 | ||||
| -rw-r--r-- | basicsuite/graphicaleffects/main.qml | 9 |
2 files changed, 7 insertions, 5 deletions
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 |