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

[Arthur Mello]

Following some changes on thumbnailer image provider we need to handle Image.Error status for videos that are unable to load correctly

Following some changes on thumbnailer image provider we need to handle Image.Error status for videos that are unable to load correctly

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1267
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/404
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/985
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27492

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

review: Needs Fixing (continuous-integration)

=== modified file 'po/gallery-app.pot'
--- po/gallery-app.pot	2015-05-21 10:13:59 +0000
+++ po/gallery-app.pot	2016-02-11 11:55:55 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gallery-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-21 13:13+0300\n"
+"POT-Creation-Date: 2016-02-11 09:44-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -23,19 +23,17 @@
 msgstr ""
 
 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
-#: rc/qml/AlbumViewer/AlbumViewer.qml:375
-#: rc/qml/Components/DeleteDialog.qml:32
-#: rc/qml/MediaViewer/MediaViewer.qml:345 rc/qml/Utility/EditingHUD.qml:67
-#: rc/qml/Utility/SelectionToolbarAction.qml:56
+#: rc/qml/AlbumViewer/AlbumViewer.qml:378
+#: rc/qml/Components/DeleteDialog.qml:32 rc/qml/EventsOverview.qml:138
+#: rc/qml/MediaViewer/MediaViewer.qml:354 rc/qml/PhotosOverview.qml:164
+#: rc/qml/Utility/EditingHUD.qml:67
 msgid "Delete"
 msgstr ""
 
 #: rc/qml/AlbumEditor/AlbumEditor.qml:39
-#: rc/qml/Components/MediaSelector.qml:92
-#: rc/qml/MediaViewer/MediaViewer.qml:275
-#: rc/qml/MediaViewer/PhotoEditor.qml:206
-#: rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml:80
-#: rc/qml/PickerScreen.qml:235 rc/qml/Utility/SelectionToolbarAction.qml:75
+#: rc/qml/Components/MediaSelector.qml:93 rc/qml/EventsOverview.qml:156
+#: rc/qml/MediaViewer/MediaViewer.qml:282 rc/qml/PhotosOverview.qml:182
+#: rc/qml/PickerScreen.qml:227
 msgid "Cancel"
 msgstr ""
 
@@ -59,43 +57,39 @@
 msgid "Red"
 msgstr ""
 
-#: rc/qml/AlbumViewer/AlbumViewer.qml:107 rc/qml/MainScreen.qml:60
+#: rc/qml/AlbumViewer/AlbumViewer.qml:107 rc/qml/MainScreen.qml:58
 msgid "Album"
 msgstr ""
 
-#: rc/qml/AlbumViewer/AlbumViewer.qml:369
-#: rc/qml/MediaViewer/MediaViewer.qml:335
+#: rc/qml/AlbumViewer/AlbumViewer.qml:372
+#: rc/qml/MediaViewer/MediaViewer.qml:344
 msgid "Add to album"
 msgstr ""
 
-#: rc/qml/AlbumsOverview.qml:236 rc/qml/Components/PopupAlbumPicker.qml:91
+#: rc/qml/AlbumsOverview.qml:228 rc/qml/Components/PopupAlbumPicker.qml:91
 msgid "Add new album"
 msgstr ""
 
-#: rc/qml/AlbumsOverview.qml:240 rc/qml/Components/PopupAlbumPicker.qml:101
+#: rc/qml/AlbumsOverview.qml:232 rc/qml/Components/PopupAlbumPicker.qml:101
 msgid "New Photo Album"
 msgstr ""
 
-#: rc/qml/AlbumsOverview.qml:241 rc/qml/Components/PopupAlbumPicker.qml:102
+#: rc/qml/AlbumsOverview.qml:233 rc/qml/Components/PopupAlbumPicker.qml:102
 msgid "Subtitle"
 msgstr ""
 
-#: rc/qml/AlbumsOverview.qml:247 rc/qml/Utility/EditingHUD.qml:77
-#: rc/qml/Utility/SelectionToolbarAction.qml:47
-msgid "Add"
-msgstr ""
-
-#: rc/qml/AlbumsOverview.qml:252 rc/qml/Utility/PhotosToolbarActions.qml:51
+#: rc/qml/AlbumsOverview.qml:240 rc/qml/EventsOverview.qml:115
+#: rc/qml/PhotosOverview.qml:141
 msgid "Camera"
 msgstr ""
 
 #: rc/qml/Components/DeleteDialog.qml:36
