diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-08 01:05:53 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-08 01:05:53 (GMT) |
| commit | 4981d87a31090682acb28dccc7f6672f8e32ca61 (patch) | |
| tree | 097e979a106161f0943a01ab34fdfdd905d972d3 /demos | |
| parent | 6b1da53ad4ee4fa9bd60c8c039ba18d386c5e1ad (diff) | |
| parent | bc20e3e0325f0f3395a6a2012cd263a724576ba1 (diff) | |
| download | Qt-4981d87a31090682acb28dccc7f6672f8e32ca61.zip Qt-4981d87a31090682acb28dccc7f6672f8e32ca61.tar.gz Qt-4981d87a31090682acb28dccc7f6672f8e32ca61.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/ImageDetails.qml | 5 | ||||
| -rw-r--r-- | demos/declarative/flickr/content/Slider.qml | 1 | ||||
| -rw-r--r-- | demos/declarative/flickr/flickr.qml | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 6c354f6..8677efc 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -3,6 +3,7 @@ Flipable { property var frontContainer: ContainerFront property var flickableArea: Flickable + property var slider: Slider property string photoTitle: "" property string photoDescription: "" property string photoTags: "" @@ -42,7 +43,7 @@ Flipable { LikeOMeter { x: 40; y: 250; rating: Container.rating } - Flickable { id: Flickable; x: 220; width: 480; height: 230; y: 120; clip: true + Flickable { id: Flickable; x: 220; width: 480; height: 210; y: 130; clip: true viewportWidth: 480; viewportHeight: DescriptionText.height WebView { id: DescriptionText; width: parent.width @@ -96,7 +97,7 @@ Flipable { anchors.centeredIn: parent; color: "white"; font.bold: true } - Slider { id: Slider; x: 25; y: 374; imageWidth: Container.photoWidth; imageHeight: Container.photoHeight } + Slider { id: Slider; x: 25; y: 374; visible: BigImage.status == 0; imageWidth: Container.photoWidth; imageHeight: Container.photoHeight } } states: [ diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml index ba9d842..c6a3e5e 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/demos/declarative/flickr/content/Slider.qml @@ -3,6 +3,7 @@ Item { property var value: Handle.x / Slider.xMax property int xMax: Slider.width - Handle.width - 2 + property var handle: Handle property int imageWidth property int imageHeight diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 85af8e3..dc150cb 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -58,6 +58,7 @@ Item { ImageDetails.photoDate = photoDate; ImageDetails.photoUrl = url; ImageDetails.rating = 0; + ImageDetails.slider.handle.x = ImageDetails.slider.xMax; Wrapper.state = "Details"; } } @@ -121,7 +122,7 @@ Item { Image { source: "content/pics/background.png"; opaque: true } GridView { - id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate + id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate; cacheBuffer: 100 cellWidth: 105; cellHeight: 105; x:32; y: 80; width: 800; height: 330; z: 1 } |