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

[Ugo Riboni]

Replace the built-in photo editor with the one from ubuntu-ui-extras

Replace the built-in photo editor with the one from ubuntu-ui-extras

You need to have this branch installed for this to work:
https://code.launchpad.net/~phablet-team/ubuntu-ui-extras/photo-editor

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1126
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1080/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/8/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/35
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/253/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/55
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16328
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/258/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1127
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1084/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/12
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/62
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/316/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/93
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16572
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/265/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/322/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1128
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1085/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/64
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/321/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/95
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16582
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/268/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/327
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/327/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

It looks really nice but there is one thing with multiples crops that seems strange to me. Steps to reproduce:

1. Opens a photo;
2. Crop it;
3. Rotate it (or exec any other editing besides crop);
4. Try to crop again.

The photo preview displayed on the second crop will be the original one. If I confirm the second crop and undo the edits from the stack I will pass trough all the previews states.

That is how it should work or should I be able to exec incremental crops?

review: Needs Information

[Arthur Mello (artmello)]

There was some changes in Thumbnailer on the last image (r184). I retest the branch and some of the situations I mention on my last comment are gone, especially when you start a new crop just after another. But I am still able to reproduce the behavior with crop, other editing and crop again. But whit that this could be an issue with Thumbnailer and not on gallery.

[Arthur Mello (artmello)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1152
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/54
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/166
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/668/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/393
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18482
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/532/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/785/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

1153. By Arthur Mello on 2015-03-10

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1153
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/58
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/187
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/716/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/822
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/442
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18710
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/571/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/836
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/836/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== removed file 'rc/img/[e-mail]'
Binary files rc/img/[e-mail]	2013-02-13 16:29:00 +0000 and rc/img/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml'
--- rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2014-03-19 20:01:31 +0000
+++ rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2015-03-10 14:05:41 +0000
@@ -44,7 +44,7 @@
         anchors.fill: parent
         asynchronous: true
         visible: fullImage.opacity < 1
-        source: load && mediaSource ? mediaSource.galleryPreviewPath : ""
+        source: load && mediaSource ? "image://thumbnailer/" + mediaSource.path : ""
         fillMode: fullImage.fillMode
         sourceSize.width: 256
 
@@ -53,7 +53,14 @@
             onDataChanged: {
                 // data changed but filename didn't, so we need to bypass the qml image
                 // cache by tacking a timestamp to the filename so sees it as different.
-                preview.source = mediaSource.galleryPreviewPath + "?at=" + Date.now()
+                preview.source = "image://thumbnailer/" + mediaSource.path + "?at=" + Date.now()
+
+                // reload full image
+                var src = fullImage.source;
+                fullImage.asynchronous = false;
+                fullImage.source = "";
+                fullImage.asynchronous = true;
+                fullImage.source = src;
             }
         }
     }
@@ -61,8 +68,10 @@
         id: fullImage
         anchors.fill: parent
         asynchronous: true
+        cache: false
         fillMode: Image.PreserveAspectCrop
-        source: (preview.status === Image.Ready && !isPreview) ? mediaSource.galleryPath : ""
+        source: (preview.status === Image.Ready && !isPreview) ?
+                "image://thumbnailer/" + mediaSource.path : ""
 
         property int maxSize: Math.max(width, height)
         sourceSize.width: maxSize

=== modified file 'rc/qml/Components/MediaGrid.qml'
--- rc/qml/Components/MediaGrid.qml	2015-02-09 18:26:03 +0000
+++ rc/qml/Components/MediaGrid.qml	2015-03-10 14:05:41 +0000
@@ -83,7 +83,7 @@
 
             image: Image {
                 id: thumbImage
-                source: mediaSource.galleryThumbnailPath
+                source: "image://thumbnailer/" + mediaSource.path
                 asynchronous: true
                 fillMode: Image.PreserveAspectCrop
 
@@ -92,7 +92,7 @@
                     onDataChanged: {
                         // data changed but filename didn't, so we need to bypass the qml image
                         // cache by tacking a timestamp to the filename so sees it as different.
-                        thumbImage.source = mediaSource.galleryThumbnailPath + "?at=" + Date.now()
+                        thumbImage.source = "image://thumbnailer/" + mediaSource.path + "?at=" + Date.now()
                     }
                 }
             }

=== modified file 'rc/qml/MainScreen.qml'
--- rc/qml/MainScreen.qml	2015-02-17 11:58:34 +0000
+++ rc/qml/MainScreen.qml	2015-03-10 14:05:41 +0000
@@ -119,8 +119,8 @@
         }
     }
 
