Merge into trunk : previewZoomableImageModelChange : Code : Unity 8

Status:	Merged
Approved by:	Michael Zanetti on 2016-04-06
Approved revision:	2324
Merged at revision:	2387
Proposed branch:	lp:~aacid/unity8/previewZoomableImageModelChange
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/previewIconActionsModelChange
Diff against target:	90 lines (+30/-8) 2 files modified qml/Dash/Previews/PreviewZoomableImage.qml (+13/-8) tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml (+17/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/previewZoomableImageModelChange
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-04-04	Approve on 2016-04-06
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-04-04
Review via email: mp+290856@code.launchpad.net

Commit Message

Reload Preview Zoomable Image source if it gets updated

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
Prereq

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-04:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/922/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/previewZoomableImageModelChange updated on 2016-04-04

2324. By Albert Astals Cid on 2016-04-04: Merge lp:~aacid/unity8/previewIconActionsModelChange

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-04:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/924/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-04-06:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?

yes

* Did CI run pass? If not, please explain why.

yes

* Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

 === modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
 --- qml/Dash/Previews/PreviewZoomableImage.qml	2016-01-25 10:05:51 +0000
 +++ qml/Dash/Previews/PreviewZoomableImage.qml	2016-04-04 11:07:49 +0000
@@ -34,6 +34,8 @@
      property Item rootItem: QuickUtils.rootItem(root)
++    readonly property var imageUrl: widgetData["source"] || widgetData["fallback"] || ""
++
      LazyImage {
          id: lazyImage
          objectName: "lazyImage"
@@ -42,7 +44,7 @@
              right: parent.right
+         }
          scaleTo: "width"
--        source: widgetData["source"] || widgetData["fallback"] || ""
++        source: root.imageUrl
          asynchronous: true
          useUbuntuShape: false
          pressed: mouseArea.pressed
@@ -59,11 +61,12 @@
          Connections {
              target: lazyImage.sourceImage
--            // If modelData would change after failing to load it would not be
--            // reloaded since the source binding is destroyed by the source = fallback
--            // But at the moment the model never changes
              onStatusChanged: if (lazyImage.sourceImage.status === Image.Error) lazyImage.sourceImage.source = widgetData["fallback"];
+         }
++        Connections {
++            target: root
++            onImageUrlChanged: lazyImage.sourceImage.source = root.imageUrl;
++        }
          PreviewMediaToolbar {
              id: toolbar
@@ -86,12 +89,14 @@
          delegate: ZoomableImage {
              anchors.fill: parent
--            source: widgetData["source"] || widgetData["fallback"] || ""
++            source: root.imageUrl
              zoomable: widgetData["zoomable"] ? widgetData["zoomable"] : false
--            // If modelData would change after failing to load it would not be
--            // reloaded since the source binding is destroyed by the source = fallback
--            // But at the moment the model never changes
              onStatusChanged: if (status === Image.Error) source = widgetData["fallback"];
++
++            Connections {
++                target: root
++                onImageUrlChanged: source = root.imageUrl;
++            }
+         }
+     }
+ }
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2016-01-08 14:19:08 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2016-04-04 11:07:49 +0000
@@ -44,6 +44,11 @@
          "fallback": "../../graphics/phone_background.jpg"
+     }
++    property var widgetData4: {
++        "source": "fadsasf",
++        "fallback": "../../graphics/phone_background.jpg"
++    }
++
      Loader {
          id: loader
          width: parent.width
@@ -112,5 +117,17 @@
              waitForRendering(lazyImage);
              tryCompare(lazyImage, "state", "ready");
+         }
++
++        function test_fallback_then_source() {
++            zoomableImage.widgetData = widgetData4;
++            waitForRendering(zoomableImage);
++            waitForRendering(lazyImage);
++            tryCompare(lazyImage, "state", "ready");
++            verify(lazyImage.sourceImage.source.toString().indexOf("phone_background") > -1);
++            zoomableImage.widgetData["source"] = "../../graphics/tablet_background.jpg"
++            zoomableImage.widgetDataChanged();
++            tryCompare(lazyImage, "state", "ready");
++            verify(lazyImage.sourceImage.source.toString().indexOf("tablet_background") > -1);
++        }
+     }
+ }

Unity 8

Merge lp:~aacid/unity8/previewZoomableImageModelChange into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers