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

[Arthur Mello]

Add play icon if thumbnail is from video

Add play icon if thumbnail is from video

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:919
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/680/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3632
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3241
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5617
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4427

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

review: Approve (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-overlay_video_icon]

920. By Arthur Mello on 2014-03-03

Remove hardcoded MediaSource type

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:920
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/681/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3633
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3242/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3637
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3244/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5620/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4430

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

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/gallery-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
Yes

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
No packaging change

[Bill Filler (bfiller)]

This was incorporated into https://code.launchpad.net/~bfiller/gallery-app/multiple-bug-fixes/+merge/210013, so rejecting this one

Unmerged revisions

=== modified file 'rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml'
--- rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2013-04-08 14:55:34 +0000
+++ rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2014-03-03 15:49:30 +0000
@@ -18,6 +18,7 @@
  */
 
 import QtQuick 2.0
+import Gallery 1.0
 import "../../../js/Gallery.js" as Gallery
 
 /*!
@@ -62,4 +63,10 @@
             NumberAnimation { duration: Gallery.SNAP_DURATION }
         }
     }
+    Image {
+        // Display a play icon if the thumbnail is from a video
+        source: "../../../img/icon_play.png"
+        anchors.centerIn: parent
+        visible: isLoaded && mediaSource.type === MediaSource.Video
+    }
 }

=== modified file 'rc/qml/Components/MediaGrid.qml'
--- rc/qml/Components/MediaGrid.qml	2013-06-26 08:59:08 +0000
+++ rc/qml/Components/MediaGrid.qml	2014-03-03 15:49:30 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Gallery 1.0
 import "../OrganicView"
 import "../Utility"
 import "../../js/Gallery.js" as Gallery
@@ -84,6 +85,13 @@
                 asynchronous: true
             }
 
+            Image {
+                // Display a play icon if the thumbnail is from a video
+                source: "../../img/icon_play.png"
+                anchors.centerIn: parent
+                visible: mediaSource.type === MediaSource.Video
+            }
+
             OrganicItemInteraction {
                 objectName: "photosViewPhoto"
                 selectionItem: model.mediaSource

=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2013-06-26 13:46:56 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2014-03-03 15:49:30 +0000
@@ -165,6 +165,13 @@
                     asynchronous: true
                 }
 
+                Image {
+                    // Display a play icon if the thumbnail is from a video
+                    source: "../../img/icon_play.png"
+                    anchors.centerIn: parent
+                    visible: mediaSource.type === MediaSource.Video
+                }
+
                 OrganicItemInteraction {
                     objectName: "eventsViewPhoto"
                     selectionItem: model.mediaSource