-#: rc/qml/MediaViewer/MediaViewer.qml:223
+#: rc/qml/MediaViewer/MediaViewer.qml:230
 msgid "Yes"
 msgstr ""
 
 #: rc/qml/Components/DeleteDialog.qml:45
-#: rc/qml/MediaViewer/MediaViewer.qml:234
+#: rc/qml/MediaViewer/MediaViewer.qml:241
 msgid "No"
 msgstr ""
 
@@ -116,7 +110,7 @@
 msgstr ""
 
 #: rc/qml/Components/MediaSelector.qml:59
-#: rc/qml/Components/MediaSelector.qml:80
+#: rc/qml/Components/MediaSelector.qml:81
 msgid "Add to Album"
 msgstr ""
 
@@ -161,115 +155,75 @@
 msgid "Delete %1 photos and %2 videos"
 msgstr ""
 
-#: rc/qml/EventsOverview.qml:151 rc/qml/PhotosOverview.qml:165
+#: rc/qml/EventsOverview.qml:108 rc/qml/MainScreen.qml:200
+#: rc/qml/MainScreen.qml:252 rc/qml/PhotosOverview.qml:134
+#: rc/qml/PickerScreen.qml:139 rc/qml/PickerScreen.qml:186
+msgid "Select"
+msgstr ""
+
+#: rc/qml/EventsOverview.qml:127 rc/qml/PhotosOverview.qml:153
+#: rc/qml/Utility/EditingHUD.qml:77
+msgid "Add"
+msgstr ""
+
+#: rc/qml/EventsOverview.qml:145 rc/qml/MediaViewer/MediaViewer.qml:365
+#: rc/qml/PhotosOverview.qml:171 rc/qml/Utility/EditingHUD.qml:72
+msgid "Share"
+msgstr ""
+
+#: rc/qml/EventsOverview.qml:184 rc/qml/MediaViewer/MediaViewer.qml:186
+#: rc/qml/PhotosOverview.qml:196
 msgid "Share to"
 msgstr ""
 
-#: rc/qml/LoadingScreen.qml:46
+#: rc/qml/LoadingScreen.qml:39
 msgid "Loading…"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:147
+#: rc/qml/MainScreen.qml:148
 msgid "Albums"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:161 rc/qml/MainScreen.qml:190
-#: rc/qml/PickerScreen.qml:101
+#: rc/qml/MainScreen.qml:162 rc/qml/MainScreen.qml:202
+#: rc/qml/PickerScreen.qml:99
 msgid "Events"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:188 rc/qml/MainScreen.qml:233
-#: rc/qml/PickerScreen.qml:141 rc/qml/PickerScreen.qml:194
-#: rc/qml/Utility/PhotosToolbarActions.qml:34
-msgid "Select"
-msgstr ""
-
-#: rc/qml/MainScreen.qml:199 rc/qml/MainScreen.qml:235
-#: rc/qml/PickerScreen.qml:152
+#: rc/qml/MainScreen.qml:211 rc/qml/MainScreen.qml:254
+#: rc/qml/PickerScreen.qml:150
 msgid "Photos"
 msgstr ""
 
-#: rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml:26
-#: rc/qml/MediaViewer/GalleryPhotoEditorPage.qml:25
-msgid "Edit Photo"
-msgstr ""
-
-#: rc/qml/MediaViewer/MediaViewer.qml:212
+#: rc/qml/MediaViewer/MediaViewer.qml:219
 msgid "Delete a photo"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:212
+#: rc/qml/MediaViewer/MediaViewer.qml:219
 msgid "Delete a video"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:245
+#: rc/qml/MediaViewer/MediaViewer.qml:252
 msgid "Remove a photo from album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:245
+#: rc/qml/MediaViewer/MediaViewer.qml:252
 msgid "Remove a video from album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:254
+#: rc/qml/MediaViewer/MediaViewer.qml:261
 msgid "Remove from Album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:265
+#: rc/qml/MediaViewer/MediaViewer.qml:272
 msgid "Remove from Album and Delete"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:312
+#: rc/qml/MediaViewer/MediaViewer.qml:319
 msgid "Edit"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:356 rc/qml/Utility/EditingHUD.qml:72
