aboutsummaryrefslogtreecommitdiffstats
path: root/examples/demos
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-06-19 15:00:59 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-24 07:53:05 +0200
commitc315908dc4331ee5f47012865842352ea0dd6ca4 (patch)
tree71534ada564f550e06ae460d65fc34f217db24e9 /examples/demos
parent5743516cfa40d53d716a7033734bde906bb3984c (diff)
TweetSearch Stylistic Tweaks
Includes upgrading the bird sprite to stochastic behavior Change-Id: I6357f6a47ded0a18ad0746c3eef590ee9092db52 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'examples/demos')
-rw-r--r--examples/demos/tweetsearch/content/FlipBar.qml5
-rw-r--r--examples/demos/tweetsearch/content/ListFooter.qml36
-rw-r--r--examples/demos/tweetsearch/content/ListHeader.qml8
-rw-r--r--examples/demos/tweetsearch/content/resources/bird-anim-sprites.pngbin11086 -> 11079 bytes
-rw-r--r--examples/demos/tweetsearch/tweetsearch.qml1
5 files changed, 35 insertions, 15 deletions
diff --git a/examples/demos/tweetsearch/content/FlipBar.qml b/examples/demos/tweetsearch/content/FlipBar.qml
index 65c2a3dc6b..1d66a49cd6 100644
--- a/examples/demos/tweetsearch/content/FlipBar.qml
+++ b/examples/demos/tweetsearch/content/FlipBar.qml
@@ -75,11 +75,6 @@ Item {
front.visible = frontShown
}
- Rectangle {
- anchors.fill: parent
- color: "white"
- }
-
function flipUp(start) {
effect.visible = true;
effect.sourceA = effect.source1
diff --git a/examples/demos/tweetsearch/content/ListFooter.qml b/examples/demos/tweetsearch/content/ListFooter.qml
index 685acba7d5..239e799ef0 100644
--- a/examples/demos/tweetsearch/content/ListFooter.qml
+++ b/examples/demos/tweetsearch/content/ListFooter.qml
@@ -114,17 +114,41 @@ Rectangle {
}
}
- AnimatedSprite {
+ SpriteSequence {
id: sprite
anchors.horizontalCenter: parent.horizontalCenter
width: 320
height: 300
- source: "resources/bird-anim-sprites.png"
- frameCount: 6
- frameRate: 3
- frameWidth: 320
- frameHeight: 360
running: true
+ interpolate: false
+ Sprite {
+ name: "bird"
+ source: "resources/bird-anim-sprites.png"
+ frameCount: 1
+ frameRate: 1
+ frameWidth: 320
+ frameHeight: 300
+ to: { "bird":10, "trill":1, "blink":1 }
+ }
+ Sprite {
+ name: "trill"
+ source: "resources/bird-anim-sprites.png"
+ frameCount: 5
+ frameRate: 3
+ frameWidth: 320
+ frameHeight: 300
+ to: {"bird":1}
+ }
+ Sprite {
+ name: "blink"
+ source: "resources/bird-anim-sprites.png"
+ frameCount: 1
+ frameRate: 3
+ frameWidth: 320
+ frameHeight: 300
+ frameX: 1600
+ to: {"bird":1}
+ }
}
}
}
diff --git a/examples/demos/tweetsearch/content/ListHeader.qml b/examples/demos/tweetsearch/content/ListHeader.qml
index fbb1765f59..1a967d8266 100644
--- a/examples/demos/tweetsearch/content/ListHeader.qml
+++ b/examples/demos/tweetsearch/content/ListHeader.qml
@@ -61,9 +61,9 @@ Item {
Text {
id: label
anchors.verticalCenter: arrow.verticalCenter
- text: "Pull to refresh"
- font.pixelSize: 20
- color: "#c1c1c1"
+ text: "Pull to refresh... "
+ font.pixelSize: 18
+ color: "#999999"
}
}
@@ -74,7 +74,7 @@ Item {
},
State {
name: "pulled"; when: mainListView.contentY < -120
- PropertyChanges { target: label; text: "Release to refresh" }
+ PropertyChanges { target: label; text: "Release to refresh..." }
PropertyChanges { target: arrow; rotation: 0 }
}
]
diff --git a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png b/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png
index 07ed9044f0..4e8d7e6116 100644
--- a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png
+++ b/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png
Binary files differ
diff --git a/examples/demos/tweetsearch/tweetsearch.qml b/examples/demos/tweetsearch/tweetsearch.qml
index 38de10c97f..f853806244 100644
--- a/examples/demos/tweetsearch/tweetsearch.qml
+++ b/examples/demos/tweetsearch/tweetsearch.qml
@@ -45,6 +45,7 @@ Rectangle {
id: main
width: 320
height: 480
+ color: "#d6d6d6"
property string searchTerms: ""
property int inAnimDur: 250