Merge lp:~phablet-team/camera-app/photo-editor into lp:camera-app

[Bill Filler]

dynamically check for editor

dynamically check for editor

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/camera-app-ci/382/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/607/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/308
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17989
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/717/console

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/camera-app/photo-editor]

442. By Bill Filler on 2015-02-12

fix merge conflict

443. By Bill Filler on 2015-02-12

revert

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:443
http://jenkins.qa.ubuntu.com/job/camera-app-ci/383/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/609/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/777/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/310
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17993
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/719/console

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

review: Needs Fixing (continuous-integration)

=== added file 'PhotoEditorLoader.qml'
--- PhotoEditorLoader.qml	1970-01-01 00:00:00 +0000
+++ PhotoEditorLoader.qml	2015-02-12 02:59:57 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components.Extras 0.2
+
+PhotoEditor {
+    id: photoEditor
+    objectName: "photoEditor"
+
+    Connections {
+        target: header
+        onExitEditor: photoEditor.close(true);
+    }
+
+    function start(url) {
+        item.open(url.replace("file://", ""));
+    }
+}

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2015-02-06 20:51:21 +0000
+++ SlideshowView.qml	2015-02-12 02:59:57 +0000
@@ -18,7 +18,6 @@
 import Ubuntu.Components 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItems
 import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.Extras 0.1
 import Ubuntu.Content 0.1
 import Ubuntu.Thumbnailer 0.1
 import CameraApp 0.1
@@ -32,6 +31,7 @@
     property bool touchAcquired: listView.currentItem ? listView.currentItem.pinchInProgress ||
                                                         editor.active : false
     property bool inView
+    property bool editingAvailable: false
     signal toggleHeader
     property list<Action> actions: [
         Action {
@@ -43,14 +43,29 @@
             text: i18n.tr("Delete")
             iconName: "delete"
             onTriggered: PopupUtils.open(deleteDialogComponent)
-        },
-        Action {
-            text: i18n.tr("Edit")
-            iconName: "edit"
-            onTriggered: editor.start()
         }
     ]
 
+    Action {
+        id: editAction
+        text: i18n.tr("Edit")
+        iconName: "edit"
+        onTriggered: editor.start(listView.currentItem.url)
+    }
+
+    Component.onCompleted: {
+        // The PhotoEditor is only available in Ubuntu.Components.Extras 0.2
+        // If we succeed here we add the edit button to the list of actions.
+        try { Qt.createQmlObject('import QtQuick 2.0; import Ubuntu.Components.Extras 0.2; Item {}', slideshowView) }
+        catch (e) { return; }
+
+        editingAvailable = true;
+        var newActions = [];
+        for (var i = 0; i < actions.length; i++) newActions.push(actions[i]);
+        newActions.push(editAction);
+        actions = newActions;
+    }
+
     function showPhotoAtIndex(index) {
         listView.positionViewAtIndex(index, ListView.Contain);
     }
@@ -192,13 +207,15 @@
                         height: flickable.height * flickable.sizeScale
 
                         property bool isVideo: MimeTypeMapper.mimeTypeToContentType(fileType) === ContentType.Videos
+                        property string photoUrl: editingAvailable ? "image://photo/%1".arg(fileURL.toString()) : fileURL.toString().replace("file://", "")
 
                         Image {
                             id: image
                             anchors.fill: parent
                             asynchronous: true
                             cache: false
-                            source: slideshowView.inView ? "image://" + (media.isVideo ? "thumbnailer/" : "photo/") + fileURL.toString() : ""
+                            source: slideshowView.inView ? (media.isVideo ? "image://thumbnail/%1".arg(fileURL.toString())
+                                                                          : media.photoUrl) : ""
                             sourceSize {
                                 width: listView.maxDimension
                                 height: listView.maxDimension
@@ -213,7 +230,7 @@
                             anchors.fill: parent
                             asynchronous: true
                             cache: false
-                            source: flickable.sizeScale > 1.0 ? "image://photo/" + fileURL.toString() : ""
+                            source: flickable.sizeScale > 1.0 ? media.photoUrl : ""
                             sourceSize {
                                 width: width
                                 height: height
@@ -321,34 +338,6 @@
         }
     }
 
-    Loader {
-        id: editor
-        anchors.fill: parent
-
-        active: false
-        sourceComponent: Component {
-            PhotoEditor {
-                id: editorItem
-                objectName: "photoEditor"
-
-                Connections {
-                    target: header
-                    onExitEditor: editorItem.close(true);
-                }
-
-                onClosed: {
-                    editor.active = false;
-                    if (photoWasModified) listView.currentItem.reload()
-                }
-            }
-        }
-
-        function start() {
-            editor.active = true;
-            editor.item.open(listView.currentItem.url.replace("file://", ""));
-        }
-    }
-
     Binding { target: header; property: "editMode"; value: editor.active }
     Binding { target: header; property: "editModeActions"; value: editor.item.actions; when: editor.active }
 
@@ -360,4 +349,24 @@
         image.asynchronous = async;
         image.source = source;
     }
+
+    Loader {
+        id: editor
+        source: "PhotoEditorLoader.qml"
+        active: false
+        anchors.fill: parent
+
+        function start(url) {
+            editor.active = true;
+            editor.item.start(url);
+        }
+
+        Connections {
+            target: editor.item
+            onClosed: {
+                editor.active = false;
+                if (photoWasModified) listView.currentItem.reload();
+            }
+        }
+    }
 }