-#: rc/qml/Utility/SelectionToolbarAction.qml:65
-msgid "Share"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor.qml:43
-#: rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml:349
-#: rc/qml/Utility/EditingHUD.qml:106
-msgid "Crop"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor.qml:52 rc/qml/Utility/EditingHUD.qml:99
-msgid "Rotate"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor.qml:196
-msgid "Revert to original"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor.qml:197
-msgid "This will undo all edits, including those from previous sessions."
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor.qml:212
-msgid "Revert Photo"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor.qml:226
-msgid "Enhancing photo..."
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:114
-#: rc/qml/Utility/EditingHUD.qml:82
-msgid "Undo"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:121
-#: rc/qml/Utility/EditingHUD.qml:87
-msgid "Redo"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:128
-#: rc/qml/Utility/EditingHUD.qml:113
-msgid "Revert to Original"
-msgstr ""
-
-#: rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml:71
-msgid "Done"
+#: rc/qml/MediaViewer/PhotoEditorPage.qml:26
+msgid "Edit Photo"
 msgstr ""
 
 #: rc/qml/MediaViewer/PopupPhotoViewer.qml:46
@@ -277,11 +231,15 @@
 msgid "Gallery"
 msgstr ""
 
-#: rc/qml/MediaViewer/PopupPhotoViewer.qml:167
+#: rc/qml/MediaViewer/PopupPhotoViewer.qml:183
 msgid "Toggle Selection"
 msgstr ""
 
-#: rc/qml/PickerScreen.qml:241
+#: rc/qml/MediaViewer/SingleMediaViewer.qml:225
+msgid "An error has occurred attempting to load media"
+msgstr ""
+
+#: rc/qml/PickerScreen.qml:233
 msgid "Pick"
 msgstr ""
 
@@ -293,10 +251,18 @@
 msgid "Post;Upload;Attach"
 msgstr ""
 
+#: rc/qml/Utility/EditingHUD.qml:82
+msgid "Undo"
+msgstr ""
+
 #: rc/qml/Utility/EditingHUD.qml:83
 msgid "Cancel Action;Backstep"
 msgstr ""
 
+#: rc/qml/Utility/EditingHUD.qml:87
+msgid "Redo"
+msgstr ""
+
 #: rc/qml/Utility/EditingHUD.qml:88
 msgid "Reapply;Make Again"
 msgstr ""
@@ -313,6 +279,10 @@
 msgid "Automatically Adjust Photo"
 msgstr ""
 
+#: rc/qml/Utility/EditingHUD.qml:99
+msgid "Rotate"
+msgstr ""
+
 #: rc/qml/Utility/EditingHUD.qml:100
 msgid "Turn Clockwise"
 msgstr ""
@@ -321,6 +291,10 @@
 msgid "Rotate the image clockwise"
 msgstr ""
 
+#: rc/qml/Utility/EditingHUD.qml:106
+msgid "Crop"
+msgstr ""
+
 #: rc/qml/Utility/EditingHUD.qml:107
 msgid "Trim;Cut"
 msgstr ""
@@ -329,6 +303,10 @@
 msgid "Crop the image"
 msgstr ""
 
+#: rc/qml/Utility/EditingHUD.qml:113
+msgid "Revert to Original"
+msgstr ""
+
 #: rc/qml/Utility/EditingHUD.qml:114
 msgid "Discard Changes"
 msgstr ""
@@ -385,10 +363,6 @@
 msgid "Hue"
 msgstr ""
 
-#: rc/qml/Utility/PhotosToolbarActions.qml:43
-msgid "Import"
-msgstr ""
-
 #: desktop/gallery-app.desktop.in.in.h:2
 msgid "Ubuntu Photo Viewer"
 msgstr ""

=== modified file 'rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml'
--- rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2015-11-27 08:13:49 +0000
+++ rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2016-02-11 11:55:55 +0000
@@ -18,6 +18,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Gallery 1.0
 import "../../../js/Gallery.js" as Gallery
 
@@ -66,6 +67,22 @@
             NumberAnimation { duration: Gallery.SNAP_DURATION }
         }
     }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        visible: preview.status == Image.Error
