Merge lp:~artmello/gallery-app/gallery-app-thumbnail_update_after_editing into lp:gallery-app

Proposed by Arthur Mello
Status: Merged
Approved by: Bill Filler
Approved revision: 1181
Merged at revision: 1182
Proposed branch: lp:~artmello/gallery-app/gallery-app-thumbnail_update_after_editing
Merge into: lp:gallery-app
Diff against target: 38 lines (+3/-3)
3 files modified
rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml (+1/-1)
rc/qml/Components/MediaGrid.qml (+1/-1)
rc/qml/OrganicView/OrganicMediaList.qml (+1/-1)
To merge this branch: bzr merge lp:~artmello/gallery-app/gallery-app-thumbnail_update_after_editing
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+254472@code.launchpad.net

Commit message

Add the "at" param to the calls of thumbnailer image provider to make sure the images will be updated after the user edit them

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1181
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~artmello/gallery-app/gallery-app-thumbnail_update_after_editing/+merge/254472/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/64
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/196
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/760/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/472
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19263
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/612/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/903
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/903/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1136/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml'
2--- rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml 2014-11-30 19:06:57 +0000
3+++ rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml 2015-03-27 23:19:03 +0000
4@@ -44,7 +44,7 @@
5 anchors.fill: parent
6 asynchronous: true
7 visible: fullImage.opacity < 1
8- source: load && mediaSource ? "image://thumbnailer/" + mediaSource.path : ""
9+ source: load && mediaSource ? "image://thumbnailer/" + mediaSource.path + "?at=" + Date.now() : ""
10 fillMode: fullImage.fillMode
11 sourceSize.width: 256
12
13
14=== modified file 'rc/qml/Components/MediaGrid.qml'
15--- rc/qml/Components/MediaGrid.qml 2015-02-20 13:39:38 +0000
16+++ rc/qml/Components/MediaGrid.qml 2015-03-27 23:19:03 +0000
17@@ -83,7 +83,7 @@
18
19 image: Image {
20 id: thumbImage
21- source: "image://thumbnailer/" + mediaSource.path
22+ source: "image://thumbnailer/" + mediaSource.path + "?at=" + Date.now()
23 asynchronous: true
24 fillMode: Image.PreserveAspectCrop
25
26
27=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
28--- rc/qml/OrganicView/OrganicMediaList.qml 2015-02-20 13:39:38 +0000
29+++ rc/qml/OrganicView/OrganicMediaList.qml 2015-03-27 23:19:03 +0000
30@@ -170,7 +170,7 @@
31
32 image: Image {
33 id: thumbImage
34- source: "image://thumbnailer/" + model.mediaSource.path
35+ source: "image://thumbnailer/" + model.mediaSource.path + "?at=" + Date.now()
36 asynchronous: true
37
38 /* The SDK thumbnailer respects the freedesktop.org standard and uses 128 for the small

Subscribers

People subscribed via source and target branches