summaryrefslogtreecommitdiffstats
path: root/demos/declarative/flickr/flickr.qml
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-07 03:45:35 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-07 03:45:35 (GMT)
commitacd9d0a135d054d9766e8c486c276c63c1771104 (patch)
tree8d42e85304feac6470fda18590b3f1f5bbb26a5b /demos/declarative/flickr/flickr.qml
parent1d1acbdf3161bc5d79ddd73704687f1c604c766a (diff)
parent2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20 (diff)
downloadQt-acd9d0a135d054d9766e8c486c276c63c1771104.zip
Qt-acd9d0a135d054d9766e8c486c276c63c1771104.tar.gz
Qt-acd9d0a135d054d9766e8c486c276c63c1771104.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/flickr/flickr.qml')
-rw-r--r--demos/declarative/flickr/flickr.qml13
1 files changed, 9 insertions, 4 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 95c808c..85af8e3 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -8,7 +8,8 @@ Item {
resources: [
XmlListModel {
id: FeedModel
- source: "http://api.flickr.com/services/feeds/photos_public.gne?format=rss2"
+ property string tags : ""
+ source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "")+"format=rss2"
query: "doc($src)/rss/channel/item"
namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"
@@ -16,6 +17,7 @@ Item {
Role { name: "imagePath"; query: "media:thumbnail/@url/string()" }
Role { name: "url"; query: "media:content/@url/string()" }
Role { name: "description"; query: "description/string()"; isCData: true }
+ Role { name: "tags"; query: "media:category/string()" }
Role { name: "photoWidth"; query: "media:content/@width/string()" }
Role { name: "photoHeight"; query: "media:content/@height/string()" }
Role { name: "photoType"; query: "media:content/@type/string()" }
@@ -48,6 +50,7 @@ Item {
ImageDetails.photoTitle = title;
ImageDetails.flickableArea.yPosition = 0;
ImageDetails.photoDescription = description;
+ ImageDetails.photoTags = tags;
ImageDetails.photoWidth = photoWidth;
ImageDetails.photoHeight = photoHeight;
ImageDetails.photoType = photoType;
@@ -148,7 +151,7 @@ Item {
}
PathAttribute { name: "scale"; value: 1 }
- PathAttribute { name: "angle"; value: 45 }
+ PathAttribute { name: "angle"; value: -45 }
}
}
@@ -165,7 +168,7 @@ Item {
text: "Update"
anchors.right: CloseButton.left; anchors.rightMargin: 5
anchors.top: CloseButton.top
- onClicked: { FeedModel.fetch(); }
+ onClicked: { FeedModel.reload(); }
}
states: [
@@ -186,7 +189,9 @@ Item {
}
Text {
- id: CategoryText; anchors.horizontalCenter: parent.horizontalCenter; y: 15; text: "Flickr - Uploads from everyone"
+ id: CategoryText; anchors.horizontalCenter: parent.horizontalCenter; y: 15;
+ text: "Flickr - " +
+ (FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
font.size: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
}
}