+
+        Icon {
+            anchors.centerIn: parent
+            width: isPreview ? units.gu(4) : units.gu(6)
+            height: width
+            name: "stock_image"
+            color: "white"
+            opacity: 0.8
+        }
+    }
+
     Image {
         // Display a play icon if the thumbnail is from a video
         source: "../../../img/icon_play.png"

=== modified file 'rc/qml/Components/MediaGrid.qml'
--- rc/qml/Components/MediaGrid.qml	2015-11-27 08:13:49 +0000
+++ rc/qml/Components/MediaGrid.qml	2016-02-11 11:55:55 +0000
@@ -81,7 +81,8 @@
 
             radius: "medium"
             property bool isLoading: source.status === Image.Loading
-
+ 
+            backgroundColor: "black"
             sourceFillMode: UbuntuShape.PreserveAspectCrop
             source: Image {
                 id: thumbImage
@@ -94,11 +95,21 @@
                 }
             }
 
+            Icon {
+                anchors.centerIn: parent
+                width: units.gu(6)
+                height: width
+                visible: thumbImage.status == Image.Error
+                name: "stock_image"
+                color: "white"
+                opacity: 0.8
+            }
+
             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
+                visible: mediaSource.type === MediaSource.Video && thumbImage.status == Image.Ready
             }
 
             OrganicItemInteraction {

=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2015-11-05 19:04:22 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2016-02-11 11:55:55 +0000
@@ -81,7 +81,7 @@
     ActivityIndicator {
         anchors.centerIn: parent
         visible: running
-        running: image.status != Image.Ready
+        running: image.status != Image.Ready && image.status != Image.Error
     }
 
     PinchArea {
@@ -191,6 +191,41 @@
                     opacity: status == Image.Ready ? 1.0 : 0.0
                     fillMode: Image.PreserveAspectFit
                 }
+
+                Item {
+                    id: mediaLoadingError
+                    anchors.centerIn: parent
+                    width: parent.width
+                    height: mediaLoadingErrorIcon.height + units.gu(5) + mediaLoadingErrorLabel.contentHeight
+                    visible: opacity > 0
+                    opacity: image.status == Image.Error ? 1.0 : 0.0
+                    Behavior on opacity { UbuntuNumberAnimation {duration: UbuntuAnimation.FastDuration} }     
+
+                    Icon {
+                        id: mediaLoadingErrorIcon
+                        anchors.horizontalCenter: parent.horizontalCenter 
+                        width: units.gu(8)
+                        height: width
+                        name: "stock_image"
+                        color: "white"
+                        opacity: 0.8
+                    }
+
+                    Label {
+                        id: mediaLoadingErrorLabel
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                            top: mediaLoadingErrorIcon.bottom
+                            topMargin: units.gu(5)
+                        }
+
+                        width: units.gu(30)
+                        wrapMode: Text.WordWrap
+                        horizontalAlignment: Text.AlignHCenter
+                        text: i18n.tr("An error has occurred attempting to load media")
+                        fontSize: "large"
+                    }
+                }
             }
 
             Icon {
@@ -200,7 +235,7 @@
                 name: "media-playback-start"
                 color: "white"
                 opacity: 0.8
-                visible: viewer.isVideo
+                visible: viewer.isVideo && image.status == Image.Ready
             }
 
             MouseArea {
@@ -251,7 +286,7 @@
                 anchors.centerIn: parent
                 width: units.gu(10)
                 height: units.gu(10)
-                enabled: viewer.isVideo
+                enabled: viewer.isVideo && image.status == Image.Ready
                 onClicked: {
                     if (viewer.isVideo) {
                         var url = mediaSource.path.toString().replace("file://", "video://");

=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2015-11-27 08:13:49 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2016-02-11 11:55:55 +0000
@@ -167,10 +167,11 @@
                     }
                 }
 
-                visible: source.status === Image.Ready
+                visible: source.status === Image.Ready || source.status === Image.Error
 
                 radius: "medium"
 
+                backgroundColor: "black"
                 sourceFillMode: UbuntuShape.PreserveAspectCrop
                 source: Image {
                     id: thumbImage
@@ -188,11 +189,21 @@
                     fillMode: Image.PreserveAspectCrop
                 }
 
+                Icon {
+                    anchors.centerIn: parent
+                    width: units.gu(6)
+                    height: width
+                    visible: thumbImage.status == Image.Error
+                    name: "stock_image"
+                    color: "white"
+                    opacity: 0.8
+                }
+
                 Image {
                     // Display a play icon if the thumbnail is from a video
                     source: "../../img/icon_play.png"
                     anchors.centerIn: parent
-                    visible: model.mediaSource.type === MediaSource.Video
+                    visible: model.mediaSource.type === MediaSource.Video && thumbImage.status == Image.Ready
                 }
 
                 OrganicItemInteraction {