-    function pushPage(page) {
-        pageStack.push(page);
+    function pushPage(page, properties) {
+        return pageStack.push(page, properties);
     }
 
     function popPage() {

=== removed file 'rc/qml/MediaViewer/CropCorner.qml'
--- rc/qml/MediaViewer/CropCorner.qml	2013-06-13 12:13:00 +0000
+++ rc/qml/MediaViewer/CropCorner.qml	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-// A corner of a CropFrame.
-Item {
-    id: cropCorner
-
-    /*!
-    */
-    signal dragged(real dx, real dy)
-    /*!
-    */
-    signal dragStarted()
-    /*!
-    */
-    signal dragCompleted()
-
-    /*!
-    */
-    property bool isLeft: true
-    /*!
-    */
-    property bool isTop: true
-
-    x: isLeft ? -(width/2) : parent.width - (width/2)
-    y: isTop ? -(width/2) : parent.height - (width/2)
-    width: handle.width
-    height: handle.height
-
-    Image {
-        id: handle
-        anchors.centerIn: parent
-        source: Qt.resolvedUrl("../../img/crop-handle.png")
-    }
-
-    CropDragArea {
-        anchors.centerIn: parent
-        width: handle.width + units.gu(2)
-        height: handle.height + units.gu(2)
-
-        onDragged: cropCorner.dragged(dx, dy)
-
-        onDragStarted: cropCorner.dragStarted()
-
-        onDragCompleted: cropCorner.dragCompleted()
-    }
-}

=== removed file 'rc/qml/MediaViewer/CropDragArea.qml'
--- rc/qml/MediaViewer/CropDragArea.qml	2013-06-13 12:13:00 +0000
+++ rc/qml/MediaViewer/CropDragArea.qml	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- */
-
-import QtQuick 2.0
-
-// A MouseArea meant to drag a corner/edge of a crop area.
-MouseArea {
-    id: cropDragArea
-
-    /*!
-    */
-    signal dragged(real dx, real dy)
-    /*!
-    */
-    signal dragStarted()
-    /*!
-    */
-    signal dragCompleted()
-
-    // Since we're usually moving this area with the mouse in response to
-    // dragging, we don't need to capture the last x/y, just where it was
-    // grabbed.
-    property real grabX: -1
-    /*!
-    */
-    property real grabY: -1
-
-    onPressed: {
-        dragStarted();
-
-        grabX = mouse.x;
-        grabY = mouse.y;
-    }
-
-    onReleased: {
-        dragCompleted();
-    }
-
-    onPositionChanged: cropDragArea.dragged(mouse.x - grabX, mouse.y - grabY)
-}

=== removed file 'rc/qml/MediaViewer/CropInteractor.qml'
--- rc/qml/MediaViewer/CropInteractor.qml	2013-06-13 12:13:00 +0000
+++ rc/qml/MediaViewer/CropInteractor.qml	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- * Lucas Beeler <[e-mail]>
- */
-
-import QtQuick 2.0
-import Gallery 1.0
-import Ubuntu.Components 0.1
-import "../Components"
-import "../../js/GraphicsRoutines.js" as GraphicsRoutines
-
-/*!
-*/
-Item {
-    id: cropInteractor
-    objectName: "cropInteractor"
-
-    /*!
-    */
-    property string matteColor: "black"
-    /*!
-    */
-    property real matteOpacity: 0.6
-
-    // Note: each element of the cropped rect will be in the range [0,1], since
-    // in the UI we aren't using direct photo pixel values.
-    signal cropped(variant rect)
-    /*!
-    */
-    signal canceled()
-
-    // readonly
-    /*!
-    */
-    property variant photo // Set with enter().
-
-    // internal
-    /*!
-    */
-    property variant ratio_crop_rect
-
-    /*!
-    */
-    function computeRectSet(photo, relativeCropRect) {
-        var result = { };
-
-        var wholePhotoPreviewRect = GraphicsRoutines.fitRect(viewport,
-                                                             cropInteractor.photo);
-
-        var unfitCropRect = { };
-        unfitCropRect.x = relativeCropRect.x * wholePhotoPreviewRect.width;
-        unfitCropRect.y = relativeCropRect.y * wholePhotoPreviewRect.height;
-        unfitCropRect.width = relativeCropRect.width * wholePhotoPreviewRect.width;
-        unfitCropRect.height = relativeCropRect.height *
-                wholePhotoPreviewRect.height;
-
-        var cropFrameRect = GraphicsRoutines.fitRect(viewport, unfitCropRect);
-
-        var photoExtentRect = { };
-        photoExtentRect.x = cropFrameRect.x - (cropFrameRect.scaleFactor *
-                                               wholePhotoPreviewRect.width * relativeCropRect.x);
-        photoExtentRect.y = cropFrameRect.y - (cropFrameRect.scaleFactor *
-                                               wholePhotoPreviewRect.height * relativeCropRect.y);
-        photoExtentRect.width = cropFrameRect.scaleFactor *
-                wholePhotoPreviewRect.width;
-        photoExtentRect.height = cropFrameRect.scaleFactor *
-                wholePhotoPreviewRect.height;
-        photoExtentRect.scaleFactor = cropFrameRect.scaleFactor;
-
-        result.photoPreviewRect = wholePhotoPreviewRect;
-        result.cropFrameRect = cropFrameRect;
-        result.photoExtentRect = photoExtentRect;
-
-        return result;
-    }
-
-    /*!
-    */
-    function enter(photo, ratio_crop_rect) {
-        cropInteractor.photo = photo;
-        original.mediaSource = photo;
-        cropInteractor.ratio_crop_rect = ratio_crop_rect;
-
-        var rects = computeRectSet(photo, ratio_crop_rect);
-
-        overlay.initialFrameX = rects.cropFrameRect.x;
-        overlay.initialFrameY = rects.cropFrameRect.y;
-        overlay.initialFrameWidth = rects.cropFrameRect.width;
-        overlay.initialFrameHeight = rects.cropFrameRect.height;
-
-        overlay.resetFor(rects);
-
-        original.visible = true;
-        overlay.visible = true;
-    }
-
-    Item {
-        id: viewport
-
-        anchors.fill: parent
-        anchors.margins: units.gu(8)
-        z: 1
-    }
-
-    CropOverlay {
-        id: overlay
-        objectName: "cropOverlay"
-
-        property real minSize: units.gu(4)
-
-        anchors.fill: parent;
-        visible: false;
-
-        photo: original
-        viewport: viewport
-
-        matteColor: cropInteractor.matteColor
-        matteOpacity: cropInteractor.matteOpacity
-
-        z: 16
-
-        onMatteRegionPressed: {
-            cropInteractor.canceled();
-        }
-
-        onCropButtonPressed: {
-            original.visible = false;
-            overlay.visible = false;
-            original.scale = 1.0;
-            cropInteractor.cropped(overlay.getRelativeFrameRect());
-        }
-    }
-
-    GalleryPhotoComponent {
-        id: original
-
-        x: viewport.x;
-        y: viewport.y;
-        width: viewport.width;
-        height: viewport.height;
-        transformOrigin: Item.TopLeft;
-
-        color: "black"
-        visible: false
-        load: true
-
-        mediaSource: cropInteractor.photo
-        ownerName: "cropInteractor"
-
-        onLoaded: {
-            var rects = cropInteractor.computeRectSet(cropInteractor.photo,
-                                                      cropInteractor.ratio_crop_rect);
-
-            x = rects.photoExtentRect.x;
-            y = rects.photoExtentRect.y;
-            width = rects.photoPreviewRect.width;
-            height = rects.photoPreviewRect.height;
-            scale = rects.photoExtentRect.scaleFactor;
-        }
-    }
-}

=== removed file 'rc/qml/MediaViewer/CropOverlay.qml'
--- rc/qml/MediaViewer/CropOverlay.qml	2013-06-20 11:54:49 +0000
+++ rc/qml/MediaViewer/CropOverlay.qml	1970-01-01 00:00:00 +0000
@@ -1,636 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- * Lucas Beeler <[e-mail]>
- */
-
-import QtQuick 2.0
-import Gallery 1.0
-import Ubuntu.Components 0.1
-import "../Components"
-import "../Utility"
-import "../../js/GraphicsRoutines.js" as GraphicsRoutines
-
-/* A CropOverlay is a semi-transparent surface that floats over the photo. It
- * serves two purposes. First, it provides visual cueing as to what region of
- * the photo's surface will be preserved when the crop operation is applied.
- * The preserved region is the region that falls inside of the CropOverlay's
- * frame. Second, the CropOverlay allows the user to manipulate the
- * geometry of the crop frame, to chage its location, width, and height. The
- * geometry of the crop frame is reinforced by a key visual cue: the region of
- * the photo outside of the crop frame is drawn with a semi-transparent, smoked
- * matte on top of it. This matte surrounds the crop frame.
- */
-Item {
-    id: cropOverlay
-
-    // public properties
-    /*!
-    */
-    property Item viewport
-    /*!
-    */
-    property GalleryPhotoComponent photo
-    /*!
-    */
-    property string matteColor: "red"
-    /*!
-    */
-    property real matteOpacity: 0.85
-    /*!
-    */
-    property int initialFrameX: -1
-    /*!
-    */
-    property int initialFrameY: -1
-    /*!
-    */
-    property int initialFrameWidth: -1
-    /*!
-    */
-    property int initialFrameHeight: -1
-
-    // private properties -- Frame Fit Animation parameters
-    property real interpolationFactor: 1.0
-    /*!
-    */
-    property variant startFrame
-    /*!
-    */
-    property variant endFrame
-    /*!
-    */
-    property variant startPhoto
-    /*!
-    */
-    property real referencePhotoWidth: -1
-    /*!
-    */
-    property real referencePhotoHeight: -1
-    /*!
-    */
-    property real endPhotoX
-    /*!
-    */
-    property real endPhotoY
-    /*!
-    */
-    property real endPhotoWidth
-    /*!
-    */
-    property real endPhotoHeight
-
-    /*!
-    */
-    signal userAlteredFrame()
-    /*!
-    */
-    signal runFrameFitAnimation()
-    /*!
-    */
-    signal matteRegionPressed()
-    /*!
-    */
-    signal cropButtonPressed()
-
-    /*!
-    */
-    function resetFor(rectSet) {
-        if (initialFrameX != -1 && initialFrameY != -1 && initialFrameWidth != -1 &&
-                initialFrameHeight != -1) {
-            frame.x = rectSet.cropFrameRect.x;
-            frame.y = rectSet.cropFrameRect.y;
-            frame.width = rectSet.cropFrameRect.width;
-            frame.height = rectSet.cropFrameRect.height;
-            photoExtent.x = rectSet.photoExtentRect.x;
-            photoExtent.y = rectSet.photoExtentRect.y;
-            photoExtent.width = rectSet.photoExtentRect.width;
-            photoExtent.height = rectSet.photoExtentRect.height;
-            referencePhotoWidth = rectSet.photoPreviewRect.width;
-            referencePhotoHeight = rectSet.photoPreviewRect.height;
-        }
-    }
-
-    /* Return the (x, y) position and the width and height of the viewport
-    */
-    function getViewportExtentRect() {
-        return GraphicsRoutines.cloneRect(viewport);
-    }
-
-    /* Return the (x, y) position and the width and height of the photoExtent.
-     * The photoExtent is the on-screen region that holds the original photo
-     * preview.
-     */
-    function getPhotoExtentRect() {
-        return GraphicsRoutines.cloneRect(photoExtent);
-    }
-
-    /*!
-    */
-    function getRelativeFrameRect() {
-        return GraphicsRoutines.getRelativeRect(frame.getExtentRect(),
-                                                getPhotoExtentRect());
-    }
-
-    anchors.fill: parent
-
-    Item {
-        id: photoExtent
-
-        property real panStartX
-        property real panStartY
-
-        function startPan() {
-            panStartX = x;
-            panStartY = y;
-        }
-
-        // 'deltaX' and 'deltaY' are offsets relative to the pan start point
-        function updatePan(deltaX, deltaY) {
-            var newX = panStartX + deltaX;
-            var newY = panStartY + deltaY;
-
-            x = GraphicsRoutines.clamp(newX, frame.x + frame.width -
-                                       photoExtent.width, frame.x);
-            y = GraphicsRoutines.clamp(newY, frame.y + frame.height -
-                                       photoExtent.height, frame.y);
-        }
-
-        function stopPan() {
-        }
-
-        x: initialFrameX
-        y: initialFrameY
-        width: initialFrameWidth
-        height: initialFrameHeight
-        z: 1
-
-        onXChanged: {
-            if (photo)
-                photo.x = x;
-        }
-
-        onYChanged: {
-            if (photo)
-                photo.y = y;
-        }
-
-        onWidthChanged: {
-            if (photo && referencePhotoWidth > 0)
-                photo.scale = width / referencePhotoWidth;
-        }
-
-        onHeightChanged: {
-            if (photo && referencePhotoHeight > 0)
-                photo.scale = height / referencePhotoHeight;
-        }
-    }
-
-    //
-    // The following four Rectangles are used to "matte out" the area of the photo
-    // preview that falls outside the frame. This "matting out" visual cue is
-    // accomplished by darkening the matted-out area with a translucent, smoked
-    // overlay.
-    //
-    Rectangle {
-        id: leftMatte
-
-        color: cropOverlay.matteColor
-        opacity: cropOverlay.matteOpacity
-
-        anchors.top: topMatte.bottom
-        anchors.bottom: frame.bottom
-        anchors.left: parent.left
-        anchors.right: frame.left
-
-        MouseArea {
-            anchors.fill: parent;
-
-            onPressed: cropOverlay.matteRegionPressed();
-        }
-    }
-
-    Rectangle {
-        id: topMatte
-
-        color: cropOverlay.matteColor
-        opacity: cropOverlay.matteOpacity
-
-        anchors.top: parent.top
-        anchors.bottom: frame.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        MouseArea {
-            anchors.fill: parent;
-
-            onPressed: cropOverlay.matteRegionPressed();
-        }
-    }
-
-    Rectangle {
-        id: rightMatte
-
-        color: cropOverlay.matteColor
-        opacity: cropOverlay.matteOpacity
-
-        anchors.top: topMatte.bottom
-        anchors.bottom: bottomMatte.top
-        anchors.left: frame.right
-        anchors.right: parent.right
-
-        MouseArea {
-            anchors.fill: parent;
-
-            onPressed: cropOverlay.matteRegionPressed();
-        }
-    }
-
-    Rectangle {
-        id: bottomMatte
-
-        color: cropOverlay.matteColor
-        opacity: cropOverlay.matteOpacity
-
-        anchors.top: frame.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        MouseArea {
-            anchors.fill: parent;
-
-            onPressed: cropOverlay.matteRegionPressed();
-        }
-    }
-
-    //
-    // The frame is a grey rectangle with associated drag corners that
-    // frames the region of the photo that will remain when the crop operation is
-    // applied.
-    //
-    // NB: the frame can be in two states, although the QML state mechanism
-    //     isn't sufficiently expressive to describe them. The frame can be
-    //     in the FIT state, in which case it is optimally fit inside the
-    //     frame constraint region (see getFrameConstraintRect( ) above for
-    //     a description of the frame constraint region). Or, the frame can
-    //     be in the USER state. In the user state, the user has the mouse button
-    //     held down and is actively performing a drag operation to change the
-    //     geometry of the frame.
-    //
-    Rectangle {
-        id: frame
-
-        signal resizedX(bool left, real dx)
-        signal resizedY(bool top, real dy)
-
-        property variant dragStartRect
-
-        function getExtentRect() {
-            var result = { };
-
-            result.x = x;
-            result.y = y;
-            result.width = width;
-            result.height = height;
-
-            return result;
-        }
-
-        x: cropOverlay.initialFrameX
-        y: cropOverlay.initialFrameY
-        width: cropOverlay.initialFrameWidth
-        height: cropOverlay.initialFrameHeight
-
-        color: "transparent"
-
-        border.width: units.gu(0.2)
-        border.color: "#19B6EE"
-
-        MouseArea {
-            id: panArea
-
-            property int dragStartX;
-            property int dragStartY;
-
-            anchors.fill: parent
-            anchors.margins: 2
-
-            onPressed: {
-                dragStartX = mouse.x;
-                dragStartY = mouse.y;
-
-                photoExtent.startPan();
-            }
-
-            onReleased: {
-                photoExtent.stopPan();
-            }
-
-            onPositionChanged: {
-                photoExtent.updatePan(mouse.x - dragStartX, mouse.y - dragStartY);
-            }
-        }
-
-        Button {
-            objectName: "centerCropIcon"
-            anchors.centerIn: parent
-            text: i18n.tr("Crop")
-            color: frame.border.color
-            opacity: 0.9
-            onClicked: cropOverlay.cropButtonPressed()
-        }
-
-        // Left drag bar.
-        CropDragArea {
-            x: -units.gu(2)
-            width: units.gu(3)
-            anchors.verticalCenter: parent.center
-            height: parent.height - units.gu(2)
-
-            onDragged: {
-                frame.resizedX(true, dx)
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Top drag bar.
-        CropDragArea {
-            y: -units.gu(2)
-            height: units.gu(3)
-            anchors.horizontalCenter: parent.center
-            width: parent.width - units.gu(2)
-
-            onDragged: {
-                frame.resizedY(true, dy)
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Right drag bar.
-        CropDragArea {
-            x: parent.width - units.gu(1)
-            width: units.gu(3)
-            anchors.verticalCenter: parent.center
-            height: parent.height - units.gu(2)
-
-            onDragged: {
-                frame.resizedX(false, dx)
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Bottom drag bar.
-        CropDragArea {
-            y: parent.height - units.gu(1)
-            height: units.gu(3)
-            anchors.horizontalCenter: parent.center
-            width: parent.width - units.gu(2)
-
-            onDragged: {
-                frame.resizedY(false, dy)
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Top-left corner.
-        CropCorner {
-            objectName: "topLeftCropCorner"
-            isLeft: true
-            isTop: true
-
-            onDragged: {
-                frame.resizedX(isLeft, dx);
-                frame.resizedY(isTop, dy);
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Top-right corner.
-        CropCorner {
-            objectName: "topRightCropCorner"
-            isLeft: false
-            isTop: true
-
-            onDragged: {
-                frame.resizedX(isLeft, dx);
-                frame.resizedY(isTop, dy);
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Bottom-left corner.
-        CropCorner {
-            objectName: "bottonLeftCropCorner"
-            isLeft: true
-            isTop: false
-
-            onDragged: {
-                frame.resizedX(isLeft, dx);
-                frame.resizedY(isTop, dy);
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // Bottom-right corner.
-        CropCorner {
-            id: bottomRightCrop
-            objectName: "bottomRightCropCorner"
-            isLeft: false
-            isTop: false
-
-            onDragged: {
-                frame.resizedX(isLeft, dx);
-                frame.resizedY(isTop, dy);
-            }
-
-            onDragStarted: {
-                frame.dragStartRect = frame.getExtentRect();
-            }
-
-            onDragCompleted: {
-                if (!GraphicsRoutines.areEqual(frame.getExtentRect(),
-                                               frame.dragStartRect)) {
-                    cropOverlay.userAlteredFrame();
-                    cropOverlay.runFrameFitAnimation();
-                }
-            }
-        }
-
-        // This handles resizing in both dimensions.  first is whether we're
-        // resizing the "first" edge, e.g. left or top (in which case we
-        // adjust both position and span) vs. right or bottom (where we just
-        // adjust the span).  position should be either "x" or "y", and span
-        // is either "width" or "height".  This is a little complicated, and
-        // coule probably be optimized with a little more thought.
-        function resizeFrame(first, delta, position, span) {
-            var constraintRegion = cropOverlay.getPhotoExtentRect();
-
-            if (first) {
-                // Left/top side.
-                if (frame[position] + delta < constraintRegion[position])
-                    delta = constraintRegion[position] - frame[position]
-
-                if (frame[span] - delta < minSize)
-                    delta = frame[span] - minSize;
-
-                frame[position] += delta;
-                frame[span] -= delta;
-            } else {
-                // Right/bottom side.
-                if (frame[span] + delta < minSize)
-                    delta = minSize - frame[span];
-
-                if ((frame[position] + frame[span] + delta) >
-                        (constraintRegion[position] + constraintRegion[span]))
-                    delta = constraintRegion[position] + constraintRegion[span] -
-                            frame[position] - frame[span];
-
-                frame[span] += delta;
-            }
-        }
-
-        onResizedX: resizeFrame(left, dx, "x", "width")
-        onResizedY: resizeFrame(top, dy, "y", "height")
-    }
-
-    /* Invoked when the user has changed the geometry of the frame by dragging
-     * one of its corners or edges. Expressed in terms of the states of the
-     * frame described above, the userAlteredFrame signal is fired
-     * when the user stops dragging. This triggers a change of the frame
-     * from the USER state to the FIT state
-     */
-    onUserAlteredFrame: {
-        // since the geometry of the frame in the FIT state depends on both
-        // how the user resized the frame when it was in the USER state as well
-        // as the size of the frame constraint region, we have to recompute the
-        // geometry of of the frame for the FIT state every time.
-
-        startFrame = GraphicsRoutines.cloneRect(frame);
-
-        endFrame = GraphicsRoutines.fitRect(getViewportExtentRect(),
-                                            frame.getExtentRect());
-
-        startPhoto = GraphicsRoutines.cloneRect(photoExtent);
-
-        var frameRelativeToPhoto = getRelativeFrameRect();
-        var scaleFactor = endFrame.width / frame.width;
-
-        endPhotoWidth = photoExtent.width * scaleFactor;
-        endPhotoHeight = photoExtent.height * scaleFactor;
-        endPhotoX = endFrame.x - (frameRelativeToPhoto.x * endPhotoWidth);
-        endPhotoY = endFrame.y - (frameRelativeToPhoto.y * endPhotoHeight)
-
-        photo.transformOrigin = Item.TopLeft;
-    }
-
-    onRunFrameFitAnimation: NumberAnimation { target: cropOverlay;
-        property: "interpolationFactor"; from: 0.0; to: 1.0 }
-
-    onInterpolationFactorChanged: {
-        var endPhotoRect = { };
-        endPhotoRect.x = endPhotoX;
-        endPhotoRect.y = endPhotoY;
-        endPhotoRect.width = endPhotoWidth;
-        endPhotoRect.height = endPhotoHeight;
-
-        var interpolatedRect = GraphicsRoutines.interpolateRect(startFrame,
-                                                                endFrame, interpolationFactor);
-        GraphicsRoutines.sizeToRect(interpolatedRect, frame);
-
-        interpolatedRect = GraphicsRoutines.interpolateRect(startPhoto,
-                                                            endPhotoRect, interpolationFactor);
-        GraphicsRoutines.sizeToRect(interpolatedRect, photoExtent);
-    }
-}

=== removed file 'rc/qml/MediaViewer/EditPopover.qml'
--- rc/qml/MediaViewer/EditPopover.qml	2013-08-07 12:47:13 +0000
+++ rc/qml/MediaViewer/EditPopover.qml	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2011-2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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.Popups 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-/*!
-*/
-Popover {
-    id: root
-    /*!
-    */
-    property variant photo: null
-    /*!
-    */
-    property CropInteractor cropper
-
-    ///
-    signal buttonPressed()
-
-    Column {
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: parent.top
-        }
-        ListItem.Standard {
-            text: i18n.tr("Rotate")
-            objectName: "rotateListItem"
-            onClicked: {
-                hide();
-                photo.rotateRight();
-                root.buttonPressed();
-            }
-        }
-        ListItem.Standard {
-            text: i18n.tr("Crop")
-            objectName: "cropListItem"
-            onClicked: {
-                hide();
-                cropper.show(photo);
-                root.buttonPressed();
-            }
-        }
-        ListItem.Standard {
-            text: i18n.tr("Auto enhance")
-            objectName: "enhanceListItem"            
-            onClicked: {
-                hide();
-                photo.autoEnhance();
-                root.buttonPressed();
-            }
-        }
-        ListItem.Standard {
-            text: i18n.tr("Undo")
-            objectName: "undoListItem"
-            enabled: photo.canUndo
-            onClicked: {
-                hide();
-                photo.undo();
-                root.buttonPressed();
-            }
-        }
-        ListItem.Standard {
-            text: i18n.tr("Redo")
-            objectName: "redoListItem"
-            enabled: photo.canRedo
-            onClicked: {
-                hide();
-                photo.redo();
-                root.buttonPressed();
-            }
-        }
-        ListItem.Standard {
-            text: i18n.tr("Revert to original")
-            objectName: "revertListItem"
-            enabled: !photo.isOriginal
-            onClicked: {
-                hide();
-                photo.revertToOriginal();
-                root.buttonPressed();
-            }
-        }
-    }
-}

=== removed file 'rc/qml/MediaViewer/EditPreview.qml'
--- rc/qml/MediaViewer/EditPreview.qml	2013-06-13 12:13:00 +0000
+++ rc/qml/MediaViewer/EditPreview.qml	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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
-
-/*!
-  The EditPreview item show the prevew of an edit function.
-  As it is using shader functionality for that, it's extrememly fast.
-  */
-Item {
-    id: root
-
-    /// URL to the image that is edited
-    property alias source: previewImage.source
-    /// Value of the exposure
-    property alias exposure: effectItem.exposure
-
-    /// brightnes for the color balance
-    property alias brightness: effectItem.b
-    /// contrast for the color balance
-    property alias contrast: effectItem.c
-    /// saturation for the color balance
-    property alias saturation: effectItem.s
-    /// hue for the color balance
-    property alias hue: effectItem.h
-
-    /*!
-      Sets the exposure as active preview
-      */
-    function useExposure() {
-        effectItem.fragmentShader = root.exposureShader
-    }
-    /*!
-      Sets the color balance as active preview
-      */
-    function useColorBalance() {
-        effectItem.fragmentShader = root.colorBalanceShader
-    }
-
-    Image {
-        id: previewImage
-        anchors.fill: parent
-        fillMode: Image.PreserveAspectFit
-    }
-
-    ShaderEffect
-    {
-        id: effectItem
-        anchors.centerIn: previewImage
-        width: previewImage.paintedWidth
-        height: previewImage.paintedHeight
-        blending: false
-
-        property var src: previewImage
-
-        property double exposure: 0.0
-
-        property real b: 1.0
-        property real c: 1.0
-        property real s: 1.0
-        property real h: 0.0
-
-        property real cos_h: Math.cos(h * (3.1415926 / 180.0))
-        property real sin_h: Math.sin(h * (3.1415926 / 180.0))
-        property variant h1:
-            Qt.vector4d(0.333333 * (1.0 - cos_h) + cos_h,
-                        0.333333 * (1.0 - cos_h) + 0.57735 * sin_h,
-                        0.333333 * (1.0 - cos_h) - 0.57735 * sin_h,
-                        0.0)
-        property variant h2:
-            Qt.vector4d(0.333333 * (1.0 - cos_h) - 0.57735 * sin_h,
-                        0.333333 * (1.0 - cos_h) + cos_h,
-                        0.333333 * (1.0 - cos_h) + 0.57735 * sin_h,
-                        0.0)
-        property variant h3:
-            Qt.vector4d(0.333333 * (1.0 - cos_h) + 0.57735 * sin_h,
-                        0.333333 * (1.0 - cos_h) - 0.57735 * sin_h,
-                        0.333333 * (1.0 - cos_h) + cos_h,
-                        0.0)
-        property variant s1:
-            Qt.vector4d((1.0 - s) * 0.3086 + s,
-                        (1.0 - s) * 0.6094,
-                        (1.0 - s) * 0.0820,
-                        0.0)
-        property variant s2:
-            Qt.vector4d((1.0 - s) * 0.3086,
-                        (1.0 - s) * 0.6094 + s,
-                        (1.0 - s) * 0.0820,
-                        0.0)
-        property variant s3:
-            Qt.vector4d((1.0 - s) * 0.3086,
-                        (1.0 - s) * 0.6094,
-                        (1.0 - s) * 0.0820 + s,
-                        0.0)
-        property variant b1:
-            Qt.vector4d(b, 0.0, 0.0, 0.0)
-        property variant b2:
-            Qt.vector4d(0.0, b, 0.0, 0.0)
-        property variant b3:
-            Qt.vector4d(0.0, 0.0, b, 0.0)
-
-        property variant c1:
-            Qt.vector4d(c, 0.0, 0.0, c * -0.5 + 0.5)
-        property variant c2:
-            Qt.vector4d(0.0, c, 0.0, c * -0.5 + 0.5)
-        property variant c3:
-            Qt.vector4d(0.0, 0.0, c, c * -0.5 + 0.5)
-
-        vertexShader: "
-            uniform mat4 qt_Matrix;
-            attribute vec4 qt_Vertex;
-            attribute vec2 qt_MultiTexCoord0;
-            varying mediump vec2 coord;
-            void main() {
-                coord = qt_MultiTexCoord0;
-                gl_Position = qt_Matrix * qt_Vertex;
-            }"
-
-        fragmentShader: root.exposureShader
-    }
-
-    property string exposureShader: "
-        varying mediump vec2 coord;
-        uniform sampler2D src;
-        uniform mediump float exposure;
-        uniform mediump float qt_Opacity;
-        void main() {
-            mediump float exp = clamp(exposure, -1.0, 1.0);
-            mediump vec4 tex = texture2D(src, coord);
-            tex.rgb += exp;
-            gl_FragColor = tex * qt_Opacity;
-        }"
-
-    property string colorBalanceShader: "
-        varying mediump vec2 coord;
-        uniform sampler2D src;
-        uniform mediump vec4 h1;
-        uniform mediump vec4 h2;
-        uniform mediump vec4 h3;
-        uniform mediump vec4 s1;
-        uniform mediump vec4 s2;
-        uniform mediump vec4 s3;
-        uniform mediump vec4 b1;
-        uniform mediump vec4 b2;
-        uniform mediump vec4 b3;
-        uniform mediump vec4 c1;
-        uniform mediump vec4 c2;
-        uniform mediump vec4 c3;
-        void main(void) {
-            mediump vec4 tmp1;
-            mediump vec4 tmp2;
-            tmp1 = texture2D(src, coord);
-            tmp2 = vec4(dot(h1, tmp1), dot(h2, tmp1), dot(h3, tmp1), 1.0);
-            tmp1 = vec4(dot(s1, tmp2), dot(s2, tmp2), dot(s3, tmp2), 1.0);
-            tmp2 = vec4(dot(b1, tmp1), dot(b2, tmp1), dot(b3, tmp1), 1.0);
-            tmp1 = vec4(dot(c1, tmp2), dot(c2, tmp2), dot(c3, tmp2), 1.0);
-            gl_FragColor = tmp1;
-        }"
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {}
-    }
-}

=== added file 'rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml'
--- rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,43 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Extras 0.2 as Extras
+
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ */
+
+Page {
+    id: page
+    property string photo
+    signal done(bool photoWasModified)
+
+    title: i18n.tr("Edit Photo")
+
+    head.backAction: Action {
+        iconName: "back"
+        onTriggered: editor.close(true)
+    }
+    head.actions: editor.actions
+
+    Extras.PhotoEditor {
+        id: editor
+        anchors.fill: parent
+        onClosed: page.done(photoWasModified)
+    }
+
+    onActiveChanged: {
+        if (active) editor.open(page.photo)
+    }
+}

=== modified file 'rc/qml/MediaViewer/GalleryPhotoComponent.qml'
--- rc/qml/MediaViewer/GalleryPhotoComponent.qml	2014-09-02 13:53:01 +0000
+++ rc/qml/MediaViewer/GalleryPhotoComponent.qml	2015-03-10 14:05:41 +0000
@@ -47,8 +47,8 @@
         // are smaller than preview's and automatically use that instead of a
         // full image load
 
-        // Load image using the Gallery image provider to ensure EXIF orientation
-        return isPreview ? mediaSource.galleryPreviewPath : mediaSource.galleryPath
+        // Load image using the photo image provider to ensure EXIF orientation
+        return "image://" + (isPreview ? "thumbnailer/" : "photo:/") + mediaSource.path;
     }
 
     /*!

=== added file 'rc/qml/MediaViewer/GalleryPhotoEditorPage.qml'
--- rc/qml/MediaViewer/GalleryPhotoEditorPage.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/GalleryPhotoEditorPage.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,42 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ */
+
+Page {
+    id: page
+    property string photo
+    signal done(bool photoWasModified)
+
+    title: i18n.tr("Edit Photo")
+
+    head.backAction: Action {
+        iconName: "back"
+        onTriggered: editor.close(true)
+    }
+    head.actions: editor.actions
+
+    PhotoEditor {
+        id: editor
+        anchors.fill: parent
+        onClosed: page.done(photoWasModified)
+    }
+
+    onActiveChanged: {
+        if (active) editor.open(page.photo)
+    }
+}

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2015-02-17 11:58:34 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2015-03-10 14:05:41 +0000
@@ -168,13 +168,10 @@
         }
 
         // Don't allow flicking while the chrome is actively displaying a popup
-        // menu, or the image is zoomed, or we're cropping. When images are zoomed,
-        // mouse drags should pan, not flick. Also don't flick during parameterized
-        // HUD action to prevent photo from changing during the action
+        // menu, or the image is zoomed. When images are zoomed,
+        // mouse drags should pan, not flick.
         interactive: currentItem != null &&
-                     !currentItem.userInteracting &&
-                     cropper.state == "hidden" &&
-                     !editHUD.actionActive
+                     !currentItem.userInteracting  // FIXME: disable when editing ??
 
         Component {
             id: contentItemComp
@@ -209,21 +206,6 @@
         }
 
         Component {
-            id: editPopoverComponent
-            EditPopover {
-                id: editPopover
-                objectName: "editPopover"
-                visible: false
-                photo: galleryPhotoViewer.media
-                cropper: viewerWrapper.cropper
-
-                onButtonPressed: {
-                    viewerWrapper.tools.opened = false;
-                }
-            }
-        }
-
-        Component {
             id: deleteDialog
             Dialog {
                 id: dialogue
@@ -312,118 +294,7 @@
         onNewAlbumPicked: {
             viewerWrapper.closeRequested();
         }
-    }
-
-    property alias cropper: cropper
-    CropInteractor {
-        id: cropper
-
-        property var targetPhoto
-
-        function show(photo) {
-            targetPhoto = photo;
-
-            fadeOutPhotoAnimation.running = true;
-        }
-
-        function hide() {
-            state = "hidden";
-            galleryPhotoViewer.opacity = 0.0;
-            galleryPhotoViewer.visible = true;
-            fadeInPhotoAnimation.running = true;
-        }
-
-        state: "hidden"
-        states: [
-            State { name: "shown";
-                PropertyChanges { target: cropper; visible: true; }
-                PropertyChanges { target: cropper; opacity: 1.0; }
-            },
-            State { name: "hidden";
-                PropertyChanges { target: cropper; visible: false; }
-                PropertyChanges { target: cropper; opacity: 0.0; }
-            }
-        ]
-
-        Behavior on opacity {
-            NumberAnimation { duration: Gallery.FAST_DURATION }
-        }
-
-        anchors.fill: parent
-
-        MouseArea {
-            id: blocker
-
-            visible: cropper.state == "shown"
-            anchors.fill: parent
-
-            onClicked: { }
-        }
-
-        onCanceled: {
-            photo.cancelCropping();
-            hide();
-            targetPhoto = null;
-        }
-
-        onCropped: {
-            var qtRect = Qt.rect(rect.x, rect.y, rect.width, rect.height);
-            photo.crop(qtRect);
-            hide();
-            targetPhoto = null;
-        }
-
-        onOpacityChanged: {
-            if (opacity == 1.0)
-                galleryPhotoViewer.visible = false
-        }
-
-        NumberAnimation {
-            id: fadeOutPhotoAnimation
-
-            from: 1.0
-            to: 0.0
-            target: galleryPhotoViewer
-            property: "opacity"
-            duration: Gallery.FAST_DURATION
-            easing.type: Easing.InOutQuad
-
-            onRunningChanged: {
-                if (running == false) {
-                    var ratio_crop_rect = cropper.targetPhoto.prepareForCropping();
-                    cropper.enter(cropper.targetPhoto, ratio_crop_rect);
-                    cropper.state = "shown";
-                }
-            }
-        }
-
-        NumberAnimation {
-            id: fadeInPhotoAnimation
-
-            from: 0.0
-            to: 1.0
-            target: galleryPhotoViewer
-            property: "opacity"
-            duration: Gallery.FAST_DURATION
-            easing.type: Easing.InOutQuad
-        }
-    }
-
-    EditPreview {
-        id: editPreview
-        objectName: "editPreview"
-        anchors.fill: parent
-        source: galleryPhotoViewer.media ? galleryPhotoViewer.media.galleryPreviewPath : ""
-
-        visible: editHUD.actionActive
-
-        exposure: editHUD.exposureValue
-
-        brightness: editHUD.brightness
-        contrast: editHUD.contrast
-        saturation: editHUD.saturation
-        hue: editHUD.hue
-    }
+    }  
 
     ActivityIndicator {
         id: busySpinner
@@ -433,13 +304,6 @@
         running: visible
     }
 
-    EditingHUD {
-        id: editHUD
-        photo: galleryPhotoViewer.media
-        onExposureActivated: editPreview.useExposure()
-        onColorBalanceActivated: editPreview.useColorBalance()
-    }
-
     Item {
         id: d
 
@@ -449,7 +313,23 @@
                 text: i18n.tr("Edit")
                 iconSource: "../../img/edit.png"
                 enabled: galleryPhotoViewer.media.type === MediaSource.Photo && galleryPhotoViewer.media.canBeEdited
-                onTriggered: PopupUtils.open(editPopoverComponent, null);
+                onTriggered: {
+                    var path = galleryPhotoViewer.media.path.toString();
+                    path = path.replace("file://", "")
+                    var editor;
+                    try {
+                        Qt.createQmlObject('import QtQuick 2.0; import Ubuntu.Components.Extras 0.2; Item {}', viewerWrapper);
+                        console.log("Loading PhotoEditor Components from Extras");
+                        editor = overview.pushPage(Qt.resolvedUrl("ExtrasPhotoEditorPage.qml"), { photo: path });
+                    } catch (e) {
+                        console.log("Loading PhotoEditor Components from Gallery code");
+                        editor = overview.pushPage(Qt.resolvedUrl("GalleryPhotoEditorPage.qml"), { photo: path });
+                    }
+                    editor.done.connect(function(photoWasModified) {
+                        if (photoWasModified) galleryPhotoViewer.media.dataChanged();
+                        overview.popPage();
+                    });
+                }
             },
             Action {
                 objectName: "addButton"

=== added directory 'rc/qml/MediaViewer/PhotoEditor'
=== added file 'rc/qml/MediaViewer/PhotoEditor.qml'
--- rc/qml/MediaViewer/PhotoEditor.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+import Gallery 1.0
+import "PhotoEditor"
+
+Item {
+    id: editor
+    property string photo
+    property bool modified: stack.modified
+
+    signal closed(bool photoWasModified)
+
+    property list<Action> actions
+    actions: [stack.undoAction, stack.redoAction]
+
+    EditStack {
+        id: stack
+        data: photoData
+        actionsEnabled: !exposureSelector.visible && !cropper.visible && !photoData.busy
+        onRevertRequested: PopupUtils.open(revertPromptComponent)
+    }
+
+    property list<Action> toolActions: [
+        Action {
+            objectName: "cropButton"
+            text: i18n.tr("Crop")
+            iconSource: Qt.resolvedUrl("PhotoEditor/assets/edit_crop.png")
+            onTriggered: {
+                photoData.isLongOperation = false;
+                cropper.start("image://photo/" + photoData.path);
+            }
+        },
+        Action {
+            objectName: "rotateButton"
+            text: i18n.tr("Rotate")
+            iconSource: Qt.resolvedUrl("PhotoEditor/assets/edit_rotate_left.png")
+            onTriggered: {
+                photoData.isLongOperation = false;
+                photoData.rotateRight()
+            }
+        }
+    ]
+
+    function close(saveIfModified) {
+        stack.endEditingSession(saveIfModified);
+        editor.closed(editor.modified);
+    }
+
+    function open(photo) {
+        editor.photo = photo;
+        stack.startEditingSession(photo);
+        photoData.path = stack.currentFile;
+        image.source = "image://photo/" + photoData.path;
+    }
+
+    Rectangle {
+        color: "black"
+        anchors.fill: parent
+    }
+
+    Image {
+        id: image
+        anchors.fill: parent
+        asynchronous: true
+        cache: false
+        source: photoData.path ? "image://photo/" + photoData.path : ""
+        fillMode: Image.PreserveAspectFit
+        sourceSize {
+            width: image.width
+            height: image.height
+        }
+
+        function reload() {
+            image.asynchronous = false;
+            image.source = "";
+            image.asynchronous = true;
+            image.source = "image://photo/" + photoData.path;
+        }
+    }
+
+    GalleryPhotoData {
+        id: photoData
+        onDataChanged: image.reload()
+        property bool isLongOperation: false
+
+        onEditFinished: {
+            console.log("Edit finished")
+            // If we are editing exposure we don't need to checkpoint at every
+            // edit, and the exposure UI will checkpoint when the user confirms.
+            if (exposureSelector.opacity > 0) exposureSelector.reload()
+            else stack.checkpoint()
+        }
+    }
+
+    Loader {
+        id: cropper
+
+        anchors.fill: parent
+
+        opacity: 0.0
+        visible: opacity > 0
+        Behavior on opacity { UbuntuNumberAnimation { } }
+
+        Connections {
+            target: cropper.item
+            ignoreUnknownSignals: true
+            onCropped: {
+                var qtRect = Qt.rect(rect.x, rect.y, rect.width, rect.height);
+                photoData.crop(qtRect);
+                cropper.opacity = 0.0;
+                cropper.source = ""
+            }
+            onCanceled: {
+                cropper.opacity = 0.0;
+                cropper.source = ""
+            }
+        }
+
+        function start(target) {
+            source = "PhotoEditor/CropInteractor.qml";
+            item.targetPhoto = target;
+        }
+
+        onLoaded: opacity = 1.0
+    }
+
+    ExposureAdjuster {
+        id: exposureSelector
+        anchors.fill: parent
+        opacity: 0.0
+        enabled: !photoData.busy
+        onExposureChanged: {
+            // Restore the starting version of the image, otherwise we will
+            // accumulate compensations over the previous ones.
+            stack.restoreSnapshot(stack.level)
+            photoData.exposureCompensation(exposure)
+        }
+        onConfirm: {
+            stack.checkpoint();
+            exposureSelector.opacity = 0.0
+        }
+        onCancel: {
+            stack.restoreSnapshot(stack.level)
+            exposureSelector.opacity = 0.0
+        }
+        visible: opacity > 0
+    }
+
+    ActionsBar {
+        id: actionsBar
+        objectName: "editorActionsBar"
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        visible: opacity > 0.0
+        opacity: (exposureSelector.opacity == 0 && cropper.opacity == 0) ? 1.0 : 0.0
+
+        enabled: !photoData.busy
+        toolActions: {
+            // This is necessary because QML does not let us declare a list with
+            // mixed component declarations and identifiers, like this:
+            // property list<Action> foo: { Action{}, someOtherAction }
+            var list = [];
+            for (var i = 0; i < editor.toolActions.length; i++)
+                list.push(editor.toolActions[i]);
+            list.push(stack.revertAction);
+            return list;
+        }
+
+        Behavior on opacity { UbuntuNumberAnimation {} }
+    }
+
+    Component {
+          id: revertPromptComponent
+          Dialog {
+              id: revertPrompt
+              objectName: "revertPromptDialog"
+              title: i18n.tr("Revert to original")
+              text: i18n.tr("This will undo all edits, including those from previous sessions.")
+
+              Row {
+                  id: row
+                  width: parent.width
+                  spacing: units.gu(1)
+                  Button {
+                      objectName: "cancelRevertButton"
+                      width: parent.width/2
+                      text: i18n.tr("Cancel")
+                      onClicked: PopupUtils.close(revertPrompt)
+                  }
+                  Button {
+                      objectName: "confirmRevertButton"
+                      width: parent.width/2
+                      text: i18n.tr("Revert Photo")
+                      color: UbuntuColors.green
+                      onClicked: {
+                          PopupUtils.close(revertPrompt)
+                          stack.revertToPristine()
+                      }
+                  }
+              }
+          }
+     }
+
+    BusyIndicator {
+        id: busyIndicator
+        anchors.centerIn: parent
+        text: i18n.tr("Enhancing photo...")
+        running: photoData.busy
+        longOperation: photoData.isLongOperation
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/ActionsBar.qml'
--- rc/qml/MediaViewer/PhotoEditor/ActionsBar.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/ActionsBar.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Column {
+    id: bar
+    property list<Action> toolActions
+    property list<Action> filterActions
+    property bool enabled
+
+    height: (filtersBar.visible) ? units.gu(20) : units.gu(6)
+
+    Item {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: units.gu(6)
+
+        Rectangle {
+            anchors.fill: parent
+            color: "black"
+            opacity: 0.6
+        }
+
+        ListView {
+            id: toolsBar
+            anchors.fill: parent
+            orientation: ListView.Horizontal
+            model: toolActions
+
+            delegate: AbstractButton {
+                width: units.gu(8)
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                action: modelData
+                enabled: bar.enabled
+
+                Icon {
+                    anchors.centerIn: parent
+                    name: modelData.iconName
+                    source: modelData.iconSource
+                    width: units.gu(3)
+                    height: units.gu(3)
+                    opacity: modelData.enabled && parent.enabled ? 1.0 : 0.5
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: units.gu(14)
+        color: "black"
+
+        ListView {
+            id: filtersBar
+            visible: filterActions.length > 0
+
+            orientation: ListView.Horizontal
+            model: filterActions
+
+            delegate: ListItem.Standard {
+                width: parent.height
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                action: modelData
+                iconFrame: false
+                enabled: bar.enabled
+            }
+        }
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/BusyIndicator.qml'
--- rc/qml/MediaViewer/PhotoEditor/BusyIndicator.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/BusyIndicator.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 0.1
+
+Item {
+    id: busy
+    width: childrenRect.width
+    height: childrenRect.height
+    property alias text: label.text
+    property alias running: spinner.running
+    property bool longOperation: false
+
+    visible: running
+
+    UbuntuShape {
+        color: "white"
+        anchors.centerIn: parent
+        width: parent.width + units.gu(4)
+        height: parent.height + units.gu(4)
+        opacity: longOperation ? 0.75 : 0
+    }
+
+    Column {
+        id: column
+        anchors.centerIn: parent
+        width: childrenRect.width
+        spacing: units.gu(2)
+
+        ActivityIndicator {
+            id: spinner
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+
+        Label {
+            id: label
+            anchors.horizontalCenter: parent.horizontalCenter
+            horizontalAlignment: Text.AlignHCenter
+            visible: longOperation
+        }
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/CropCorner.qml'
--- rc/qml/MediaViewer/PhotoEditor/CropCorner.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/CropCorner.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Charles Lindsay <[e-mail]>
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+// A corner of a CropFrame.
+Item {
+    id: cropCorner
+
+    /*!
+    */
+    signal dragged(real dx, real dy)
+    /*!
+    */
+    signal dragStarted()
+    /*!
+    */
+    signal dragCompleted()
+
+    /*!
+    */
+    property bool isLeft: true
+    /*!
+    */
+    property bool isTop: true
+
+    x: isLeft ? -(width/2) : parent.width - (width/2)
+    y: isTop ? -(width/2) : parent.height - (width/2)
+    width: handle.width
+    height: handle.height
+
+    Image {
+        id: handle
+        anchors.centerIn: parent
+        source: Qt.resolvedUrl("assets/crop-handle.png")
+    }
+
+    CropDragArea {
+        anchors.centerIn: parent
+        width: handle.width + units.gu(2)
+        height: handle.height + units.gu(2)
+
+        onDragged: cropCorner.dragged(dx, dy)
+
+        onDragStarted: cropCorner.dragStarted()
+
+        onDragCompleted: cropCorner.dragCompleted()
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/CropDragArea.qml'
--- rc/qml/MediaViewer/PhotoEditor/CropDragArea.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/CropDragArea.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Charles Lindsay <[e-mail]>
+ */
+
+import QtQuick 2.3
+
+// A MouseArea meant to drag a corner/edge of a crop area.
+MouseArea {
+    id: cropDragArea
+
+    /*!
+    */
+    signal dragged(real dx, real dy)
+    /*!
+    */
+    signal dragStarted()
+    /*!
+    */
+    signal dragCompleted()
+
+    // Since we're usually moving this area with the mouse in response to
+    // dragging, we don't need to capture the last x/y, just where it was
+    // grabbed.
+    property real grabX: -1
+    /*!
+    */
+    property real grabY: -1
+
+    onPressed: {
+        dragStarted();
+
+        grabX = mouse.x;
+        grabY = mouse.y;
+    }
+
+    onReleased: {
+        dragCompleted();
+    }
+
+    onPositionChanged: cropDragArea.dragged(mouse.x - grabX, mouse.y - grabY)
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/CropInteractor.qml'
--- rc/qml/MediaViewer/PhotoEditor/CropInteractor.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/CropInteractor.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Charles Lindsay <[e-mail]>
+ * Lucas Beeler <[e-mail]>
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import "GraphicsRoutines.js" as GraphicsRoutines
+
+/*!
+*/
+Rectangle {
+    id: cropInteractor
+    objectName: "cropInteractor"
+
+    color: "black"
+
+    property alias targetPhoto: original.source
+
+    property string matteColor: "black"
+    property real matteOpacity: 0.6
+
+    // Note: each element of the cropped rect will be in the range [0,1], since
+    // in the UI we aren't using direct photo pixel values.
+    signal cropped(variant rect)
+    signal canceled()
+
+    function computeRectSet() {
+        var actualImage = Qt.rect(
+            (original.width - original.paintedWidth) / 2.0,
+            (original.height - original.paintedHeight) / 2.0,
+            original.paintedWidth,
+            original.paintedHeight
+        );
+        var photoPreview = GraphicsRoutines.fitRect(viewport, actualImage);
+
+        var unfitCrop = Qt.rect(0, 0, photoPreview.width, photoPreview.height);
+        var cropFrame = GraphicsRoutines.fitRect(viewport, unfitCrop);
+
+        var photoExtent = Qt.rect(cropFrame.x, cropFrame.y,
+                                  cropFrame.scaleFactor * photoPreview.width,
+                                  cropFrame.scaleFactor * photoPreview.height);
+
+        return {
+            photoPreview: photoPreview,
+            cropFrame: cropFrame,
+            photoExtent: photoExtent,
+            photoExtentScale: cropFrame.scaleFactor
+        };
+    }
+
+    Item {
+        id: viewport
+
+        anchors.fill: parent
+        anchors.margins: units.gu(6)
+        z: 1
+    }
+
+    CropOverlay {
+        id: overlay
+        objectName: "cropOverlay"
+
+        property real minSize: units.gu(4)
+
+        anchors.fill: parent;
+        visible: false;
+
+        photo: original
+        viewport: viewport
+
+        matteColor: cropInteractor.matteColor
+        matteOpacity: cropInteractor.matteOpacity
+
+        z: 16
+
+        onMatteRegionPressed: {
+            cropInteractor.canceled();
+        }
+
+        onCropButtonPressed: {
+            original.visible = false;
+            overlay.visible = false;
+            original.scale = 1.0;
+            var r = overlay.getRelativeFrameRect()
+            cropInteractor.cropped(overlay.getRelativeFrameRect());
+        }
+    }
+
+    Image {
+        id: original
+
+        x: viewport.x
+        y: viewport.y
+        width: viewport.width
+        height: viewport.height
+        transformOrigin: Item.TopLeft
+        fillMode: Image.PreserveAspectFit
+        cache: false
+        sourceSize {
+            width: original.width
+            height: original.height
+        }
+
+        onStatusChanged: {
+            if (status == Image.Ready) {
+                var rects = computeRectSet();
+
+                overlay.initialFrameX = rects.cropFrame.x;
+                overlay.initialFrameY = rects.cropFrame.y;
+                overlay.initialFrameWidth = rects.cropFrame.width;
+                overlay.initialFrameHeight = rects.cropFrame.height;
+
+                overlay.resetFor(rects);
+                overlay.visible = true;
+
+                x = rects.photoExtent.x;
+                y = rects.photoExtent.y;
+                width = rects.photoPreview.width;
+                height = rects.photoPreview.height;
+                scale = rects.photoExtentScale;
+            }
+        }
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml'
--- rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,581 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Charles Lindsay <[e-mail]>
+ * Lucas Beeler <[e-mail]>
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import "GraphicsRoutines.js" as GraphicsRoutines
+
+/* A CropOverlay is a semi-transparent surface that floats over the photo. It
+ * serves two purposes. First, it provides visual cueing as to what region of
+ * the photo's surface will be preserved when the crop operation is applied.
+ * The preserved region is the region that falls inside of the CropOverlay's
+ * frame. Second, the CropOverlay allows the user to manipulate the
+ * geometry of the crop frame, to chage its location, width, and height. The
+ * geometry of the crop frame is reinforced by a key visual cue: the region of
+ * the photo outside of the crop frame is drawn with a semi-transparent, smoked
+ * matte on top of it. This matte surrounds the crop frame.
+ */
+Item {
+    id: cropOverlay
+
+    // public properties
+    /*!
+    */
+    property Item viewport
+    /*!
+    */
+    property Item photo
+    /*!
+    */
+    property string matteColor: "red"
+    /*!
+    */
+    property real matteOpacity: 0.85
+    /*!
+    */
+    property int initialFrameX: -1
+    /*!
+    */
+    property int initialFrameY: -1
+    /*!
+    */
+    property int initialFrameWidth: -1
+    /*!
+    */
+    property int initialFrameHeight: -1
+
+    // private properties -- Frame Fit Animation parameters
+    property real interpolationFactor: 1.0
+    /*!
+    */
+    property variant startFrame
+    /*!
+    */
+    property variant endFrame
+    /*!
+    */
+    property variant startPhoto
+    /*!
+    */
+    property real referencePhotoWidth: -1
+    /*!
+    */
+    property real referencePhotoHeight: -1
+    /*!
+    */
+    property real endPhotoX
+    /*!
+    */
+    property real endPhotoY
+    /*!
+    */
+    property real endPhotoWidth
+    /*!
+    */
+    property real endPhotoHeight
+
+    /*!
+    */
+    signal userAlteredFrame()
+    /*!
+    */
+    signal runFrameFitAnimation()
+    /*!
+    */
+    signal matteRegionPressed()
+    /*!
+    */
+    signal cropButtonPressed()
+
+    /*!
+    */
+    function resetFor(rectSet) {
+        if (initialFrameX != -1 && initialFrameY != -1 && initialFrameWidth != -1 &&
+                initialFrameHeight != -1) {
+            frame.x = rectSet.cropFrame.x;
+            frame.y = rectSet.cropFrame.y;
+            frame.width = rectSet.cropFrame.width;
+            frame.height = rectSet.cropFrame.height;
+            photoExtent.x = rectSet.photoExtent.x;
+            photoExtent.y = rectSet.photoExtent.y;
+            photoExtent.width = rectSet.photoExtent.width;
+            photoExtent.height = rectSet.photoExtent.height;
+            referencePhotoWidth = rectSet.photoPreview.width;
+            referencePhotoHeight = rectSet.photoPreview.height;
+        }
+    }
+
+    /* Return the (x, y) position and the width and height of the viewport
+    */
+    function getViewportExtentRect() {
+        return GraphicsRoutines.cloneRect(viewport);
+    }
+
+    /* Return the (x, y) position and the width and height of the photoExtent.
+     * The photoExtent is the on-screen region that holds the original photo
+     * preview.
+     */
+    function getPhotoExtentRect() {
+        return GraphicsRoutines.cloneRect(photoExtent);
+    }
+
+    /*!
+    */
+    function getRelativeFrameRect() {
+        return GraphicsRoutines.getRelativeRect(frame.getExtentRect(),
+                                                getPhotoExtentRect());
+    }
+
+    anchors.fill: parent
+
+    Item {
+        id: photoExtent
+
+        property real panStartX
+        property real panStartY
+
+        function startPan() {
+            panStartX = x;
+            panStartY = y;
+        }
+
+        // 'deltaX' and 'deltaY' are offsets relative to the pan start point
+        function updatePan(deltaX, deltaY) {
+            var newX = panStartX + deltaX;
+            var newY = panStartY + deltaY;
+
+            x = GraphicsRoutines.clamp(newX, frame.x + frame.width -
+                                       photoExtent.width, frame.x);
+            y = GraphicsRoutines.clamp(newY, frame.y + frame.height -
+                                       photoExtent.height, frame.y);
+        }
+
+        function stopPan() {
+        }
+
+        x: initialFrameX
+        y: initialFrameY
+        width: initialFrameWidth
+        height: initialFrameHeight
+        z: 1
+
+        onXChanged: {
+            if (photo)
+                photo.x = x;
+        }
+
+        onYChanged: {
+            if (photo)
+                photo.y = y;
+        }
+
+        onWidthChanged: {
+            if (photo && referencePhotoWidth > 0)
+                photo.scale = width / referencePhotoWidth;
+        }
+
+        onHeightChanged: {
+            if (photo && referencePhotoHeight > 0)
+                photo.scale = height / referencePhotoHeight;
+        }
+    }
+
+    //
+    // The following four Rectangles are used to "matte out" the area of the photo
+    // preview that falls outside the frame. This "matting out" visual cue is
+    // accomplished by darkening the matted-out area with a translucent, smoked
+    // overlay.
+    //
+    Rectangle {
+        id: leftMatte
+
+        color: cropOverlay.matteColor
+        opacity: cropOverlay.matteOpacity
+
+        anchors.top: topMatte.bottom
+        anchors.bottom: frame.bottom
+        anchors.left: parent.left
+        anchors.right: frame.left
+
+        MouseArea {
+            anchors.fill: parent;
+
+            onPressed: cropOverlay.matteRegionPressed();
+        }
+    }
+
+    Rectangle {
+        id: topMatte
+
+        color: cropOverlay.matteColor
+        opacity: cropOverlay.matteOpacity
+
+        anchors.top: parent.top
+        anchors.bottom: frame.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        MouseArea {
+            anchors.fill: parent;
+
+            onPressed: cropOverlay.matteRegionPressed();
+        }
+    }
+
+    Rectangle {
+        id: rightMatte
+
+        color: cropOverlay.matteColor
+        opacity: cropOverlay.matteOpacity
+
+        anchors.top: topMatte.bottom
+        anchors.bottom: bottomMatte.top
+        anchors.left: frame.right
+        anchors.right: parent.right
+
+        MouseArea {
+            anchors.fill: parent;
+
+            onPressed: cropOverlay.matteRegionPressed();
+        }
+    }
+
+    Rectangle {
+        id: bottomMatte
+
+        color: cropOverlay.matteColor
+        opacity: cropOverlay.matteOpacity
+
+        anchors.top: frame.bottom
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        MouseArea {
+            anchors.fill: parent;
+
+            onPressed: cropOverlay.matteRegionPressed();
+        }
+    }
+
+    //
+    // The frame is a grey rectangle with associated drag corners that
+    // frames the region of the photo that will remain when the crop operation is
+    // applied.
+    //
+    // NB: the frame can be in two states, although the QML state mechanism
+    //     isn't sufficiently expressive to describe them. The frame can be
+    //     in the FIT state, in which case it is optimally fit inside the
+    //     frame constraint region (see getFrameConstraintRect( ) above for
+    //     a description of the frame constraint region). Or, the frame can
+    //     be in the USER state. In the user state, the user has the mouse button
+    //     held down and is actively performing a drag operation to change the
+    //     geometry of the frame.
+    //
+    Rectangle {
+        id: frame
+
+        signal resizedX(bool left, real dx)
+        signal resizedY(bool top, real dy)
+
+        property variant dragStartRect
+
+        function getExtentRect() {
+            var result = { };
+
+            result.x = x;
+            result.y = y;
+            result.width = width;
+            result.height = height;
+
+            return result;
+        }
+
+        x: cropOverlay.initialFrameX
+        y: cropOverlay.initialFrameY
+        width: cropOverlay.initialFrameWidth
+        height: cropOverlay.initialFrameHeight
+
+        color: "transparent"
+
+        border.width: units.gu(0.2)
+        border.color: "#19B6EE"
+
+        MouseArea {
+            id: panArea
+
+            property int dragStartX;
+            property int dragStartY;
+
+            anchors.fill: parent
+            anchors.margins: 2
+
+            onPressed: {
+                dragStartX = mouse.x;
+                dragStartY = mouse.y;
+
+                photoExtent.startPan();
+            }
+
+            onReleased: {
+                photoExtent.stopPan();
+            }
+
+            onPositionChanged: {
+                photoExtent.updatePan(mouse.x - dragStartX, mouse.y - dragStartY);
+            }
+        }
+
+        Button {
+            objectName: "centerCropIcon"
+            anchors.centerIn: parent
+            text: i18n.tr("Crop")
+            color: frame.border.color
+            opacity: 0.9
+            onClicked: cropOverlay.cropButtonPressed()
+        }
+
+        // Left drag bar.
+        CropDragArea {
+            x: -units.gu(2)
+            width: units.gu(3)
+            anchors.verticalCenter: parent.center
+            height: parent.height - units.gu(2)
+
+            onDragged: {
+                frame.resizedX(true, dx);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Top drag bar.
+        CropDragArea {
+            y: -units.gu(2)
+            height: units.gu(3)
+            anchors.horizontalCenter: parent.center
+            width: parent.width - units.gu(2)
+
+            onDragged: {
+                frame.resizedY(true, dy);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Right drag bar.
+        CropDragArea {
+            x: parent.width - units.gu(1)
+            width: units.gu(3)
+            anchors.verticalCenter: parent.center
+            height: parent.height - units.gu(2)
+
+            onDragged: {
+                frame.resizedX(false, dx);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Bottom drag bar.
+        CropDragArea {
+            y: parent.height - units.gu(1)
+            height: units.gu(3)
+            anchors.horizontalCenter: parent.center
+            width: parent.width - units.gu(2)
+
+            onDragged: {
+                frame.resizedY(false, dy);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Top-left corner.
+        CropCorner {
+            objectName: "topLeftCropCorner"
+            isLeft: true
+            isTop: true
+
+            onDragged: {
+                frame.resizedX(isLeft, dx);
+                frame.resizedY(isTop, dy);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Top-right corner.
+        CropCorner {
+            objectName: "topRightCropCorner"
+            isLeft: false
+            isTop: true
+
+            onDragged: {
+                frame.resizedX(isLeft, dx);
+                frame.resizedY(isTop, dy);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Bottom-left corner.
+        CropCorner {
+            objectName: "bottonLeftCropCorner"
+            isLeft: true
+            isTop: false
+
+            onDragged: {
+                frame.resizedX(isLeft, dx);
+                frame.resizedY(isTop, dy);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // Bottom-right corner.
+        CropCorner {
+            id: bottomRightCrop
+            objectName: "bottomRightCropCorner"
+            isLeft: false
+            isTop: false
+
+            onDragged: {
+                frame.resizedX(isLeft, dx);
+                frame.resizedY(isTop, dy);
+                frame.updateOnAltered(false);
+            }
+
+            onDragStarted: frame.dragStartRect = frame.getExtentRect();
+            onDragCompleted: frame.updateOnAltered(true);
+        }
+
+        // This handles resizing in both dimensions.  first is whether we're
+        // resizing the "first" edge, e.g. left or top (in which case we
+        // adjust both position and span) vs. right or bottom (where we just
+        // adjust the span).  position should be either "x" or "y", and span
+        // is either "width" or "height".  This is a little complicated, and
+        // coule probably be optimized with a little more thought.
+        function resizeFrame(first, delta, position, span) {
+            var constraintRegion = cropOverlay.getPhotoExtentRect();
+
+            if (first) {
+                // Left/top side.
+                if (frame[position] + delta < constraintRegion[position])
+                    delta = constraintRegion[position] - frame[position]
+
+                if (frame[span] - delta < minSize)
+                    delta = frame[span] - minSize;
+
+                frame[position] += delta;
+                frame[span] -= delta;
+            } else {
+                // Right/bottom side.
+                if (frame[span] + delta < minSize)
+                    delta = minSize - frame[span];
+
+                if ((frame[position] + frame[span] + delta) >
+                        (constraintRegion[position] + constraintRegion[span]))
+                    delta = constraintRegion[position] + constraintRegion[span] -
+                            frame[position] - frame[span];
+
+                frame[span] += delta;
+            }
+        }
+
+        onResizedX: resizeFrame(left, dx, "x", "width")
+        onResizedY: resizeFrame(top, dy, "y", "height")
+
+        function updateOnAltered(finalUpdate) {
+            var start = frame.dragStartRect;
+            var end = frame.getExtentRect();
+            if (!GraphicsRoutines.areEqual(end, start)) {
+                if (finalUpdate ||
+                    (end.width * end.height >= start.width * start.height)) {
+                    cropOverlay.userAlteredFrame();
+                    cropOverlay.runFrameFitAnimation();
+                }
+            }
+        }
+    }
+
+    /* Invoked when the user has changed the geometry of the frame by dragging
+     * one of its corners or edges. Expressed in terms of the states of the
+     * frame described above, the userAlteredFrame signal is fired
+     * when the user stops dragging. This triggers a change of the frame
+     * from the USER state to the FIT state
+     */
+    onUserAlteredFrame: {
+        // since the geometry of the frame in the FIT state depends on both
+        // how the user resized the frame when it was in the USER state as well
+        // as the size of the frame constraint region, we have to recompute the
+        // geometry of of the frame for the FIT state every time.
+
+        startFrame = GraphicsRoutines.cloneRect(frame);
+
+        endFrame = GraphicsRoutines.fitRect(getViewportExtentRect(),
+                                            frame.getExtentRect());
+
+        startPhoto = GraphicsRoutines.cloneRect(photoExtent);
+
+        var frameRelativeToPhoto = getRelativeFrameRect();
+        var scaleFactor = endFrame.width / frame.width;
+
+        endPhotoWidth = photoExtent.width * scaleFactor;
+        endPhotoHeight = photoExtent.height * scaleFactor;
+        endPhotoX = endFrame.x - (frameRelativeToPhoto.x * endPhotoWidth);
+        endPhotoY = endFrame.y - (frameRelativeToPhoto.y * endPhotoHeight)
+
+        photo.transformOrigin = Item.TopLeft;
+    }
+
+    onRunFrameFitAnimation: NumberAnimation { target: cropOverlay;
+        property: "interpolationFactor"; from: 0.0; to: 1.0 }
+
+    onInterpolationFactorChanged: {
+        var endPhotoRect = { };
+        endPhotoRect.x = endPhotoX;
+        endPhotoRect.y = endPhotoY;
+        endPhotoRect.width = endPhotoWidth;
+        endPhotoRect.height = endPhotoHeight;
+
+        var interpolatedRect = GraphicsRoutines.interpolateRect(startFrame,
+                                                                endFrame, interpolationFactor);
+        GraphicsRoutines.sizeToRect(interpolatedRect, frame);
+
+        interpolatedRect = GraphicsRoutines.interpolateRect(startPhoto,
+                                                            endPhotoRect, interpolationFactor);
+        GraphicsRoutines.sizeToRect(interpolatedRect, photoExtent);
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/EditStack.qml'
--- rc/qml/MediaViewer/PhotoEditor/EditStack.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/EditStack.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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.3
+import Ubuntu.Components 1.1
+import Gallery 1.0
+
+Item {
+    property GalleryPhotoData data
+    property bool actionsEnabled: true
+    property var items: []
+    property int level: 0
+    property string editingSessionPath
+    property string currentFile
+    property string originalFile
+    property string pristineFile
+    property bool modified: level > 0 || _revertedInThisSession
+
+    property bool _revertedInThisSession
+    property bool _pristineFileExists
+
+    signal revertRequested
+
+    function startEditingSession(original) {
+        var originalFileName = GalleryFileUtils.nameFromPath(original);
+        var baseName = GalleryFileUtils.parentDirectory(original) +
+                       "/.photo_editing." + originalFileName + ".";
+        editingSessionPath = GalleryFileUtils.createTemporaryDirectory(baseName);
+        if (editingSessionPath == "") return false;
+
+        originalFile = original;
+        currentFile = editingSessionPath + "/current";
+
+        pristineFile = GalleryFileUtils.parentDirectory(original) +
+                       "/.original/" + originalFileName
+        _revertedInThisSession = false;
+        _pristineFileExists = GalleryFileUtils.exists(pristineFile)
+
+        GalleryFileUtils.copy(originalFile, currentFile)
+
+        items = [createSnapshot(0)];
+        level = 0;
+        return true;
+    }
+
+    function endEditingSession(saveIfModified) {
+        if (saveIfModified && modified) { // file modified
+            // if we don't have a copy of the very first original, create one
+            if (!_pristineFileExists) {
+                GalleryFileUtils.createDirectory(GalleryFileUtils.parentDirectory(pristineFile));
+                GalleryFileUtils.copy(originalFile, pristineFile);
+            } else {
+                // if we reverted to original (and made no other changes)
+                // we don't need to keep the pristine copy around
+                if (_revertedInThisSession && level <= 0) {
+                    GalleryFileUtils.remove(pristineFile);
+                }
+            }
+
+            GalleryFileUtils.copy(currentFile, originalFile); // actually save
+        }
+
+        GalleryFileUtils.removeDirectory(editingSessionPath, true); // clear editing cache
+        editingSessionPath = originalFile = pristineFile = currentFile = "";
+    }
+
+    function createSnapshot(name) {
+        var snapshotFile = editingSessionPath + "/edit." + name;
+        GalleryFileUtils.copy(currentFile, snapshotFile);
+        return snapshotFile;
+    }
+
+    function restoreSnapshot(name) {
+        var snapshotFile = editingSessionPath + "/edit." + name;
+        GalleryFileUtils.copy(snapshotFile, currentFile);
+        data.refreshFromDisk();
+    }
+
+    function checkpoint() {
+        level++;
+        items = items.slice(0, level);
+        items.push(createSnapshot(items.length));
+    }
+
+    function revertToPristine() {
+        if (!GalleryFileUtils.exists(pristineFile)) {
+            restoreSnapshot(0);
+            items = items.slice(0, 1);
+            level = 0;
+        } else {
+            GalleryFileUtils.copy(pristineFile, currentFile);
+            data.refreshFromDisk();
+            items = [];
+            checkpoint();
+            level = 0;
+            _revertedInThisSession = true;
+        }
+    }
+
+    property Action undoAction: Action {
+            text: i18n.tr("Undo")
+            iconName: "undo"
+            enabled: items.length > 0 && level > 0 && actionsEnabled
+            onTriggered: restoreSnapshot(--level);
+    }
+
+    property Action redoAction: Action {
+            text: i18n.tr("Redo")
+            iconName: "redo"
+            enabled: level < items.length - 1 && actionsEnabled
+            onTriggered: restoreSnapshot(++level);
+    }
+
+    property Action revertAction: Action {
+            text: i18n.tr("Revert to Original")
+            iconSource: Qt.resolvedUrl("assets/edit_revert.png")
+            enabled: actionsEnabled &&
+                     (level > 0 || (!_revertedInThisSession && _pristineFileExists))
+            onTriggered: revertRequested()
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml'
--- rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml	2015-03-10 14:05:41 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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.3
+import Ubuntu.Components 1.1
+
+// When the photo editor uses a proper PageStack this will switch back to being
+// an Item as it will not need to cover what is below it.
+Rectangle {
+    id: adjuster
+    color:"black"
+
+    property alias exposure: exposureSelector.value
+    property bool enabled
+
+    signal confirm()
+    signal cancel()
+
+    Image {
+        id: targetImage
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectFit
+        asynchronous: true
+        cache: false
+        sourceSize {
+            width: targetImage.width
+            height: targetImage.height
+        }
+    }
+
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        anchors.margins: units.gu(2)
+        spacing: units.gu(2)
+
+        Slider {
+            id: exposureSelector
+            live: false
+            minimumValue: -1.0
+            maximumValue: +1.0
+            value: 0.0
+            enabled: adjuster.enabled
+
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: units.gu(2)
+
+            function formatValue(value) {
+                return (Math.round(value * 100) / 100).toString()
+            }
+        }
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: units.gu(2)
+            Button {
+                text: i18n.tr("Done")
+                color: UbuntuColors.green
+                enabled: adjuster.enabled
+                onTriggered: {
+                    targetImage.source = "";
+                    confirm();
+                }
+            }
+            Button {
+                text: i18n.tr("Cancel")
+                color: UbuntuColors.red
+                enabled: adjuster.enabled
+                onTriggered: {
+                    targetImage.source = "";
+                    cancel();
+                }
+            }
+        }
+    }
+
+    function start(target) {
+        targetImage.source = target;
+        exposure = 0.0;
+        opacity = 1.0;
+    }
+
+    function reload() {
+        var path = targetImage.source;
+        targetImage.asynchronous = false;
+        targetImage.source = "";
+        targetImage.asynchronous = true;
+        targetImage.source = path;
+    }
+}

=== added file 'rc/qml/MediaViewer/PhotoEditor/GraphicsRoutines.js'
--- rc/qml/MediaViewer/PhotoEditor/GraphicsRoutines.js	1970-01-01 00:00:00 +0000
+++ rc/qml/MediaViewer/PhotoEditor/GraphicsRoutines.js	2015-03-10 14:05:41 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Lucas Beeler <[e-mail]>
+ */
+
+/* Given 'input', constrain the value of 'input' to range between
+ * 'lowConstraint' and 'highConstraint', inclusive. Return the constrained
+ * value without modifying 'input'.
+ */
+function clamp(input, lowConstraint, highConstraint) {
+  if (input < lowConstraint)
+    return lowConstraint;
+  else if (input > highConstraint)
+    return highConstraint;
+  else
+    return input;
+}
+
+function cloneRect(source) {
+  var ret = { };
+  ret.x = source.x;
+  ret.y = source.y;
+  ret.width = source.width;
+  ret.height = source.height;
+  
+  return ret;
+}
+
+function interpolateRect(start, end, factor) {
+  var result = { };
+
+  result.x = start.x + factor * (end.x - start.x);
+  result.y = start.y + factor * (end.y - start.y);
+  result.width = start.width + factor * (end.width - start.width);
+  result.height = start.height + factor * (end.height - start.height);
+
+  return result;
+}
+
+/* Forces Geometry object 'item' to fit centered inside Geometry object
+ * 'viewport', preserving the aspect of ratio of 'item' but potentially scaling
+ * and translating it so that it snugly fits centered inside of 'viewport'.
+ * Return the new scaled-up and translated Geometry for 'item'.
+ */
+function fitRect(viewport, item) {
+  if (item.width == 0 || item.height == 0) {
+      return viewport;
+  }
+
+  var itemAspectRatio = item.width / item.height;
+  var viewportAspectRatio = viewport.width / viewport.height;
+
+  var result = { };
+  if (itemAspectRatio > viewportAspectRatio) {
+    var scaleFactor = viewport.width / item.width;
+    result.width = viewport.width;
+    result.height = item.height * scaleFactor
+  } else {
+    scaleFactor = viewport.height / item.height;
+    result.width = item.width * scaleFactor
+    result.height = viewport.height;
+  }
+
+  result.width = clamp(result.width, 0, viewport.width);
+  result.height = clamp(result.height, 0, viewport.height);
+  result.x = viewport.x + (viewport.width - result.width) / 2;
+  result.y = viewport.y + (viewport.height - result.height) / 2;
+  result.scaleFactor = scaleFactor;
+
+  return result;
+}
+
+function getRelativeRect(geom, relativeTo) {
+  var result = { };
+
+  result.x = (geom.x - relativeTo.x) / relativeTo.width;
+  result.y = (geom.y - relativeTo.y) / relativeTo.height;
+  result.width = geom.width / relativeTo.width;
+  result.height = geom.height / relativeTo.height;
+
+  return result;
+}
+
+function sizeToRect(rect, qmlItem) {
+  qmlItem.x = rect.x;
+  qmlItem.y = rect.y;
+  qmlItem.width = rect.width;
+  qmlItem.height = rect.height;
+}
+
+function areEqual(geom1, geom2) {
+  return (geom1.x === geom2.x && geom1.y === geom2.y && geom1.width ===
+          geom2.width && geom1.height === geom2.height);
+}

=== added directory 'rc/qml/MediaViewer/PhotoEditor/assets'
=== added file 'rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]'
Binary files rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 and rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	2015-03-10 14:05:41 +0000 differ
=== added file 'rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]'
Binary files rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 and rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	2015-03-10 14:05:41 +0000 differ
=== added file 'rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]'
Binary files rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 and rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	2015-03-10 14:05:41 +0000 differ
=== added file 'rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]'
Binary files rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 and rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	2015-03-10 14:05:41 +0000 differ
=== added file 'rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]'
Binary files rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 and rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	2015-03-10 14:05:41 +0000 differ
=== added file 'rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]'
Binary files rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	1970-01-01 00:00:00 +0000 and rc/qml/MediaViewer/PhotoEditor/assets/[e-mail]	2015-03-10 14:05:41 +0000 differ
=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2015-02-10 13:35:46 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2015-03-10 14:05:41 +0000
@@ -120,12 +120,23 @@
                 width: flickable.width * flickable.sizeScale
                 height: flickable.height * flickable.sizeScale
 
-               Image {
+                Connections {
+                    target: mediaSource
+                    onDataChanged: {
+                        image.source = "";
+                        image.source = "image://photo/" + mediaSource.path
+
+                        rightResolutionImage.source = "";
+                        rightResolutionImage.source = "image://photo/" + mediaSource.path
+                    }
+                }
+
+                Image {
                     id: image
                     anchors.fill: parent
                     asynchronous: true
                     cache: false
-                    source: mediaSource.galleryPath
+                    source: "image://photo/" + mediaSource.path
                     sourceSize {
                         width: viewer.maxDimension
                         height: viewer.maxDimension
@@ -142,8 +153,8 @@
                     anchors.fill: parent
                     asynchronous: true
                     cache: false
-                    // Load image using the GalleryStandardImageProvider to ensure EXIF orientation
-                    source: flickable.sizeScale > 1.0 ? mediaSource.galleryPath : ""
+                    // Load image using the photo image provider to ensure EXIF orientation
+                    source: flickable.sizeScale > 1.0 ? "image://photo/" + mediaSource.path : ""
                     sourceSize {
                         width: width
                         height: height

=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2015-02-09 19:48:24 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2015-03-10 14:05:41 +0000
@@ -170,7 +170,7 @@
 
                 image: Image {
                     id: thumbImage
-                    source: model.mediaSource.galleryThumbnailPath
+                    source: "image://thumbnailer/" + model.mediaSource.path
                     asynchronous: true
 
                     /* The SDK thumbnailer respects the freedesktop.org standard and uses 128 for the small
@@ -186,7 +186,7 @@
                     onDataChanged: {
                         // data changed but filename didn't, so we need to bypass the qml image
                         // cache by tacking a timestamp to the filename so sees it as different.
-                        thumbImage.source = model.mediaSource.galleryThumbnailPath + "?at=" + Date.now()
+                        thumbImage.source = "image://thumbnailer/" + model.mediaSource.path + "?at=" + Date.now()
                     }
                 }
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-27 22:38:39 +0000
+++ src/CMakeLists.txt	2015-03-10 14:05:41 +0000
@@ -6,6 +6,7 @@
 add_subdirectory(database)
 add_subdirectory(event)
 add_subdirectory(media)
+add_subdirectory(photoeditor)
 add_subdirectory(medialoader)
 add_subdirectory(photo)
 add_subdirectory(qml)
@@ -26,6 +27,7 @@
     ${gallery_event_src_SOURCE_DIR}
     ${gallery_album_src_SOURCE_DIR}
     ${gallery_photo_src_SOURCE_DIR}
+    ${gallery_photoeditor_src_SOURCE_DIR}
     ${gallery_video_src_SOURCE_DIR}
     ${gallery_qml_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
@@ -60,6 +62,7 @@
     gallery-media
     gallery-medialoader
     gallery-photo
+    gallery-photoeditor
     gallery-qml
     gallery-util
     gallery-video

=== modified file 'src/database/CMakeLists.txt'
--- src/database/CMakeLists.txt	2013-08-15 06:40:15 +0000
+++ src/database/CMakeLists.txt	2015-03-10 14:05:41 +0000
@@ -17,14 +17,12 @@
     album-table.h
     database.h
     media-table.h
-    photo-edit-table.h
     )
 
 set(gallery_database_SRCS
     album-table.cpp
     database.cpp
     media-table.cpp
-    photo-edit-table.cpp
     )
 
 add_library(${GALLERY_DATABASE_LIB}

=== modified file 'src/database/database.cpp'
--- src/database/database.cpp	2014-09-18 22:09:01 +0000
+++ src/database/database.cpp	2015-03-10 14:05:41 +0000
@@ -21,7 +21,6 @@
 #include "database.h"
 #include "album-table.h"
 #include "media-table.h"
-#include "photo-edit-table.h"
 
 #include <QFile>
 #include <QSqlTableModel>
@@ -49,7 +48,6 @@
 
     m_albumTable = new AlbumTable(this, this);
     m_mediaTable = new MediaTable(this, this);
-    m_photoEditTable = new PhotoEditTable(this, this);
 
     // Open the database.
     if (!openDB())
@@ -86,7 +84,6 @@
 {
     delete m_albumTable;
     delete m_mediaTable;
-    delete m_photoEditTable;
     delete m_db;
 
     createBackup();
@@ -227,15 +224,6 @@
 }
 
 /*!
- * \brief Database::getPhotoEditTable
- * \return
- */
-PhotoEditTable* Database::getPhotoEditTable() const
-{
-    return m_photoEditTable;
-}
-
-/*!
  * \brief Database::getDB
  * \return
  */

=== modified file 'src/database/database.h'
--- src/database/database.h	2013-06-10 07:37:09 +0000
+++ src/database/database.h	2015-03-10 14:05:41 +0000
@@ -26,7 +26,6 @@
 
 class AlbumTable;
 class MediaTable;
-class PhotoEditTable;
 
 class QSqlDatabase;
 class QSqlQuery;
@@ -50,7 +49,6 @@
 
     AlbumTable* getAlbumTable() const;
     MediaTable* getMediaTable() const;
-    PhotoEditTable* getPhotoEditTable() const;
 
 private:
     bool openDB();
@@ -75,7 +73,6 @@
     QSqlDatabase* m_db;
     AlbumTable* m_albumTable;
     MediaTable* m_mediaTable;
-    PhotoEditTable* m_photoEditTable;
 };
 
 #endif // DATABASE_H

=== removed file 'src/database/photo-edit-table.cpp'
--- src/database/photo-edit-table.cpp	2013-06-10 07:37:09 +0000
+++ src/database/photo-edit-table.cpp	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- */
-
-#include "photo-edit-table.h"
-#include "database.h"
-
-// photo
-#include "photo-edit-state.h"
-
-#include <QSqlQuery>
-#include <QStringList>
-#include <QVariant>
-
-/*!
- * \brief PhotoEditTable::PhotoEditTable
- * \param db
- * \param parent
- */
-PhotoEditTable::PhotoEditTable(Database* db, QObject* parent)
-    : QObject(parent), m_db(db)
-{
-}
-
-/*!
- * \brief PhotoEditTable::editState
- * \param mediaId
- * \return
- */
-PhotoEditState PhotoEditTable::editState(qint64 mediaId) const
-{
-    PhotoEditState edit_state;
-
-    QSqlQuery query(*m_db->getDB());
-    query.prepare("SELECT crop_rectangle, is_enhanced, orientation "
-                  "FROM PhotoEditTable "
-                  "WHERE media_id = :media_id");
-
-    query.bindValue(":media_id", mediaId);
-    if (!query.exec())
-        m_db->logSqlError(query);
-
-    if (query.next()) {
-        QStringList parts = query.value(0).toString().split(',');
-        if (parts.count() == 4) {
-            int x = parts[0].toInt();
-            int y = parts[1].toInt();
-            int width = parts[2].toInt();
-            int height = parts[3].toInt();
-
-            edit_state.crop_rectangle_ = QRect(x, y, width, height);
-        }
-
-        edit_state.is_enhanced_ = query.value(1).toBool();
-        edit_state.orientation_ = static_cast<Orientation>(query.value(2).toInt());
-    }
-
-    return edit_state;
-}
-
-/*!
- * \brief PhotoEditTable::setEditState
- * \param mediaId
- * \param editState
- */
-void PhotoEditTable::setEditState(qint64 mediaId,
-                                  const PhotoEditState& editState)
-{
-    if (mediaId == INVALID_ID)
-        return;
-
-    prepareRow(mediaId);
-
-    QString crop_rect_string = QString("%1,%2,%3,%4")
-            .arg(editState.crop_rectangle_.x())
-            .arg(editState.crop_rectangle_.y())
-            .arg(editState.crop_rectangle_.width())
-            .arg(editState.crop_rectangle_.height());
-
-    QSqlQuery query(*m_db->getDB());
-
-    query.prepare("UPDATE PhotoEditTable "
-                  "SET crop_rectangle = :crop_rect_string, "
-                  "is_enhanced = :is_enhanced, "
-                  "orientation = :orientation "
-                  "WHERE media_id = :media_id");
-    query.bindValue(":media_id", mediaId);
-    query.bindValue(":crop_rect_string", crop_rect_string);
-    query.bindValue(":is_enhanced", editState.is_enhanced_);
-    query.bindValue(":orientation", static_cast<int>(editState.orientation_));
-
-    if (!query.exec())
-        m_db->logSqlError(query);
-}
-
-/*!
- * \brief PhotoEditTable::prepareRow
- * \param mediaId
- */
-void PhotoEditTable::prepareRow(qint64 mediaId)
-{
-    QSqlQuery query(*m_db->getDB());
-    query.prepare("INSERT OR IGNORE INTO PhotoEditTable "
-                  "(media_id) VALUES (:media_id)");
-
-    query.bindValue(":media_id", mediaId);
-    if (!query.exec())
-        m_db->logSqlError(query);
-}

=== removed file 'src/database/photo-edit-table.h'
--- src/database/photo-edit-table.h	2013-06-10 07:37:09 +0000
+++ src/database/photo-edit-table.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- */
-
-#ifndef PHOTOEDITTABLE_H
-#define PHOTOEDITTABLE_H
-
-#include <QObject>
-
-class Database;
-class PhotoEditState;
-
-/*!
- * \brief The PhotoEditTable class
- */
-class PhotoEditTable : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit PhotoEditTable(Database* db, QObject *parent = 0);
-
-    PhotoEditState editState(qint64 mediaId) const;
-    void setEditState(qint64 mediaId, const PhotoEditState& editState);
-
-private:
-    void prepareRow(qint64 mediaId);
-
-    Database* m_db;
-};
-
-#endif // PHOTOEDITTABLE_H

=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2015-02-02 18:54:14 +0000
+++ src/gallery-application.cpp	2015-03-10 14:05:41 +0000
@@ -36,8 +36,12 @@
 // photo
 #include "photo.h"
 
+// photoeditor
+#include "photo-data.h"
+#include "file-utils.h"
+#include "photo-image-provider.h"
+
 // qml
-#include "gallery-standard-image-provider.h"
 #include "qml-album-collection-model.h"
 #include "qml-event-collection-model.h"
 #include "qml-event-overview-model.h"
@@ -107,7 +111,6 @@
     registerQML();
 
     m_galleryManager = new GalleryManager(isDesktopMode(), m_cmdLineParser->picturesDir());
-    m_galleryManager->logImageLoading(m_cmdLineParser->logImageLoading());
     if (m_cmdLineParser->pickModeEnabled())
         setDefaultUiMode(GalleryApplication::PickContentMode);
 
@@ -172,6 +175,8 @@
     qmlRegisterType<QmlEventCollectionModel>("Gallery", 1, 0, "EventCollectionModel");
     qmlRegisterType<QmlEventOverviewModel>("Gallery", 1, 0, "EventOverviewModel");
     qmlRegisterType<QmlMediaCollectionModel>("Gallery", 1, 0, "MediaCollectionModel");
+    qmlRegisterType<PhotoData>("Gallery", 1, 0, "GalleryPhotoData");
+    qmlRegisterSingletonType<FileUtils>("Gallery", 1, 0, "GalleryFileUtils", exportFileUtilsSingleton);  
 
     qRegisterMetaType<QList<MediaSource*> >("MediaSourceList");
     qRegisterMetaType<QSet<DataObject*> >("QSet<DataObject*>");
@@ -218,6 +223,11 @@
 {
     m_view->setTitle("Gallery");
 
+    PhotoImageProvider* provider = new PhotoImageProvider();
+    provider->setLogging(true);
+    m_view->engine()->addImageProvider(PhotoImageProvider::PROVIDER_ID,
+                             provider);
+
     QSize size = m_formFactors[m_cmdLineParser->formFactor()];
 
     if (m_cmdLineParser->isPortrait())
@@ -259,6 +269,15 @@
     setMediaFile(m_cmdLineParser->mediaFile());
 }
 
+QObject* GalleryApplication::exportFileUtilsSingleton(QQmlEngine *engine,
+                                              QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new FileUtils();
+}
+
 /*!
  * \brief GalleryApplication::initCollections
  */
@@ -267,8 +286,6 @@
     QApplication::processEvents();
 
     m_galleryManager->postInit();
-    m_view->engine()->addImageProvider(GalleryStandardImageProvider::PROVIDER_ID,
-                                       m_galleryManager->takeGalleryStandardImageProvider());
 
     QApplication::processEvents();
     if (m_cmdLineParser->startupTimer())

=== modified file 'src/gallery-application.h'
--- src/gallery-application.h	2015-01-23 20:00:50 +0000
+++ src/gallery-application.h	2015-03-10 14:05:41 +0000
@@ -93,6 +93,8 @@
 private:
     void registerQML();
     void createView();
+    static QObject* exportFileUtilsSingleton(QQmlEngine *engine,
+                                             QJSEngine *scriptEngine);
 
     QQuickView *m_view;
     GalleryManager *m_galleryManager;

=== modified file 'src/gallery-manager.cpp'
--- src/gallery-manager.cpp	2015-01-25 16:36:04 +0000
+++ src/gallery-manager.cpp	2015-03-10 14:05:41 +0000
@@ -37,7 +37,6 @@
 #include "media-monitor.h"
 
 // qml
-#include "gallery-standard-image-provider.h"
 #include "qml-media-collection-model.h"
 
 // util
@@ -59,7 +58,6 @@
                                const QString& picturesDir)
     : collectionsInitialised(false),
       m_resource(new Resource(desktopMode, picturesDir)),
-      m_standardImageProvider(new GalleryStandardImageProvider()),
       m_database(0),
       m_defaultTemplate(0),
       m_mediaCollection(0),
@@ -94,7 +92,6 @@
     delete m_defaultTemplate;
     delete m_resource;
     delete m_mediaCollection;
-    delete m_standardImageProvider;
 }
 
 /*!
@@ -210,16 +207,6 @@
 }
 
 /*!
- * \brief GalleryManager::logImageLoading enabled or disbaled logging image load
- * times to stdout
- * \param log
- */
-void GalleryManager::logImageLoading(bool log)
-{
-    m_standardImageProvider->setLogging(log);
-}
-
-/*!
  * \brief GalleryManager::fillMediaCollection fills the MediaCollection with
  * the content of the picture directory
  */
@@ -293,16 +280,3 @@
 
     startFileMonitoring();
 }
-
-/*!
- * \brief GalleryManager::takeGalleryStandardImageProvider returns the standard image provider
- * and gives up the owndership 
- */
-GalleryStandardImageProvider* GalleryManager::takeGalleryStandardImageProvider()
-{
-    m_standardImageProvider->setMaxLoadResolution(2048);
-
-    GalleryStandardImageProvider *provider = m_standardImageProvider;
-    m_standardImageProvider = 0;
-    return provider;
-}

=== modified file 'src/gallery-manager.h'
--- src/gallery-manager.h	2015-01-25 16:36:04 +0000
+++ src/gallery-manager.h	2015-03-10 14:05:41 +0000
@@ -35,7 +35,6 @@
 class Database;
 class EventCollection;
 class GalleryManager;
-class GalleryStandardImageProvider;
 class MediaCollection;
 class MediaMonitor;
 class MediaObjectFactory;
@@ -65,7 +64,6 @@
     AlbumCollection *albumCollection();
     EventCollection *eventCollection();
     Resource *resource() { return m_resource; }
-    GalleryStandardImageProvider *takeGalleryStandardImageProvider();
 
     void logImageLoading(bool log);
 
@@ -94,7 +92,6 @@
     bool collectionsInitialised;
 
     Resource* m_resource;
-    GalleryStandardImageProvider* m_standardImageProvider;
     Database* m_database;
     AlbumDefaultTemplate* m_defaultTemplate;
     MediaCollection* m_mediaCollection;

=== modified file 'src/media-object-factory.cpp'
--- src/media-object-factory.cpp	2015-01-26 18:37:49 +0000
+++ src/media-object-factory.cpp	2015-03-10 14:05:41 +0000
@@ -212,7 +212,7 @@
     if (id == INVALID_ID) {
         bool metadataOk;
         if (mediaType == MediaSource::Photo) {
-            metadataOk = readPhotoMetadata(photo->pristineFile());
+            metadataOk = readPhotoMetadata(photo->file());
         } else {
             metadataOk = readVideoMetadata(file);
         }

=== modified file 'src/media/media-source.cpp'
--- src/media/media-source.cpp	2014-02-25 15:16:24 +0000
+++ src/media/media-source.cpp	2015-03-10 14:05:41 +0000
@@ -23,9 +23,6 @@
 #include "database.h"
 #include "media-table.h"
 
-// qml
-#include "gallery-standard-image-provider.h"
-
 #include <QUrl>
 
 /*!
@@ -80,47 +77,6 @@
 }
 
 /*!
- * \brief MediaSource::galleryPath
- * \return
- */
-QUrl MediaSource::galleryPath() const
-{
-    /* At the moment the only video files we recognize are mp4
-     * files. This was maintained hardcoded from the previous
-     * version of gallery app, and should be fixed in the future.
-     * For those files the full image is the thumbnail/preview itself */
-    if (m_file.suffix().toLower() == "mp4") {
-        QString path("image://thumbnailer/");
-        path.append(m_file.absoluteFilePath());
-        return QUrl(path);
-    } else {
-        return GalleryStandardImageProvider::toURL(m_file);
-    }
-}
-
-/*!
- * \brief MediaSource::galleryPreviewPath
- * \return
- */
-QUrl MediaSource::galleryPreviewPath() const
-{
-    QString path("image://thumbnailer/");
-    path.append(m_file.absoluteFilePath());
-    return QUrl(path);
-}
-
-/*!
- * \brief MediaSource::galleryThumbnailPath
- * \return
- */
-QUrl MediaSource::galleryThumbnailPath() const
-{
-    QString path("image://thumbnailer/");
-    path.append(m_file.absoluteFilePath());
-    return QUrl(path);
-}
-
-/*!
  * \brief MediaSource::Image
  * \param respectOrientation
  * \return

=== modified file 'src/media/media-source.h'
--- src/media/media-source.h	2013-07-26 15:43:53 +0000
+++ src/media/media-source.h	2015-03-10 14:05:41 +0000
@@ -47,9 +47,6 @@
     Q_OBJECT
     Q_PROPERTY(MediaType type READ type NOTIFY typeChanged)
     Q_PROPERTY(QUrl path READ path NOTIFY pathChanged)
-    Q_PROPERTY(QUrl galleryPath READ galleryPath NOTIFY galleryPathChanged)
-    Q_PROPERTY(QUrl galleryPreviewPath READ galleryPreviewPath NOTIFY galleryPreviewPathChanged)
-    Q_PROPERTY(QUrl galleryThumbnailPath READ galleryThumbnailPath NOTIFY galleryThumbnailPathChanged)
     Q_PROPERTY(int orientation READ orientation NOTIFY orientationChanged)
     Q_PROPERTY(QDate exposureDate READ exposureDate NOTIFY exposureDateTimeChanged)
     Q_PROPERTY(QTime exposureTimeOfDay READ exposureTimeOfDay NOTIFY exposureDateTimeChanged)
@@ -62,9 +59,6 @@
 signals:
     void typeChanged();
     void pathChanged();
-    void galleryPathChanged();
-    void galleryPreviewPathChanged();
-    void galleryThumbnailPathChanged();
     void orientationChanged();
     void exposureDateTimeChanged();
     void dataChanged();
@@ -85,10 +79,6 @@
 
     QFileInfo file() const;
     QUrl path() const;
-    virtual QUrl galleryPath() const;
-
-    virtual QUrl galleryPreviewPath() const;
-    virtual QUrl galleryThumbnailPath() const;
 
     virtual QImage image(bool respectOrientation = true, const QSize &scaleSize=QSize());
     virtual Orientation orientation() const;

=== modified file 'src/medialoader/CMakeLists.txt'
--- src/medialoader/CMakeLists.txt	2014-08-12 18:55:10 +0000
+++ src/medialoader/CMakeLists.txt	2015-03-10 14:05:41 +0000
@@ -9,20 +9,15 @@
     ${gallery_src_SOURCE_DIR}/media
     ${gallery_util_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
-    ${EXIV2_INCLUDEDIR}
     ${GSTLIB_INCLUDE_DIRS}
     ${MEDIAINFO_INCLUDE_DIR}
     )
 
 set(gallery_medialoader_HDRS
-    gallery-standard-image-provider.h
-    photo-metadata.h
     video-metadata.h
     )
 
 set(gallery_medialoader_SRCS
-    gallery-standard-image-provider.cpp
-    photo-metadata.cpp
     video-metadata.cpp
     )
 
@@ -45,7 +40,6 @@
 endif(CLICK_MODE)
 
 target_link_libraries( ${GALLERY_MEDIALOADER_LIB}
-    ${EXIV2_LIBRARIES}
     ${GSTLIB_LDFLAGS}
     ${MEDIAINFO_LIBRARIES}
     gallery-util

=== removed file 'src/medialoader/gallery-standard-image-provider.cpp'
--- src/medialoader/gallery-standard-image-provider.cpp	2014-02-25 15:16:24 +0000
+++ src/medialoader/gallery-standard-image-provider.cpp	1970-01-01 00:00:00 +0000
@@ -1,479 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Lucas Beeler <[e-mail]>
- * Jim Nelson <[e-mail]>
- */
-
-#include "gallery-standard-image-provider.h"
-#include "photo-metadata.h"
-
-#include <QDebug>
-#include <QElapsedTimer>
-#include <QImageReader>
-#include <QSize>
-#include <QUrlQuery>
-
-const char* GalleryStandardImageProvider::PROVIDER_ID = "gallery-standard";
-const char* GalleryStandardImageProvider::PROVIDER_ID_SCHEME = "image://gallery-standard/";
-
-const char* GalleryStandardImageProvider::REVISION_PARAM_NAME = "edit";
-const char* GalleryStandardImageProvider::ORIENTATION_PARAM_NAME = "orientation";
-
-const char* GalleryStandardImageProvider::SIZE_KEY = "size_level";
-
-const long MAX_CACHE_BYTES = 20L * 1024L * 1024L;
-
-const int SCALED_LOAD_FLOOR_DIM_PIXELS = 360;
-
-/*!
- * \brief GalleryStandardImageProvider::GalleryStandardImageProvider
- */
-GalleryStandardImageProvider::GalleryStandardImageProvider()
-    : QQuickImageProvider(QQuickImageProvider::Image),
-      m_cachedBytes(0),
-      m_logImageLoading(false),
-      m_maxLoadResolution(INT_MAX)
-{
-}
-
-/*!
- * \brief GalleryStandardImageProvider::~GalleryStandardImageProvider
- */
-GalleryStandardImageProvider::~GalleryStandardImageProvider()
-{
-    // NOTE: This assumes that the GSIP is not receiving any requests any longer
-    while (!m_fifo.isEmpty())
-        delete m_cache.value(m_fifo.takeFirst());
-}
-
-/*!
- * \brief GalleryStandardImageProvider::toURL
- * \param file
- * \return
- */
-QUrl GalleryStandardImageProvider::toURL(const QFileInfo& file)
-{
-    return QUrl::fromUserInput(PROVIDER_ID_SCHEME + file.absoluteFilePath());
-}
-
-#define LOG_IMAGE_STATUS(status) { \
-    if (m_logImageLoading) \
-    loggingStr += status; \
-    }
-
-/*!
- * \brief GalleryStandardImageProvider::requestImage
- * \param id
- * \param size
- * \param requestedSize
- * \return
- */
-QImage GalleryStandardImageProvider::requestImage(const QString& id,
-                                                  QSize* size, const QSize& requestedSize)
-{
-    // for LOG_IMAGE_STATUS
-    QString loggingStr = "";
-    QElapsedTimer timer;
-    timer.start();
-
-    QUrl url(id);
-    QFileInfo photoFile(url.path());
-
-    QImage readyImage;
-    uint bytesLoaded = 0;
-    long currentCachedBytes = 0;
-    int currentCacheEntries = 0;
-
-    CachedImage* cachedImage = claimCachedImageEntry(id, loggingStr);
-    Q_ASSERT(cachedImage != NULL);
-
-    readyImage = fetchCachedImage(cachedImage, requestedSize, &bytesLoaded,
-                                           loggingStr);
-    if (readyImage.isNull())
-        LOG_IMAGE_STATUS("load-failure ");
-
-    releaseCachedImageEntry(cachedImage, bytesLoaded, &currentCachedBytes, &currentCacheEntries);
-
-    if (m_logImageLoading) {
-        if (bytesLoaded > 0) {
-            qDebug("%s %s req:%dx%d ret:%dx%d cache:%ldb/%d loaded:%db time:%lldms", qPrintable(loggingStr),
-                   qPrintable(id), requestedSize.width(), requestedSize.height(), readyImage.width(),
-                   readyImage.height(), currentCachedBytes, currentCacheEntries, bytesLoaded,
-                   timer.elapsed());
-        } else {
-            qDebug("%s %s req:%dx%d ret:%dx%d cache:%ldb/%d time:%lldms", qPrintable(loggingStr),
-                   qPrintable(id), requestedSize.width(), requestedSize.height(), readyImage.width(),
-                   readyImage.height(), currentCachedBytes, currentCacheEntries, timer.elapsed());
-        }
-    }
-
-    if (size != NULL)
-        *size = readyImage.size();
-
-    return readyImage;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::setLogging enables to print photo loading
- * times to stout
- * \param enableLogging
- */
-void GalleryStandardImageProvider::setLogging(bool enableLogging)
-{
-    m_logImageLoading = enableLogging;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::setMaxLoadResolution sets the maximal size of the loaded
- * images. Images loaded are limited to a max width/height, but keep their aspect ratio.
- * Limiting the size is useful to not exceed the texture size limit of the GPU. Or to limit for
- * performance reasons.
- * Default is to have no limit (INT_MAX).
- * \param resolution maxiaml length in pixel
- */
-void GalleryStandardImageProvider::setMaxLoadResolution(int resolution)
-{
-    if (resolution > 0)
-        m_maxLoadResolution = resolution;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::claim_cached_image_entry
- * Returns a CachedImage with an inUseCount > 0, meaning it cannot be
- * removed from the cache until released
- * \param id
- * \param loggingStr
- * \return
- */
-GalleryStandardImageProvider::CachedImage* GalleryStandardImageProvider::claimCachedImageEntry(
-        const QString& id, QString& loggingStr)
-{
-    // lock the cache table and retrieve the element for the cached image; if
-    // not found, create one as a placeholder
-    m_cacheMutex.lock();
-
-    CachedImage* cachedImage = m_cache.value(id, NULL);
-    if (cachedImage != NULL) {
-        // remove CachedImage before prepending to FIFO
-        m_fifo.removeOne(id);
-    } else {
-        cachedImage = new CachedImage(id, idToFile(id));
-        m_cache.insert(id, cachedImage);
-        LOG_IMAGE_STATUS("new-cache-entry ");
-    }
-
-    // add to front of FIFO
-    m_fifo.prepend(id);
-
-    // should be the same size, always
-    Q_ASSERT(m_cache.size() == m_fifo.size());
-
-    // claim the CachedImage *while cacheMutex_ is locked* ... this prevents the
-    // CachedImage from being removed from the cache while its being filled
-    cachedImage->inUseCount++;
-
-    m_cacheMutex.unlock();
-
-    return cachedImage;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::fetch_cached_image Inspects and loads a proper image
- * Inspects and loads a proper image for this request into the CachedImage
- * \param cachedImage
- * \param requestedSize
- * \param bytesLoaded
- * \param loggingStr
- * \return
- */
-QImage GalleryStandardImageProvider::fetchCachedImage(CachedImage *cachedImage,
-                                                        const QSize& requestedSize, uint* bytesLoaded, QString& loggingStr)
-{
-    Q_ASSERT(cachedImage != NULL);
-
-    // the final image returned to the user
-    QImage readyImage;
-    Q_ASSERT(readyImage.isNull());
-
-    // lock the cached image itself to access
-    cachedImage->imageMutex.lock();
-
-    // if image is available, see if a fit
-    if (cachedImage->isCacheHit(requestedSize)) {
-        readyImage = cachedImage->image;
-        LOG_IMAGE_STATUS("cache-hit ");
-    } else if (cachedImage->isReady()) {
-        LOG_IMAGE_STATUS("cache-miss ");
-    }
-
-    if (bytesLoaded != NULL)
-        *bytesLoaded = 0;
-
-    // if not available, load now
-    if (readyImage.isNull()) {
-        QImageReader reader(cachedImage->file);
-
-        // load file's original size
-        QSize fullSize = reader.size();
-        QSize loadSize(fullSize);
-
-        // use scaled load-and-decode if size has been requested
-        if (fullSize.isValid() && (requestedSize.width() > 0 || requestedSize.height() > 0)) {
-            // adjust requested size if necessary, but if small enough, just load the
-            // whole thing once and be done with it
-            if (fullSize.width() > SCALED_LOAD_FLOOR_DIM_PIXELS
-                    && fullSize.height() > SCALED_LOAD_FLOOR_DIM_PIXELS) {
-                loadSize.scale(requestedSize, Qt::KeepAspectRatio);
-                if (loadSize.width() > fullSize.width() || loadSize.height() > fullSize.height())
-                    loadSize = fullSize;
-            }
-        }
-
-        if (loadSize.width() > m_maxLoadResolution || loadSize.height() > m_maxLoadResolution) {
-            loadSize.scale(m_maxLoadResolution, m_maxLoadResolution, Qt::KeepAspectRatio);
-        }
-
-        if (loadSize != fullSize) {
-            LOG_IMAGE_STATUS("scaled-load ");
-
-            // configure reader for scaled load-and-decode
-            reader.setScaledSize(loadSize);
-        } else {
-            LOG_IMAGE_STATUS("full-load ");
-        }
-
-        readyImage = reader.read();
-        if (!readyImage.isNull()) {
-            if (!fullSize.isValid())
-                fullSize = readyImage.size();
-
-            // If orientation not supplied in URI, load from file and save in cache
-            Orientation orientation = TOP_LEFT_ORIGIN;
-            if (cachedImage->hasOrientation) {
-                orientation = cachedImage->orientation;
-            } else {
-                std::auto_ptr<PhotoMetadata> metadata(PhotoMetadata::fromFile(
-                                                          cachedImage->file));
-                if (metadata.get() != NULL)
-                    orientation = metadata->orientation();
-            }
-
-            // rotate image if not TOP LEFT
-            if (orientation != TOP_LEFT_ORIGIN)  {
-                readyImage = readyImage.transformed(
-                            OrientationCorrection::fromOrientation(orientation).toTransform());
-            }
-
-            cachedImage->storeImage(readyImage, fullSize, orientation);
-
-            if (bytesLoaded != NULL)
-                *bytesLoaded = readyImage.byteCount();
-        } else {
-            qDebug("Unable to load %s: %s", qPrintable(cachedImage->id),
-                   qPrintable(reader.errorString()));
-        }
-    }
-
-    cachedImage->imageMutex.unlock();
-
-    return readyImage;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::release_cached_image_entry
- * Releases a CachedImage to the cache; takes its bytes loaded (0 if nothing
- * was loaded) and returns the current cached byte total
- * \param cachedImage
- * \param bytesLoaded
- * \param currentCachedBytes
- * \param currentCacheEntries
- */
-void GalleryStandardImageProvider::releaseCachedImageEntry
-(CachedImage *cachedImage, uint bytesLoaded,
- long *currentCachedBytes, int *currentCacheEntries)
-{
-    Q_ASSERT(cachedImage != NULL);
-
-    // update total cached bytes and remove excess bytes
-    m_cacheMutex.lock();
-
-    m_cachedBytes += bytesLoaded;
-
-    // update the CachedImage use count and byte count inside of *cachedMutex_ lock*
-    Q_ASSERT(cachedImage->inUseCount > 0);
-    cachedImage->inUseCount--;
-    if (bytesLoaded != 0)
-        cachedImage->byteCount = bytesLoaded;
-
-    // trim the cache
-    QList<CachedImage*> dropList;
-    while (m_cachedBytes > MAX_CACHE_BYTES && !m_fifo.isEmpty()) {
-        QString droppedFile = m_fifo.takeLast();
-
-        CachedImage* droppedCachedImage = m_cache.value(droppedFile);
-        Q_ASSERT(droppedCachedImage != NULL);
-
-        // for simplicity, stop when dropped item is in use or doesn't contain
-        // an image (which it won't for too long) ... will clean up next time
-        // through
-        if (droppedCachedImage->inUseCount > 0) {
-            m_fifo.append(droppedFile);
-
-            break;
-        }
-
-        // remove from map
-        m_cache.remove(droppedFile);
-
-        // decrement total cached size
-        m_cachedBytes -= droppedCachedImage->byteCount;
-        Q_ASSERT(m_cachedBytes >= 0);
-
-        dropList.append(droppedCachedImage);
-    }
-
-    // coherency is good
-    Q_ASSERT(m_cache.size() == m_fifo.size());
-
-    if (currentCachedBytes != NULL)
-        *currentCachedBytes = m_cachedBytes;
-
-    if (currentCacheEntries != NULL)
-        *currentCacheEntries = m_cache.size();
-
-    m_cacheMutex.unlock();
-
-    // perform actual deletion outside of lock
-    while (!dropList.isEmpty())
-        delete dropList.takeFirst();
-}
-
-/*!
- * \brief GalleryStandardImageProvider::orientSize
- * \param size
- * \param orientation
- * \return
- */
-QSize GalleryStandardImageProvider::orientSize(const QSize& size, Orientation orientation)
-{
-    switch (orientation) {
-    case LEFT_TOP_ORIGIN:
-    case RIGHT_TOP_ORIGIN:
-    case RIGHT_BOTTOM_ORIGIN:
-    case LEFT_BOTTOM_ORIGIN:
-        return QSize(size.height(), size.width());
-        break;
-
-    default:
-        // no change
-        return size;
-    }
-}
-
-/*!
- * \brief GalleryStandardImageProvider::idToFile
- * \param id
- * \return
- */
-QString GalleryStandardImageProvider::idToFile(const QString& id) const
-{
-    QUrl url = QUrl(id);
-    QString fileName = url.path();
-    return fileName;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::CachedImage::CachedImage
- * \param id the full URI of the image
- * \param fileName the filename for the URI (the file itself)
- */
-GalleryStandardImageProvider::CachedImage::CachedImage(const QString& fileId,
-                                                       const QString& filename)
-    : id(fileId), uri(fileId), file(filename), hasOrientation(false),
-      orientation(TOP_LEFT_ORIGIN), inUseCount(0), byteCount(0)
-{
-    QUrlQuery query(uri);
-    if (query.hasQueryItem(ORIENTATION_PARAM_NAME)) {
-        QString value = query.queryItemValue(ORIENTATION_PARAM_NAME);
-        if (!value.isEmpty()) {
-            bool ok = false;
-            int toInt = value.toInt(&ok);
-            if (ok && toInt >= MIN_ORIENTATION && toInt <= MAX_ORIENTATION) {
-                orientation = (Orientation) toInt;
-                hasOrientation = true;
-            }
-        }
-    }
-}
-
-/*!
- * \brief GalleryStandardImageProvider::CachedImage::storeImage
- * Importand: the following should only be called when imageMutex_ is locked
- * \param image
- * \param fullSize
- * \param orientation
- */
-void GalleryStandardImageProvider::CachedImage::storeImage(const QImage& newImage,
-                                                           const QSize& newFullSize,
-                                                           Orientation newOrientation)
-{
-    image = newImage;
-    fullSize = orientSize(newFullSize, orientation);
-    hasOrientation = true;
-    orientation = newOrientation;
-}
-
-/*!
- * \brief GalleryStandardImageProvider::CachedImage::isReady
- * \return
- */
-bool GalleryStandardImageProvider::CachedImage::isReady() const
-{
-    return !image.isNull();
-}
-
-/*!
- * \brief GalleryStandardImageProvider::CachedImage::isFullSized
- * \return
- */
-bool GalleryStandardImageProvider::CachedImage::isFullSized() const
-{
-    return isReady() && (image.size() == fullSize);
-}
-
-/*!
- * \brief GalleryStandardImageProvider::CachedImage::isCacheHit
- * \param requestedSize
- * \return
- */
-bool GalleryStandardImageProvider::CachedImage::isCacheHit(const QSize& requestedSize) const
-{
-    if (!isReady())
-        return false;
-
-    if (isFullSized())
-        return true;
-
-    QSize properRequestedSize = orientSize(requestedSize, orientation);
-
-    if ((properRequestedSize.width() != 0 && image.width() >= properRequestedSize.width())
-            || (properRequestedSize.height() != 0 && image.height() >= properRequestedSize.height())) {
-        return true;
-    }
-
-    return false;
-}

=== removed file 'src/medialoader/gallery-standard-image-provider.h'
--- src/medialoader/gallery-standard-image-provider.h	2014-02-25 15:16:24 +0000
+++ src/medialoader/gallery-standard-image-provider.h	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Lucas Beeler <[e-mail]>
- * Jim Nelson <[e-mail]>
-*/
-
-#ifndef GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_
-#define GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_
-
-// util
-#include "orientation.h"
-
-#include <QFileInfo>
-#include <QImage>
-#include <QMap>
-#include <QMutex>
-#include <QObject>
-#include <QQuickImageProvider>
-#include <QSize>
-#include <QString>
-#include <QUrl>
-
-/*!
- * Gallery uses a custom image provider for three reasons:
- *
- * 1. QML's image loader does not respect EXIF orientation.  This provider will
- *    rotate and mirror the image as necessary.
- *
- * 2. QML's image caching appears to be directly related to image size (scaling)
- *    which leads to thrashing when animating a thumbnail or loading images at
- *    various sizes (such as in the album viewer versus the photo viewer).
- *    The strategy here is to cache the largest requested size of the image
- *    and allow QML to downscale it as necessary.  This minimizes expensive
- *    JPEG load-and-decodes.
- *
- * 3. Logging (enabled with --log-image-loading) allows for monitoring of
- *    all image I/O, useful when debugging and optimizing.
- */
-class GalleryStandardImageProvider : public QObject, public QQuickImageProvider
-{
-    Q_OBJECT
-
-public:
-    static const char* PROVIDER_ID;
-    static const char* PROVIDER_ID_SCHEME;
-
-    static const char* REVISION_PARAM_NAME;
-    static const char* ORIENTATION_PARAM_NAME;
-
-    static const char* SIZE_KEY;
-
-    GalleryStandardImageProvider();
-    virtual ~GalleryStandardImageProvider();
-
-    static QUrl toURL(const QFileInfo& file);
-
-    virtual QImage requestImage(const QString& id, QSize* size,
-                                const QSize& requestedSize);
-
-    void setLogging(bool enableLogging);
-    void setMaxLoadResolution(int resolution);
-
-private:
-    class CachedImage {
-    public:
-        const QString id;
-        const QUrl uri;
-        const QString file;
-        QMutex imageMutex;
-
-        // these fields should only be accessed when imageMutex_ is locked
-        bool hasOrientation;
-        QImage image;
-        QSize fullSize;
-        Orientation orientation;
-
-        // the following should only be accessed when cacheMutex_ is locked; the
-        // counter controls removing a CachedImage entry from the cache table
-        int inUseCount;
-        uint byteCount;
-
-        CachedImage(const QString& fileId, const QString& filename);
-
-        void storeImage(const QImage& newImage, const QSize& newFullSize,
-                        Orientation newOrientation);
-        bool isFullSized() const;
-        bool isReady() const;
-        bool isCacheHit(const QSize& requestedSize) const;
-    };
-
-    QMap<QString, CachedImage*> m_cache;
-    QList<QString> m_fifo;
-    QMutex m_cacheMutex;
-    long m_cachedBytes;
-    bool m_logImageLoading;
-    int m_maxLoadResolution;
-
-    static QSize orientSize(const QSize& size, Orientation orientation);
-
-    CachedImage* claimCachedImageEntry(const QString& id, QString& loggingStr);
-
-    QImage fetchCachedImage(CachedImage* cachedImage, const QSize& requestedSize,
-                              uint* bytesLoaded, QString& loggingStr);
-
-    void releaseCachedImageEntry(CachedImage* cachedImage, uint bytesLoaded,
-                                    long* currentCachedBytes, int* currentCacheEntries);
-
-    QString idToFile(const QString& id) const;
-
-    //Allow our test access to private variables.
-    friend class tst_GalleryStandardImageProvider;
-};
-
-#endif // GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_

=== removed file 'src/medialoader/photo-metadata.cpp'
--- src/medialoader/photo-metadata.cpp	2015-01-20 20:17:49 +0000
+++ src/medialoader/photo-metadata.cpp	1970-01-01 00:00:00 +0000
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Lucas Beeler <[e-mail]>
- */
-
-#include "photo-metadata.h"
-
-#include <cstdio>
-
-namespace {
-const Orientation DEFAULT_ORIENTATION = TOP_LEFT_ORIGIN;
-const char* EXIF_ORIENTATION_KEY = "Exif.Image.Orientation";
-const char* EXIF_DATETIMEDIGITIZED_KEY = "Exif.Photo.DateTimeDigitized";
-const char* EXPOSURE_TIME_KEYS[] = {
-    "Exif.Photo.DateTimeDigitized",
-    "Xmp.exif.DateTimeDigitized",
-    "Exif.Photo.DateTimeOriginal",
-    "Xmp.exif.DateTimeOriginal",
-    "Xmp.xmp.CreateDate",
-    "Exif.Image.DateTime"
-};
-const size_t NUM_EXPOSURE_TIME_KEYS = 6;
-const char* EXIF_DATE_FORMATS[] = {
-    "%d:%d:%d %d:%d:%d",
-
-    // for Minolta DiMAGE E223 (colon, instead of space, separates day from
-    // hour in exif)
-    "%d:%d:%d:%d:%d:%d",
-
-    // for Samsung NV10 (which uses a period instead of colons for the date
-    // and two spaces between date and time)
-    "%d.%d.%d  %d:%d:%d"
-};
-const size_t NUM_EXIF_DATE_FORMATS = 3;
-
-const char* get_first_matched(const char* keys[], size_t n_keys,
-                              const QSet<QString>& in) {
-    for (size_t i = 0; i < n_keys; i++) {
-        if (in.contains(keys[i]))
-            return keys[i];
-    }
-    
-    return NULL;
-}
-
-bool is_xmp_key(const char* key) {
-    return (key != NULL) ? (std::strncmp("Xmp.", key, 4) == 0) : false;
-}
-
-bool is_exif_key(const char* key) {
-    return (key != NULL) ? (std::strncmp("Exif.", key, 5) == 0) : false;
-}
-
-// caller should test if 's' could be successfully parsed by invoking the
-// isValid() method on the returned QDateTime instance; if isValid() == false,
-// 's' couldn't be parsed
-QDateTime parse_xmp_date_string(const char* s) {
-    return QDateTime::fromString(s, Qt::ISODate);
-}
-
-// caller should test if 's' could be successfully parsed by invoking the
-// isValid() method on the returned QDateTime instance; if isValid() == false,
-// 's' couldn't be parsed
-QDateTime parse_exif_date_string(const char* s) {
-    for (size_t i = 0; i < NUM_EXIF_DATE_FORMATS; i++) {
-        int year, month, day, hour, minute, second;
-        if (std::sscanf(s, EXIF_DATE_FORMATS[i], &year, &month, &day, &hour,
-                        &minute, &second) == 6) {
-            // no need to check year, month, day, hour, minute and second variables
-            // for bogus values before using them -- if the values are bogus, the
-            // resulting QDateTime will be invalid, which is exactly what we want
-            return QDateTime(QDate(year, month, day), QTime(hour, minute, second));
-        }
-    }
-    
-    // the no argument QDateTime constructor produces an invalid QDateTime,
-    // which is what we want
-    return QDateTime();
-}
-} // namespace
-
-/*!
- * \brief PhotoMetadata::PhotoMetadata
- * \param filepath
- */
-PhotoMetadata::PhotoMetadata(const char* filepath)
-    : m_fileSourceInfo(filepath)
-{
-    m_image = Exiv2::ImageFactory::open(filepath);
-    m_image->readMetadata();
-}
-
-/*!
- * \brief PhotoMetadata::fromFile
- * \param filepath
- * \return
- */
-PhotoMetadata* PhotoMetadata::fromFile(const char* filepath)
-{
-    PhotoMetadata* result = NULL;
-    try {
-        result = new PhotoMetadata(filepath);
-
-        if (!result->m_image->good()) {
-            qDebug("Invalid image metadata in %s", filepath);
-            delete result;
-            return NULL;
-        }
-
-        Exiv2::ExifData& exif_data = result->m_image->exifData();
-        Exiv2::ExifData::const_iterator end = exif_data.end();
-        for (Exiv2::ExifData::const_iterator i = exif_data.begin(); i != end; i++)
-            result->m_keysPresent.insert(QString(i->key().c_str()));
-
-        Exiv2::XmpData& xmp_data = result->m_image->xmpData();
-        Exiv2::XmpData::const_iterator end1 = xmp_data.end();
-        for (Exiv2::XmpData::const_iterator i = xmp_data.begin(); i != end1; i++)
-            result->m_keysPresent.insert(QString(i->key().c_str()));
-
-        return result;
-    } catch (Exiv2::AnyError& e) {
-        qDebug("Error loading image metadata: %s", e.what());
-        delete result;
-        return NULL;
-    }
-}
-
-/*!
- * \brief PhotoMetadata::fromFile
- * \param file
- * \return
- */
-PhotoMetadata* PhotoMetadata::fromFile(const QFileInfo &file)
-{
-    return PhotoMetadata::fromFile(file.absoluteFilePath().toStdString().c_str());
-}
-
-/*!
- * \brief PhotoMetadata::orientation
- * \return
- */
-Orientation PhotoMetadata::orientation() const
-{
-    Exiv2::ExifData& exif_data = m_image->exifData();
-
-    if (exif_data.empty())
-        return DEFAULT_ORIENTATION;
-
-    if (m_keysPresent.find(EXIF_ORIENTATION_KEY) == m_keysPresent.end())
-        return DEFAULT_ORIENTATION;
-
-    long orientation_code = exif_data[EXIF_ORIENTATION_KEY].toLong();
-    if (orientation_code < MIN_ORIENTATION || orientation_code > MAX_ORIENTATION)
-        return DEFAULT_ORIENTATION;
-
-    return static_cast<Orientation>(orientation_code);
-}
-
-/*!
- * \brief PhotoMetadata::exposureTime
- * \return
- */
-QDateTime PhotoMetadata::exposureTime() const
-{
-    const char* matched = get_first_matched(EXPOSURE_TIME_KEYS,
-                                            NUM_EXPOSURE_TIME_KEYS, m_keysPresent);
-    if (matched == NULL)
-        return QDateTime();
-
-    if (is_exif_key(matched))
-        return parse_exif_date_string(m_image->exifData()[matched].toString().c_str());
-
-    if (is_xmp_key(matched))
-        return parse_xmp_date_string(m_image->xmpData()[matched].toString().c_str());
-
-    // No valid/known tag for exposure date/time
-    return QDateTime();
-}
-
-/*!
- * \brief PhotoMetadata::orientationCorrection
- * \return
- */
-OrientationCorrection PhotoMetadata::orientationCorrection() const
-{
-    return OrientationCorrection::fromOrientation(orientation());
-}
-
-/*!
- * \brief PhotoMetadata::orientationTransform
- * \return
- */
-QTransform PhotoMetadata::orientationTransform() const
-{
-    return orientationCorrection().toTransform();
-}
-
-/*!
- * \brief PhotoMetadata::setOrientation
- * \param orientation
- */
-void PhotoMetadata::setOrientation(Orientation orientation)
-{
-    try {
-        if (!m_image->good()) {
-            qDebug("Do not set Orientation, invalid image metadata.");
-            return;
-        }
- 
-        Exiv2::ExifData& exif_data = m_image->exifData();
- 
-        exif_data[EXIF_ORIENTATION_KEY] = orientation;
- 
-        if (!m_keysPresent.contains(EXIF_ORIENTATION_KEY))
-            m_keysPresent.insert(EXIF_ORIENTATION_KEY);
- 
-    } catch (Exiv2::AnyError& e) {
-        qDebug("Do not set Orientation, error reading image metadata; %s", e.what());
-        return;
-    }
-}
-
-/*!
- * \brief PhotoMetadata::setDateTimeDigitized
- * \param digitized
- */
-void PhotoMetadata::setDateTimeDigitized(const QDateTime& digitized)
-{
-    try {
-        if (!m_image->good()) {
-            qDebug("Do not set DateTimeDigitized, invalid image metadata.");
-            return;
-        }
- 
-        Exiv2::ExifData& exif_data = m_image->exifData();
- 
-        exif_data[EXIF_DATETIMEDIGITIZED_KEY] = digitized.toString("yyyy:MM:dd hh:mm:ss").toStdString();
- 
-        if (!m_keysPresent.contains(EXIF_DATETIMEDIGITIZED_KEY))
-            m_keysPresent.insert(EXIF_DATETIMEDIGITIZED_KEY);
- 
-    } catch (Exiv2::AnyError& e) {
-        qDebug("Do not set DateTimeDigitized, error reading image metadata; %s", e.what());
-        return;
-    }
-}
-
-void PhotoMetadata::updateThumbnail(QImage image)
-{
-    QImage scaled = image.scaled(image.width() / THUMBNAIL_SCALE,
-                                 image.height() / THUMBNAIL_SCALE);
-    QBuffer jpeg;
-    jpeg.open(QIODevice::WriteOnly);
-    scaled.save(&jpeg, "jpeg");
-    Exiv2::ExifThumb thumb(m_image->exifData());
-    thumb.setJpegThumbnail((Exiv2::byte*) jpeg.data().constData(), jpeg.size());
-}
-
-/*!
- * \brief PhotoMetadata::save
- * \return
- */
-bool PhotoMetadata::save() const
-{
-    try {
-        m_image->writeMetadata();
-        return true;
-    } catch (Exiv2::AnyError& e) {
-        return false;
-    }
-}

=== removed file 'src/medialoader/photo-metadata.h'
--- src/medialoader/photo-metadata.h	2015-01-20 20:17:49 +0000
+++ src/medialoader/photo-metadata.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Lucas Beeler <[e-mail]>
- */
-
-#ifndef GALLERY_PHOTO_METADATA_H_
-#define GALLERY_PHOTO_METADATA_H_
-
-// util
-#include <orientation.h>
-
-#include <QDateTime>
-#include <QFileInfo>
-#include <QObject>
-#include <QString>
-#include <QSet>
-#include <QTransform>
-#include <QImage>
-#include <QBuffer>
-
-#include <exiv2/exiv2.hpp>
-
-#define THUMBNAIL_SCALE 8.5
-
-/*!
- * \brief The PhotoMetadata class
- */
-class PhotoMetadata : public QObject
-{
-    Q_OBJECT
-
-public:
-    static PhotoMetadata* fromFile(const char* filepath);
-    static PhotoMetadata* fromFile(const QFileInfo& file);
-
-    QDateTime exposureTime() const;
-    Orientation orientation() const;
-    QTransform orientationTransform() const;
-    OrientationCorrection orientationCorrection() const;
-
-    void setOrientation(Orientation orientation);
-    void setDateTimeDigitized(const QDateTime& digitized);
-    void updateThumbnail(QImage image);
-
-    bool save() const;
-
-private:
-    PhotoMetadata(const char* filepath);
-    
-    Exiv2::Image::AutoPtr m_image;
-    QSet<QString> m_keysPresent;
-    QFileInfo m_fileSourceInfo;
-};
-
-#endif // GALLERY_PHOTO_METADATA_H_

=== modified file 'src/photo/CMakeLists.txt'
--- src/photo/CMakeLists.txt	2013-08-15 06:40:15 +0000
+++ src/photo/CMakeLists.txt	2015-03-10 14:05:41 +0000
@@ -8,22 +8,17 @@
     ${gallery_database_src_SOURCE_DIR}
     ${gallery_media_src_SOURCE_DIR}
     ${gallery_medialoader_src_SOURCE_DIR}
+    ${gallery_photoeditor_src_SOURCE_DIR}
     ${gallery_util_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     )
 
 set(gallery_photo_HDRS
     photo.h
-    photo-caches.h
-    photo-edit-state.h
-    photo-edit-thread.h
     )
 
 set(gallery_photo_SRCS
     photo.cpp
-    photo-caches.cpp
-    photo-edit-state.cpp
-    photo-edit-thread.cpp
     )
 
 add_library(${GALLERY_PHOTO_LIB}

=== removed file 'src/photo/photo-caches.cpp'
--- src/photo/photo-caches.cpp	2014-02-19 14:54:43 +0000
+++ src/photo/photo-caches.cpp	1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- */
-
-#include "photo-caches.h"
-
-#include <QDir>
-#include <utime.h>
-
-const QString PhotoCaches::ORIGINAL_DIR = ".original";
-const QString PhotoCaches::ENHANCED_DIR = ".enhanced";
-
-/*!
- * \brief PhotoCaches::PhotoCaches
- * \param file
- */
-PhotoCaches::PhotoCaches(const QFileInfo& file) : m_file(file),
-    m_originalFile(file.dir(),
-                   QString("%1/%2").arg(ORIGINAL_DIR).arg(file.fileName())),
-    m_enhancedFile(file.dir(),
-                   QString("%1/%2").arg(ENHANCED_DIR).arg(file.fileName()))
-{
-    // We always want our file checks to hit the disk.
-    m_file.setCaching(false);
-    m_originalFile.setCaching(false);
-    m_enhancedFile.setCaching(false);
-}
-
-/*!
- * \brief PhotoCaches::hasCachedOriginal
- * \return
- */