diff options
author | Juho Annunen <juho.annunen@qt.io> | 2018-04-17 15:02:13 +0300 |
---|---|---|
committer | Juho Annunen <juho.annunen@qt.io> | 2018-05-04 10:02:42 +0000 |
commit | 04e4798de567c64a08e962f541b5dd35d60fedd3 (patch) | |
tree | bbcfbc6f8c6bbc5be45c72b2e869c84fa588e478 /basicsuite/mediaplayer/EffectSelectionPanel.qml | |
parent | 2e8942fe7661ba75da5c45d214d2efd6212910c8 (diff) |
Update Mediaplayer demo to new UI theme
Task-number: QTBUG-62791
Change-Id: Id7cb520669fc696cec65da591414b045fe45754a
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite/mediaplayer/EffectSelectionPanel.qml')
-rw-r--r--[-rwxr-xr-x] | basicsuite/mediaplayer/EffectSelectionPanel.qml | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/basicsuite/mediaplayer/EffectSelectionPanel.qml b/basicsuite/mediaplayer/EffectSelectionPanel.qml index 4f29f50..68a9cac 100755..100644 --- a/basicsuite/mediaplayer/EffectSelectionPanel.qml +++ b/basicsuite/mediaplayer/EffectSelectionPanel.qml @@ -51,7 +51,7 @@ import QtQuick 2.0 Rectangle { id: root - color: "#BB333333" + color: defaultBackground height: 78 property int itemHeight: 25 property string effectSource: "" @@ -76,14 +76,14 @@ Rectangle { ListElement { name: "Glow"; source: "Effects/EffectGlow.qml" } ListElement { name: "Isolate"; source: "Effects/EffectIsolate.qml" } //ListElement { name: "Magnify"; source: "Effects/EffectMagnify.qml" } -// ListElement { name: "Page curl"; source: "Effects/EffectPageCurl.qml" } + // ListElement { name: "Page curl"; source: "Effects/EffectPageCurl.qml" } ListElement { name: "Pixelate"; source: "Effects/EffectPixelate.qml" } ListElement { name: "Posterize"; source: "Effects/EffectPosterize.qml" } -// ListElement { name: "Ripple"; source: "Effects/EffectRipple.qml" } + // ListElement { name: "Ripple"; source: "Effects/EffectRipple.qml" } ListElement { name: "Sepia"; source: "Effects/EffectSepia.qml" } ListElement { name: "Sharpen"; source: "Effects/EffectSharpen.qml" } ListElement { name: "Shockwave"; source: "Effects/EffectShockwave.qml" } -// ListElement { name: "Tilt shift"; source: "Effects/EffectTiltShift.qml" } + // ListElement { name: "Tilt shift"; source: "Effects/EffectTiltShift.qml" } ListElement { name: "Toon"; source: "Effects/EffectToon.qml" } ListElement { name: "Warhol"; source: "Effects/EffectWarhol.qml" } ListElement { name: "Wobble"; source: "Effects/EffectWobble.qml" } @@ -104,6 +104,7 @@ Rectangle { height: 0.8 * itemHeight text: name color: "white" + font.family: appFont } states: [ @@ -155,16 +156,18 @@ Rectangle { delegate: Item { height: 40 width: parent.width - Rectangle { + property bool isSelected: list.currentIndex == index + Text { + color: parent.isSelected ? defaultGreen : "white" + text: name + anchors.centerIn: parent + font.pixelSize: 20 + font.family: appFont + font.styleName: parent.isSelected ? "Bold" : "Regular" + } + MouseArea { anchors.fill: parent - border.color: index == list.currentIndex ? "#44ffffff" : "transparent" - color: index == list.currentIndex ? "#22ffffff" : "transparent" - radius: 3 - Text { color: "white" ; text: name ; anchors.centerIn: parent; font.pixelSize: 20 } - MouseArea { - anchors.fill: parent - onClicked: list.currentIndex = index - } + onClicked: list.currentIndex = index } } } |