camera-app

Merge lp://staging/~uriboni/camera-app/broken-video-icon into lp://staging/camera-app/staging

  1. broken-video-icon
  2. Merge into staging
Proposed by Ugo Riboni
Status: Merged
Approved by: Florian Boucault
Approved revision: 665
Merged at revision: 664
Proposed branch: lp://staging/~uriboni/camera-app/broken-video-icon
Merge into: lp://staging/camera-app/staging
Diff against target: 153 lines (+76/-12)
5 files modified
PhotogridView.qml (+10/-0)
SlideshowView.qml (+11/-0)
tests/autopilot/camera_app/emulators/main_window.py (+5/-0)
tests/autopilot/camera_app/tests/__init__.py (+8/-3)
tests/autopilot/camera_app/tests/test_gallery_view.py (+42/-9)
To merge this branch: bzr merge lp://staging/~uriboni/camera-app/broken-video-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Florian Boucault (community) Needs Fixing
Review via email: mp+287795@code.staging.launchpad.net

Commit message

Display a stock icon as the video thumbnail when thumbnailer fails (which it will do now if it can't process a video)

Description of the change

Display a stock icon as the video thumbnail when thumbnailer fails (which it will do now if it can't process a video)

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

FAILED: Continuous integration, rev:662
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/44/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/421
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1020
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27961

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/44/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

Grid view also needs an icon.

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

Icon needs to be a fixed size

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

opacity should not be 0.8

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

 enabled: !media.isVideo should not be part of this MR, but I guess it will fly

lp://staging/~uriboni/camera-app/broken-video-icon updated
663. By Ugo Riboni

Adjust size and opacity, and make sure the icon appears also in case images have broken thumbnails

664. By Ugo Riboni

Add the same feature to the grid view

665. By Ugo Riboni

Rename the icon so it's clear it's not just for videos

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/46/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/423
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1022
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27971

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/46/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches