diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 23:31:27 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 23:31:27 (GMT) |
commit | ad269e8e6f85a99c48180f6b9e9b51891accfc45 (patch) | |
tree | 6ea7bfa8725707c0e7f9b330ef2e6aae3cb97c58 /demos | |
parent | fb2e33b21557412ae7bde009662ca89870407f5f (diff) | |
parent | 0a13be045b7e7fdf2b4d1a44b7aba72711375787 (diff) | |
download | Qt-ad269e8e6f85a99c48180f6b9e9b51891accfc45.zip Qt-ad269e8e6f85a99c48180f6b9e9b51891accfc45.tar.gz Qt-ad269e8e6f85a99c48180f6b9e9b51891accfc45.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
-rw-r--r-- | demos/declarative/flickr/content/Progress.qml | 14 | ||||
-rw-r--r-- | demos/declarative/flickr/content/Slider.qml | 15 |
2 files changed, 22 insertions, 7 deletions
diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml index aa2a2e6..743c45e 100644 --- a/demos/declarative/flickr/content/Progress.qml +++ b/demos/declarative/flickr/content/Progress.qml @@ -4,8 +4,12 @@ Item { property var progress: 0 Rect { - id: Container; anchors.fill: parent; gradientColor: "#66000000"; - pen.color: "white"; pen.width: 0; color: "#66343434"; radius: height/2 - 2 + id: Container; anchors.fill: parent + pen.color: "white"; pen.width: 0; radius: height/2 - 2 + gradient: Gradient { + GradientStop { position: 0; color: "#66343434" } + GradientStop { position: 1.0; color: "#66000000" } + } } Rect { @@ -13,7 +17,11 @@ Item { y: 2; height: parent.height-4; x: 2; width: Math.max(parent.width * progress - 4, 0); opacity: width < 1 ? 0 : 1 - color: "lightsteelblue"; gradientColor: "steelblue"; radius: height/2 - 2 + gradient: Gradient { + GradientStop { position: 0; color: "lightsteelblue" } + GradientStop { position: 1.0; color: "steelblue" } + } + radius: height/2 - 2 } Text { diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml index aae4631..931dfe3 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/demos/declarative/flickr/content/Slider.qml @@ -9,14 +9,21 @@ Item { property int xMax: Slider.width - Handle.width - 4 Rect { - id: Container; anchors.fill: parent; gradientColor: "#66000000"; - pen.color: "white"; pen.width: 0; color: "#66343434"; radius: 8 + id: Container; anchors.fill: parent + pen.color: "white"; pen.width: 0; radius: 8 + gradient: Gradient { + GradientStop { position: 0.0; color: "#66343434" } + GradientStop { position: 1.0; color: "#66000000" } + } } Rect { id: Handle - x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4 - color: "lightgray"; gradientColor: "gray"; radius: 6 + x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4; radius: 6 + gradient: Gradient { + GradientStop { position: 0.0; color: "lightgray" } + GradientStop { position: 1.0; color: "gray" } + } MouseRegion { anchors.fill: parent; drag.target: parent |