diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-05-06 04:14:36 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-05-06 04:14:36 (GMT) |
| commit | 2dfa4fbcdc901b8cdd8df0087ecf5e3fa2523603 (patch) | |
| tree | 04970cad9ef9d03658137521b5277b26d9bd2c9a /demos/declarative/flickr | |
| parent | e909d9a200c7a75dc23542f4603ce86fdc135bab (diff) | |
| download | Qt-2dfa4fbcdc901b8cdd8df0087ecf5e3fa2523603.zip Qt-2dfa4fbcdc901b8cdd8df0087ecf5e3fa2523603.tar.gz Qt-2dfa4fbcdc901b8cdd8df0087ecf5e3fa2523603.tar.bz2 | |
More cleanup
Diffstat (limited to 'demos/declarative/flickr')
| -rw-r--r-- | demos/declarative/flickr/mobile/GridDelegate.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/flickr/mobile/ImageDetails.qml | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml index eccdc34..df608bc 100644 --- a/demos/declarative/flickr/mobile/GridDelegate.qml +++ b/demos/declarative/flickr/mobile/GridDelegate.qml @@ -38,7 +38,7 @@ states: [ State { - name: "Show"; when: thumb.status == 1 + name: "Show"; when: thumb.status == Image.Ready PropertyChanges { target: scaleMe; scale: 1 } }, State { diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml index 310c9df..caf1571 100644 --- a/demos/declarative/flickr/mobile/ImageDetails.qml +++ b/demos/declarative/flickr/mobile/ImageDetails.qml @@ -54,7 +54,11 @@ Flipable { Rectangle { anchors.fill: parent; color: "black"; opacity: 0.4 } - Common.Progress { anchors.centerIn: parent; width: 200; height: 18; progress: bigImage.progress; visible: bigImage.status!=1 } + Common.Progress { + anchors.centerIn: parent; width: 200; height: 18 + progress: bigImage.progress; visible: bigImage.status != Image.Ready + } + Flickable { id: flickable; anchors.fill: parent; clip: true contentWidth: imageContainer.width; contentHeight: imageContainer.height @@ -69,7 +73,7 @@ Flipable { anchors.centerIn: parent; smooth: !flickable.moving onStatusChanged : { // Default scale shows the entire image. - if (status == 1 && width != 0) { + if (status == Image.Ready && width != 0) { slider.minimum = Math.min(flickable.width / width, flickable.height / height); prevScale = Math.min(slider.minimum, 1); slider.value = prevScale; @@ -81,12 +85,12 @@ Flipable { Text { text: "Image Unavailable" - visible: bigImage.status == 'Error' + visible: bigImage.status == Image.Error anchors.centerIn: parent; color: "white"; font.bold: true } Common.Slider { - id: slider; visible: { bigImage.status == 1 && maximum > minimum } + id: slider; visible: { bigImage.status == Image.Ready && maximum > minimum } anchors { bottom: parent.bottom; bottomMargin: 65 left: parent.left; leftMargin: 25 |