Merge lp:~phablet-team/camera-app/disable-edit-videos into lp:camera-app

[Ugo Riboni]

Disable editing when the file is a video

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2015-02-18 13:39:57 +0000
+++ SlideshowView.qml	2015-02-18 18:05:24 +0000
@@ -63,6 +63,7 @@
         text: i18n.tr("Edit")
         iconName: "edit"
         onTriggered: editor.start(listView.currentItem.url)
+        enabled: listView.currentItem && !listView.currentItem.isVideo
     }
 
     Component.onCompleted: {
@@ -136,6 +137,7 @@
             property bool pinchInProgress: zoomPinchArea.active
             property string url: fileURL
             property bool isSelected: selected
+            property alias isVideo: media.isVideo
 
             function zoomIn(centerX, centerY, factor) {
                 flickable.scaleCenterX = centerX / (flickable.sizeScale * flickable.width);