Merge lp:~paulliu/unity8/fix-genericpreview-2 into lp:~unity-team/unity8/fix-genericpreview

[Ying-Chun Liu]

Small fix for video preview.

[lp:~paulliu/unity8/fix-genericpreview-2]

373. By Ying-Chun Liu on 2013-10-01

Add logic to open the video.
Make sure it doesn't divide by zero.

=== modified file 'Dash/Movie/MoviePreview.qml'
--- Dash/Movie/MoviePreview.qml	2013-09-30 21:03:51 +0000
+++ Dash/Movie/MoviePreview.qml	2013-10-01 13:32:08 +0000
@@ -39,7 +39,7 @@
             id: urlLoader
             anchors.left: parent.left
             anchors.right: parent.right
-            height: width * previewImage.sourceSize.height / previewImage.sourceSize.width
+            height: previewImage.sourceSize.width != 0 ? width * previewImage.sourceSize.height / previewImage.sourceSize.width : 0
             radius: "medium"
             visible: height > 0
             image: Image {
@@ -62,7 +62,15 @@
             MouseArea {
                 id: previewImageMouseArea
                 anchors.fill: parent
-                onClicked: shell.activateApplication('/usr/share/applications/mediaplayer-app.desktop', previewData.imageSourceUri);
+                onClicked: {
+                    if (previewData.result.uri.indexOf("http") == 0) {
+                        Qt.openUrlExternally(previewData.result.uri);
+                    } else if (previewData.result.uri.indexOf("file") == 0) {
+                        shell.activateApplication('/usr/share/applications/mediaplayer-app.desktop', previewData.result.uri);
+                    } else {
+                        Qt.openUrlExternally(previewData.result.uri);
+                    }
+                }
             }
         }
     }