Merge lp:camera-app/staging into lp:camera-app

[Florian Boucault]

New release:
- Allow tap to focus up to the left/right edge of the screen
- Query the manual focus support to enable/disable tap-to-focus as the backend supports it
- Do not crash if no QCameraExposureControl is available (true with Unity 7)
- Before setting a photo capture resolution, always checks it is included in the possible resolution options
- Fix bottom edge mouse handling: ensure that clicks on the bottom edge open it and that any click outside of option buttons dismiss the bottom edge
- Various performance improvements to minimize the time between shots and between pressing the shutter button and the actual capture
- When the GPS fix is accurate to less than 100m display the GPS icon in red and don't save location
- Display error messages when disk write fails and when SD card is not writeable when switching to it
- Disable record/shuttle button while PhotoRoll hint is visible

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:642
http://jenkins.qa.ubuntu.com/job/camera-app-ci/483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/392
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/950
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27167

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/camera-app-ci/484/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/180
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/180/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/179
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/394
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/955
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27200

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:651
http://jenkins.qa.ubuntu.com/job/camera-app-ci/485/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/180
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/412
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1005
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27825

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:656
http://jenkins.qa.ubuntu.com/job/camera-app-ci/486/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/182/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/181/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/416
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1011
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27902

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:658
http://jenkins.qa.ubuntu.com/job/camera-app-ci/487/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/183
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/182
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/417
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1012
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27920

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

review: Needs Fixing (continuous-integration)

[lp:camera-app/staging]

659. By Florian Boucault on 2016-02-26

Add flake8 tests to unit tests

=== modified file 'BottomEdgeIndicators.qml'
--- BottomEdgeIndicators.qml	2015-11-17 15:25:03 +0000
+++ BottomEdgeIndicators.qml	2016-02-26 17:17:00 +0000
@@ -83,7 +83,7 @@
                 Icon {
                     id: indicatorIcon
                     anchors.fill: parent
-                    color: "white"
+                    color: modelData.colorize ? "red" : "white"
                     name: modelData && modelData.isToggle ? modelData.icon : (modelData.get(model.selectedIndex) ? modelData.get(model.selectedIndex).icon : "")
                     source: name ? "image://theme/%1".arg(name) : (modelData.iconSource || "")
                     visible: source != ""

=== modified file 'CameraApp/CMakeLists.txt'
--- CameraApp/CMakeLists.txt	2015-11-18 06:44:35 +0000
+++ CameraApp/CMakeLists.txt	2016-02-26 17:17:00 +0000
@@ -7,8 +7,7 @@
     fileoperations.cpp
     foldersmodel.cpp
     storagemonitor.cpp
-    qstorageinfo.cpp
-    qstorageinfo_unix.cpp
+    storagelocations.cpp
     )
 
 set(plugin_HDRS
@@ -17,8 +16,7 @@
     fileoperations.h
     foldersmodel.h
     storagemonitor.h
-    qstorageinfo.h
-    qstorageinfo_p.h
+    storagelocations.h
     )
 
 add_library(camera-qml SHARED ${plugin_SRCS} ${plugin_HDRS})

=== modified file 'CameraApp/advancedcamerasettings.cpp'
--- CameraApp/advancedcamerasettings.cpp	2016-01-05 13:08:28 +0000
+++ CameraApp/advancedcamerasettings.cpp	2016-02-26 17:17:00 +0000
@@ -237,11 +237,11 @@
 
     m_cameraFlashControl = flashControlFromCamera(m_camera);
     m_cameraExposureControl = exposureControlFromCamera(m_camera);
-    QVariant exposureMode = m_hdrEnabled ? QVariant::fromValue(ExposureHdr)
-                                         : QVariant::fromValue(QCameraExposure::ExposureAuto);
-    m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
 
     if (m_cameraExposureControl) {
+        QVariant exposureMode = m_hdrEnabled ? QVariant::fromValue(ExposureHdr)
+                                             : QVariant::fromValue(QCameraExposure::ExposureAuto);
+        m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
         QObject::connect(m_cameraExposureControl,
                          SIGNAL(actualValueChanged(int)),
                          this, SLOT(onExposureValueChanged(int)));

=== modified file 'CameraApp/components.cpp'
--- CameraApp/components.cpp	2015-01-22 16:15:08 +0000
+++ CameraApp/components.cpp	2016-02-26 17:17:00 +0000
@@ -24,6 +24,14 @@
 #include "fileoperations.h"
 #include "foldersmodel.h"
 #include "storagemonitor.h"
+#include "storagelocations.h"
+
+static QObject* StorageLocations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new StorageLocations();
+}
 
 void Components::registerTypes(const char *uri)
 {
@@ -34,6 +42,7 @@
     qmlRegisterType<FileOperations>(uri, 0, 1, "FileOperations");
     qmlRegisterType<FoldersModel>(uri, 0, 1, "FoldersModel");
     qmlRegisterType<StorageMonitor>(uri, 0, 1, "StorageMonitor");
+    qmlRegisterSingletonType<StorageLocations>(uri, 0, 1, "StorageLocations", StorageLocations_singleton_factory);
 }
 
 void Components::initializeEngine(QQmlEngine *engine, const char *uri)

=== removed file 'CameraApp/qstorageinfo.cpp'
--- CameraApp/qstorageinfo.cpp	2015-01-27 14:34:31 +0000
+++ CameraApp/qstorageinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,378 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Ivan Komissarov <[e-mail]>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; version 3.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program.  If not, see <http://www.gnu.org/licenses/>.
-**
-****************************************************************************/
-
-#include "qstorageinfo.h"
-#include "qstorageinfo_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QStorageInfo
-    \inmodule QtCore
-    \since 5.4
-    \brief Provides information about currently mounted storage and drives.
-
-    \ingroup io
-    \ingroup shared
-
-    Allows retrieving information about the volume's space, its mount point,
-    label, and filesystem name.
-
-    You can create an instance of QStorageInfo by passing the path to the
-    volume's mount point as a constructor parameter, or you can set it using
-    the setPath() method. The static mountedVolumes() method can be used to get the
-    list of all mounted filesystems.
-
-    QStorageInfo always caches the retrieved information, but you can call
-    refresh() to invalidate the cache.
-
-    The following example retrieves the most common information about the root
-    volume of the system, and prints information about it.
-
-    \snippet code/src_corelib_io_qstorageinfo.cpp 2
-*/
-
-/*!
-    Constructs an empty QStorageInfo object.
-
-    Objects created with the default constructor will be invalid and therefore
-    not ready for use.
-
-    \sa setPath(), isReady(), isValid()
-*/
-QStorageInfo::QStorageInfo()
-    : d(new QStorageInfoPrivate)
-{
-}
-
-/*!
-    Constructs a new QStorageInfo object that gives information about the volume
-    mounted at \a path.
-
-    If you pass a directory or file, the QStorageInfo object will refer to the
-    volume where this directory or file is located.
-    You can check if the created object is correct using the isValid() method.
-
-    The following example shows how to get the volume on which the application is
-    located. It is recommended to always check that the volume is ready and valid.
-
-    \snippet code/src_corelib_io_qstorageinfo.cpp 0
-
-    \sa setPath()
-*/
-QStorageInfo::QStorageInfo(const QString &path)
-    : d(new QStorageInfoPrivate)
-{
-    setPath(path);
-}
-
-/*!
-    Constructs a new QStorageInfo object that gives information about the volume
-    containing the \a dir folder.
-*/
-QStorageInfo::QStorageInfo(const QDir &dir)
-    : d(new QStorageInfoPrivate)
-{
-    setPath(dir.absolutePath());
-}
-
-/*!
-    Constructs a new QStorageInfo object that is a copy of the \a other QStorageInfo object.
-*/
-QStorageInfo::QStorageInfo(const QStorageInfo &other)
-    : d(other.d)
-{
-}
-
-/*!
-    Destroys the QStorageInfo object and frees its resources.
-*/
-QStorageInfo::~QStorageInfo()
-{
-}
-
-/*!
-    Makes a copy of the QStorageInfo object \a other and assigns it to this QStorageInfo object.
-*/
-QStorageInfo &QStorageInfo::operator=(const QStorageInfo &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    \fn QStorageInfo &QStorageInfo::operator=(QStorageInfo &&other)
-
-    Assigns \a other to this QStorageInfo instance.
-*/
-
-/*!
-    \fn void QStorageInfo::swap(QStorageInfo &other)
-
-    Swaps this volume info with \a other. This function is very fast and
-    never fails.
-*/
-
-/*!
-    Sets this QStorageInfo object to the filesystem mounted where \a path is located.
-
-    \a path can either be a root path of the filesystem, a directory, or a file
-    within that filesystem.
-
-    \sa rootPath()
-*/
-void QStorageInfo::setPath(const QString &path)
-{
-    if (d->rootPath == path)
-        return;
-    d.detach();
-    d->rootPath = path;
-    d->doStat();
-}
-
-/*!
-    Returns the mount point of the filesystem this QStorageInfo object
-    represents.
-
-    On Windows, it returns the volume letter in case the volume is not mounted to
-    a directory.
-
-    Note that the value returned by rootPath() is the real mount point of a
-    volume, and may not be equal to the value passed to the constructor or setPath()
-    method. For example, if you have only the root volume in the system, and
-    pass '/directory' to setPath(), then this method will return '/'.
-
-    \sa setPath(), device()
-*/
-QString QStorageInfo::rootPath() const
-{
-    return d->rootPath;
-}
-
-/*!
-    Returns the size (in bytes) available for the current user. It returns
-    the total size available if the user is the root user or a system administrator.
-
-    This size can be less than or equal to the free size returned by
-    bytesFree() function.
-
-    \sa bytesTotal(), bytesFree()
-*/
-qint64 QStorageInfo::bytesAvailable() const
-{
-    return d->bytesAvailable;
-}
-
-/*!
-    Returns the number of free bytes in a volume. Note that if there are
-    quotas on the filesystem, this value can be larger than the value
-    returned by bytesAvailable().
-
-    \sa bytesTotal(), bytesAvailable()
-*/
-qint64 QStorageInfo::bytesFree() const
-{
-    return d->bytesFree;
-}
-
-/*!
-    Returns the total volume size in bytes.
-
-    \sa bytesFree(), bytesAvailable()
-*/
-qint64 QStorageInfo::bytesTotal() const
-{
-    return d->bytesTotal;
-}
-
-/*!
-    Returns the type name of the filesystem.
-
-    This is a platform-dependent function, and filesystem names can vary
-    between different operating systems. For example, on Windows filesystems
-    they can be named \c NTFS, and on Linux they can be named \c ntfs-3g or \c fuseblk.
-
-    \sa name()
-*/
-QByteArray QStorageInfo::fileSystemType() const
-{
-    return d->fileSystemType;
-}
-
-/*!
-    Returns the device for this volume.
-
-    For example, on Unix filesystems (including OS X), this returns the
-    devpath like \c /dev/sda0 for local storages. On Windows, it returns the UNC
-    path starting with \c \\\\?\\ for local storages (in other words, the volume GUID).
-
-    \sa rootPath()
-*/
-QByteArray QStorageInfo::device() const
-{
-    return d->device;
-}
-
-/*!
-    Returns the human-readable name of a filesystem, usually called \c label.
-
-    Not all filesystems support this feature. In this case, the value returned by
-    this method could be empty. An empty string is returned if the file system
-    does not support labels, or if no label is set.
-
-    On Linux, retrieving the volume's label requires \c udev to be present in the
-    system.
-
-    \sa fileSystemType()
-*/
-QString QStorageInfo::name() const
-{
-    return d->name;
-}
-
-/*!
-    Returns the volume's name, if available, or the root path if not.
-*/
-QString QStorageInfo::displayName() const
-{
-    if (!d->name.isEmpty())
-        return d->name;
-    return d->rootPath;
-}
-
-/*!
-    \fn bool QStorageInfo::isRoot() const
-
-    Returns true if this QStorageInfo represents the system root volume; false
-    otherwise.
-
-    On Unix filesystems, the root volume is a volume mounted on \c /. On Windows,
-    the root volume is the volume where the OS is installed.
-
-    \sa root()
-*/
-
-/*!
-    Returns true if the current filesystem is protected from writing; false
-    otherwise.
-*/
-bool QStorageInfo::isReadOnly() const
-{
-    return d->readOnly;
-}
-
-/*!
-    Returns true if the current filesystem is ready to work; false otherwise. For
-    example, false is returned if the CD volume is not inserted.
-
-    Note that fileSystemType(), name(), bytesTotal(), bytesFree(), and
-    bytesAvailable() will return invalid data until the volume is ready.
-
-    \sa isValid()
-*/
-bool QStorageInfo::isReady() const
-{
-    return d->ready;
-}
-
-/*!
-    Returns true if the QStorageInfo specified by rootPath exists and is mounted
-    correctly.
-
-    \sa isReady()
-*/
-bool QStorageInfo::isValid() const
-{
-    return d->valid;
-}
-
-/*!
-    Resets QStorageInfo's internal cache.
-
-    QStorageInfo caches information about storage to speed up performance.
-    QStorageInfo retrieves information during object construction and/or when calling
-    the setPath() method. You have to manually reset the cache by calling this
-    function to update storage information.
-*/
-void QStorageInfo::refresh()
-{
-    d.detach();
-    d->doStat();
-}
-
-/*!
-    Returns the list of QStorageInfo objects that corresponds to the list of currently
-    mounted filesystems.
-
-    On Windows, this returns the drives visible in the \gui{My Computer} folder. On Unix
-    operating systems, it returns the list of all mounted filesystems (except for
-    pseudo filesystems).
-
-    Returns all currently mounted filesystems by default.
-
-    The example shows how to retrieve all available filesystems, skipping read-only ones.
-
-    \snippet code/src_corelib_io_qstorageinfo.cpp 1
-
-    \sa root()
-*/
-QList<QStorageInfo> QStorageInfo::mountedVolumes()
-{
-    return QStorageInfoPrivate::mountedVolumes();
-}
-
-Q_GLOBAL_STATIC_WITH_ARGS(QStorageInfo, getRoot, (QStorageInfoPrivate::root()))
-
-/*!
-    Returns a QStorageInfo object that represents the system root volume.
-
-    On Unix systems this call returns the root ('/') volume; in Windows the volume where
-    the operating system is installed.
-
-    \sa isRoot()
-*/
-QStorageInfo QStorageInfo::root()
-{
-    return *getRoot();
-}
-
-/*!
-    \fn inline bool operator==(const QStorageInfo &first, const QStorageInfo &second)
-
-    \relates QStorageInfo
-
-    Returns true if the \a first QStorageInfo object refers to the same drive or volume
-    as the \a second; otherwise it returns false.
-
-    Note that the result of comparing two invalid QStorageInfo objects is always
-    positive.
-*/
-
-/*!
-    \fn inline bool operator!=(const QStorageInfo &first, const QStorageInfo &second)
-
-    \relates QStorageInfo
-
-    Returns true if the \a first QStorageInfo object refers to a different drive or
-    volume than the \a second; otherwise returns false.
-*/
-
-QT_END_NAMESPACE

=== removed file 'CameraApp/qstorageinfo.h'
--- CameraApp/qstorageinfo.h	2015-01-27 14:34:31 +0000
+++ CameraApp/qstorageinfo.h	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Ivan Komissarov <[e-mail]>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; version 3.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program.  If not, see <http://www.gnu.org/licenses/>.
-**
-****************************************************************************/
-
-#ifndef QSTORAGEINFO_H
-#define QSTORAGEINFO_H
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qmetatype.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qshareddata.h>
-
-QT_BEGIN_NAMESPACE
-
-class QStorageInfoPrivate;
-class Q_CORE_EXPORT QStorageInfo
-{
-public:
-    QStorageInfo();
-    explicit QStorageInfo(const QString &path);
-    explicit QStorageInfo(const QDir &dir);
-    QStorageInfo(const QStorageInfo &other);
-    ~QStorageInfo();
-
-    QStorageInfo &operator=(const QStorageInfo &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QStorageInfo &operator=(QStorageInfo &&other)
-    { qSwap(d, other.d); return *this; }
-#endif
-
-    inline void swap(QStorageInfo &other)
-    { qSwap(d, other.d); }
-
-    void setPath(const QString &path);
-
-    QString rootPath() const;
-    QByteArray device() const;
-    QByteArray fileSystemType() const;
-    QString name() const;
-    QString displayName() const;
-
-    qint64 bytesTotal() const;
-    qint64 bytesFree() const;
-    qint64 bytesAvailable() const;
-
-    inline bool isRoot() const;
-    bool isReadOnly() const;
-    bool isReady() const;
-    bool isValid() const;
-
-    void refresh();
-
-    static QList<QStorageInfo> mountedVolumes();
-    static QStorageInfo root();
-
-private:
-    friend class QStorageInfoPrivate;
-    friend bool operator==(const QStorageInfo &first, const QStorageInfo &second);
-    QExplicitlySharedDataPointer<QStorageInfoPrivate> d;
-};
-
-inline bool operator==(const QStorageInfo &first, const QStorageInfo &second)
-{
-    if (first.d == second.d)
-        return true;
-    return first.device() == second.device();
-}
-
-inline bool operator!=(const QStorageInfo &first, const QStorageInfo &second)
-{
-    return !(first == second);
-}
-
-inline bool QStorageInfo::isRoot() const
-{ return *this == QStorageInfo::root(); }
-
-Q_DECLARE_SHARED(QStorageInfo)
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QStorageInfo)
-
-#endif // QSTORAGEINFO_H

=== removed file 'CameraApp/qstorageinfo_p.h'
--- CameraApp/qstorageinfo_p.h	2015-01-27 14:34:31 +0000
+++ CameraApp/qstorageinfo_p.h	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Ivan Komissarov <[e-mail]>
-** Contact: http://www.qt-project.org/legal
-**
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; version 3.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program.  If not, see <http://www.gnu.org/licenses/>.
-**
-****************************************************************************/
-
-#ifndef QSTORAGEINFO_P_H
-#define QSTORAGEINFO_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qstorageinfo.h"
-
-QT_BEGIN_NAMESPACE
-
-class QStorageInfoPrivate : public QSharedData
-{
-public:
-    inline QStorageInfoPrivate() : QSharedData(),
-        bytesTotal(0), bytesFree(0), bytesAvailable(0),
-        readOnly(false), ready(false), valid(false)
-    {}
-
-    void initRootPath();
-    void doStat();
-
-    static QList<QStorageInfo> mountedVolumes();
-    static QStorageInfo root();
-
-protected:
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
-    void retreiveVolumeInfo();
-    void retreiveDiskFreeSpace();
-#elif defined(Q_OS_MAC)
-    void retrievePosixInfo();
-    void retrieveUrlProperties(bool initRootPath = false);
-    void retrieveLabel();
-#elif defined(Q_OS_UNIX)
-    void retreiveVolumeInfo();
-#endif
-
-public:
-    QString rootPath;
-    QByteArray device;
-    QByteArray fileSystemType;
-    QString name;
-
-    qint64 bytesTotal;
-    qint64 bytesFree;
-    qint64 bytesAvailable;
-
-    bool readOnly;
-    bool ready;
-    bool valid;
-};
-
-QT_END_NAMESPACE
-
-#endif // QSTORAGEINFO_P_H

=== removed file 'CameraApp/qstorageinfo_unix.cpp'
--- CameraApp/qstorageinfo_unix.cpp	2015-01-27 14:34:31 +0000
+++ CameraApp/qstorageinfo_unix.cpp	1970-01-01 00:00:00 +0000
@@ -1,442 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Ivan Komissarov <[e-mail]>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; version 3.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program.  If not, see <http://www.gnu.org/licenses/>.
-**
-****************************************************************************/
-
-#include "qstorageinfo_p.h"
-
-#include <QtCore/qdiriterator.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qtextstream.h>
-
-// Copy this definition directly instead of importing the whole file which
-// would pull in more dependencies we don't need.
-//#include <QtCore/private/qcore_unix_p.h>
-#define EINTR_LOOP(var, cmd)                    \
-    do {                                        \
-        var = cmd;                              \
-    } while (var == -1 && errno == EINTR)
-
-#include <errno.h>
-#include <sys/stat.h>
-
-#if defined(Q_OS_BSD4)
-#  include <sys/mount.h>
-#  include <sys/statvfs.h>
-#elif defined(Q_OS_ANDROID)
-#  include <sys/mount.h>
-#  include <sys/vfs.h>
-#  include <mntent.h>
-#elif defined(Q_OS_LINUX)
-#  include <mntent.h>
-#  include <sys/statvfs.h>
-#elif defined(Q_OS_SOLARIS)
-#  include <sys/mnttab.h>
-#else
-#  include <sys/statvfs.h>
-#endif
-
-#if defined(Q_OS_BSD4)
-#  define QT_STATFSBUF struct statvfs
-#  define QT_STATFS    ::statvfs
-#elif defined(Q_OS_ANDROID)
-#  define QT_STATFS    ::statfs
-#  define QT_STATFSBUF struct statfs
-#  if !defined(ST_RDONLY)
-#    define ST_RDONLY 1 // hack for missing define on Android
-#  endif
-#else
-#  if defined(QT_LARGEFILE_SUPPORT)
-#    define QT_STATFSBUF struct statvfs64
-#    define QT_STATFS    ::statvfs64
-#  else
-#    define QT_STATFSBUF struct statvfs
-#    define QT_STATFS    ::statvfs
-#  endif // QT_LARGEFILE_SUPPORT
-#endif // Q_OS_BSD4
-
-QT_BEGIN_NAMESPACE
-
-static bool isPseudoFs(const QString &mountDir, const QByteArray &type)
-{
-    if (mountDir.startsWith(QLatin1String("/dev"))
-        || mountDir.startsWith(QLatin1String("/proc"))
-        || mountDir.startsWith(QLatin1String("/sys"))
-        || mountDir.startsWith(QLatin1String("/var/run"))
-        || mountDir.startsWith(QLatin1String("/var/lock"))) {
-        return true;
-    }
-    if (type == "tmpfs")
-        return true;
-#if defined(Q_OS_LINUX)
-    if (type == "rootfs" || type == "rpc_pipefs")
-        return true;
-#endif
-
-    return false;
-}
-
-class QStorageIterator
-{
-public:
-    QStorageIterator();
-    ~QStorageIterator();
-
-    inline bool isValid() const;
-    inline bool next();
-    inline QString rootPath() const;
-    inline QByteArray fileSystemType() const;
-    inline QByteArray device() const;
-private:
-#if defined(Q_OS_BSD4)
-    struct statfs *stat_buf;
-    int entryCount;
-    int currentIndex;
-#elif defined(Q_OS_SOLARIS)
-    FILE *fp;
-    mnttab mnt;
-#elif defined(Q_OS_ANDROID)
-    QFile file;
-    QByteArray m_rootPath;
-    QByteArray m_fileSystemType;
-    QByteArray m_device;
-#elif defined(Q_OS_LINUX)
-    FILE *fp;
-    mntent mnt;
-    QByteArray buffer;
-#endif
-};
-
-#if defined(Q_OS_BSD4)
-
-inline QStorageIterator::QStorageIterator()
-    : entryCount(::getmntinfo(&stat_buf, 0)),
-      currentIndex(-1)
-{
-}
-
-inline QStorageIterator::~QStorageIterator()
-{
-}
-
-inline bool QStorageIterator::isValid() const
-{
-    return entryCount != -1;
-}
-
-inline bool QStorageIterator::next()
-{
-    return ++currentIndex < entryCount;
-}
-
-inline QString QStorageIterator::rootPath() const
-{
-    return QFile::decodeName(stat_buf[currentIndex].f_mntonname);
-}
-
-inline QByteArray QStorageIterator::fileSystemType() const
-{
-    return QByteArray(stat_buf[currentIndex].f_fstypename);
-}
-
-inline QByteArray QStorageIterator::device() const
-{
-    return QByteArray(stat_buf[currentIndex].f_mntfromname);
-}
-
-#elif defined(Q_OS_SOLARIS)
-
-static const char pathMounted[] = "/etc/mnttab";
-
-inline QStorageIterator::QStorageIterator()
-{
-    const int fd = qt_safe_open(pathMounted, O_RDONLY);
-    fp = ::fdopen(fd, "r");
-}
-
-inline QStorageIterator::~QStorageIterator()
-{
-    if (fp)
-        ::fclose(fp);
-}
-
-inline bool QStorageIterator::isValid() const
-{
-    return fp != Q_NULLPTR;
-}
-
-inline bool QStorageIterator::next()
-{
-    return ::getmntent(fp, &mnt) == Q_NULLPTR;
-}
-
-inline QString QStorageIterator::rootPath() const
-{
-    return QFile::decodeName(mnt->mnt_mountp);
-}
-
-inline QByteArray QStorageIterator::fileSystemType() const
-{
-    return QByteArray(mnt->mnt_fstype);
-}
-
-inline QByteArray QStorageIterator::device() const
-{
-    return QByteArray(mnt->mnt_mntopts);
-}
-
-#elif defined(Q_OS_ANDROID)
-
-static const char pathMounted[] = "/proc/mounts";
-
-inline QStorageIterator::QStorageIterator()
-{
-    file.setFileName(pathMounted);
-    file.open(QIODevice::ReadOnly | QIODevice::Text);
-}
-
-inline QStorageIterator::~QStorageIterator()
-{
-}
-
-inline bool QStorageIterator::isValid() const
-{
-    return file.isOpen();
-}
-
-inline bool QStorageIterator::next()
-{
-    QList<QByteArray> data;
-    do {
-        const QByteArray line = file.readLine();
-        data = line.split(' ');
-    } while (data.count() < 3 && !file.atEnd());
-
-    if (file.atEnd())
-        return false;
-    m_device = data.at(0);
-    m_rootPath = data.at(1);
-    m_fileSystemType = data.at(2);
-
-    return true;
-}
-
-inline QString QStorageIterator::rootPath() const
-{
-    return QFile::decodeName(m_rootPath);
-}
-
-inline QByteArray QStorageIterator::fileSystemType() const
-{
-    return m_fileSystemType;
-}
-
-inline QByteArray QStorageIterator::device() const
-{
-    return m_device;
-}
-
-#elif defined(Q_OS_LINUX)
-
-static const char pathMounted[] = "/etc/mtab";
-static const int bufferSize = 3*PATH_MAX; // 2 paths (mount point+device) and metainfo
-
-inline QStorageIterator::QStorageIterator() :
-    buffer(QByteArray(bufferSize, 0))
-{
-    fp = ::setmntent(pathMounted, "r");
-}
-
-inline QStorageIterator::~QStorageIterator()
-{
-    if (fp)
-        ::endmntent(fp);
-}
-
-inline bool QStorageIterator::isValid() const
-{
-    return fp != Q_NULLPTR;
-}
-
-inline bool QStorageIterator::next()
-{
-    return ::getmntent_r(fp, &mnt, buffer.data(), buffer.size()) != Q_NULLPTR;
-}
-
-inline QString QStorageIterator::rootPath() const
-{
-    return QFile::decodeName(mnt.mnt_dir);
-}
-
-inline QByteArray QStorageIterator::fileSystemType() const
-{
-    return QByteArray(mnt.mnt_type);
-}
-
-inline QByteArray QStorageIterator::device() const
-{
-    return QByteArray(mnt.mnt_fsname);
-}
-
-#else
-
-inline QStorageIterator::QStorageIterator()
-{
-}
-
-inline QStorageIterator::~QStorageIterator()
-{
-}
-
-inline bool QStorageIterator::isValid() const
-{
-    return false;
-}
-
-inline bool QStorageIterator::next()
-{
-    return false;
-}
-
-inline QString QStorageIterator::rootPath() const
-{
-    return QString();
-}
-
-inline QByteArray QStorageIterator::fileSystemType() const
-{
-    return QByteArray();
-}
-
-inline QByteArray QStorageIterator::device() const
-{
-    return QByteArray();
-}
-
-#endif
-
-void QStorageInfoPrivate::initRootPath()
-{
-    rootPath = QFileInfo(rootPath).canonicalFilePath();
-
-    if (rootPath.isEmpty())
-        return;
-
-    QStorageIterator it;
-    if (!it.isValid()) {
-        rootPath = QStringLiteral("/");
-        return;
-    }
-
-    int maxLength = 0;
-    const QString oldRootPath = rootPath;
-    rootPath.clear();
-
-    while (it.next()) {
-        const QString mountDir = it.rootPath();
-        const QByteArray fsName = it.fileSystemType();
-        if (isPseudoFs(mountDir, fsName))
-            continue;
-        // we try to find most suitable entry
-        if (oldRootPath.startsWith(mountDir) && maxLength < mountDir.length()) {
-            maxLength = mountDir.length();
-            rootPath = mountDir;
-            device = it.device();
-            fileSystemType = fsName;
-        }
-    }
-}
-
-static inline QString retrieveLabel(const QByteArray &device)
-{
-#ifdef Q_OS_LINUX
-    static const char pathDiskByLabel[] = "/dev/disk/by-label";
-
-    QDirIterator it(QLatin1String(pathDiskByLabel), QDir::NoDotAndDotDot);
-    while (it.hasNext()) {
-        it.next();
-        QFileInfo fileInfo(it.fileInfo());
-        if (fileInfo.isSymLink() && fileInfo.symLinkTarget().toLocal8Bit() == device)
-            return fileInfo.fileName();
-    }
-#else
-    Q_UNUSED(device);
-#endif
-
-    return QString();
-}
-
-void QStorageInfoPrivate::doStat()
-{
-    initRootPath();
-    if (rootPath.isEmpty())
-        return;
-
-    retreiveVolumeInfo();
-    name = retrieveLabel(device);
-}
-
-void QStorageInfoPrivate::retreiveVolumeInfo()
-{
-    QT_STATFSBUF statfs_buf;
-    int result;
-    EINTR_LOOP(result, QT_STATFS(QFile::encodeName(rootPath).constData(), &statfs_buf));
-    if (result == 0) {
-        valid = true;
-        ready = true;
-
-        bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
-        bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
-        bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
-#if defined(Q_OS_ANDROID)
-#if defined(_STATFS_F_FLAGS)
-        readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
-#endif
-#else
-        readOnly = (statfs_buf.f_flag & ST_RDONLY) != 0;
-#endif
-    }
-}
-
-QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()
-{
-    QStorageIterator it;
-    if (!it.isValid())
-        return QList<QStorageInfo>() << root();
-
-    QList<QStorageInfo> volumes;
-
-    while (it.next()) {
-        const QString mountDir = it.rootPath();
-        const QByteArray fsName = it.fileSystemType();
-        if (isPseudoFs(mountDir, fsName))
-            continue;
-
-        volumes.append(QStorageInfo(mountDir));
-    }
-
-    return volumes;
-}
-
-QStorageInfo QStorageInfoPrivate::root()
-{
-    return QStorageInfo(QStringLiteral("/"));
-}
-
-QT_END_NAMESPACE

=== added file 'CameraApp/storagelocations.cpp'
--- CameraApp/storagelocations.cpp	1970-01-01 00:00:00 +0000
+++ CameraApp/storagelocations.cpp	2016-02-26 17:17:00 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "storagelocations.h"
+
+#include <QCoreApplication>
+#include <QStandardPaths>
+#include <QStorageInfo>
+
+StorageLocations::StorageLocations(QObject *parent) : QObject(parent)
+{
+}
+
+QString StorageLocations::picturesLocation() const
+{
+    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
+    if (locations.isEmpty()) {
+        return QString();
+    }
+    QString location = locations.at(0) + "/" + QCoreApplication::applicationName();
+    QDir dir;
+    // Transition from old directory 'camera' to new one; see bug #1363112
+    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1363112
+    dir.rename(locations.at(0) + "/" + "camera", location);
+    dir.mkpath(location);
+    return location;
+}
+
+QString StorageLocations::videosLocation() const
+{
+    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
+    if (locations.isEmpty()) {
+        return QString();
+    }
+    QString location = locations.at(0) + "/" + QCoreApplication::applicationName();
+    QDir dir;
+    // Transition from old directory 'camera' to new one; see bug #1363112
+    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1363112
+    dir.rename(locations.at(0) + "/" + "camera", location);
+    dir.mkpath(location);
+    return location;
+}
+
+QString StorageLocations::temporaryLocation() const
+{
+    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::TempLocation);
+    if (locations.isEmpty()) {
+        return QString();
+    }
+    QString location = locations.at(0);
+    QDir dir;
+    dir.mkpath(location);
+    return location;
+}
+
+QString StorageLocations::removableStorageLocation() const
+{
+    QString mediaRoot("/media/" + qgetenv("USER"));
+    Q_FOREACH(QStorageInfo volume, QStorageInfo::mountedVolumes()) {
+         if (volume.rootPath().startsWith(mediaRoot) &&
+             volume.isValid() && volume.isReady()) {
+            return volume.rootPath();
+         }
+    }
+
+    return QString();
+}
+
+QString StorageLocations::removableStoragePicturesLocation() const
+{
+    QString storageLocation = removableStorageLocation();
+    if (storageLocation.isEmpty()) {
+        return QString();
+    }
+
+    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
+    QString pictureDir = QString(locations.at(0)).split("/").value(3);
+    if (pictureDir.isEmpty()){
+        return QString();
+    }
+    QString location = storageLocation + "/" + pictureDir + "/" + QCoreApplication::applicationName();
+    QDir dir;
+    dir.mkpath(location);
+    return location;
+}
+
+QString StorageLocations::removableStorageVideosLocation() const
+{
+    QString storageLocation = removableStorageLocation();
+    if (storageLocation.isEmpty()) {
+        return QString();
+    }
+
+    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
+    QString movieDir = QString(locations.at(0)).split("/").value(3);
+    if (movieDir.isEmpty()){
+        return QString();
+    }
+    QString location = storageLocation + "/" + movieDir + "/" + QCoreApplication::applicationName();
+    QDir dir;
+    dir.mkpath(location);
+    return location;
+}
+
+bool StorageLocations::removableStoragePresent() const
+{
+    return !removableStorageLocation().isEmpty();
+}

=== added file 'CameraApp/storagelocations.h'
--- CameraApp/storagelocations.h	1970-01-01 00:00:00 +0000
+++ CameraApp/storagelocations.h	2016-02-26 17:17:00 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef STORAGELOCATIONS_H
+#define STORAGELOCATIONS_H
+
+#include <QObject>
+
+class StorageLocations : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString picturesLocation READ picturesLocation CONSTANT)
+    Q_PROPERTY(QString videosLocation READ videosLocation CONSTANT)
+    Q_PROPERTY(QString temporaryLocation READ temporaryLocation CONSTANT)
+    Q_PROPERTY(QString removableStorageLocation READ removableStorageLocation CONSTANT)
+    Q_PROPERTY(QString removableStoragePicturesLocation READ removableStoragePicturesLocation CONSTANT)
+    Q_PROPERTY(QString removableStorageVideosLocation READ removableStorageVideosLocation CONSTANT)
+    Q_PROPERTY(bool removableStoragePresent READ removableStoragePresent NOTIFY removableStoragePresentChanged)
+
+public:
+    explicit StorageLocations(QObject *parent = 0);
+
+    QString picturesLocation() const;
+    QString videosLocation() const;
+    QString temporaryLocation() const;
+    QString removableStorageLocation() const;
+    QString removableStoragePicturesLocation() const;
+    QString removableStorageVideosLocation() const;
+
+    bool removableStoragePresent() const;
+
+Q_SIGNALS:
+    void removableStoragePresentChanged();
+};
+
+#endif // STORAGELOCATIONS_H

=== modified file 'CameraApp/storagemonitor.cpp'
--- CameraApp/storagemonitor.cpp	2015-01-23 19:28:44 +0000
+++ CameraApp/storagemonitor.cpp	2016-02-26 17:17:00 +0000
@@ -15,9 +15,10 @@
  */
 
 #include "storagemonitor.h"
+#include "storagelocations.h"
 
 StorageMonitor::StorageMonitor(QObject *parent) :
-    QObject(parent), m_low(false), m_criticallyLow(false)
+    QObject(parent), m_low(false), m_criticallyLow(false), m_writeable(true)
 {
     m_timer.setInterval(POLL_INTERVAL);
     m_timer.setSingleShot(false);
@@ -54,6 +55,32 @@
     }
 }
 
+void StorageMonitor::checkWriteable()
+{
+    bool writeable = true;
+
+    QString mediaRoot("/media/" + qgetenv("USER"));
+    if (m_storage.rootPath().startsWith(mediaRoot)) {
+        // check only for external media, assume internal media is always writeable
+        if (m_storage.isReadOnly()) {
+            writeable = false;
+        } else {
+            StorageLocations locations;
+            QDir storageRoot(locations.removableStoragePicturesLocation());
+            QFile testFile(storageRoot.absoluteFilePath(".write_test"));
+            bool opened = testFile.open(QIODevice::WriteOnly | QIODevice::Unbuffered);
+            if (!opened || testFile.write("x", 1) != 1) writeable = false;
+            testFile.close();
+            testFile.remove();
+        }
+    }
+
+    if (m_writeable != writeable) {
+        m_writeable = writeable;
+        Q_EMIT isWriteableChanged();
+    }
+}
+
 void StorageMonitor::setLocation(QString location)
 {
     if (location != m_location) {
@@ -62,6 +89,7 @@
 
         m_storage.setPath(m_location);
         checkDiskSpace();
+        checkWriteable();
         if (m_storage.isValid()) {
             m_timer.start();
         }
@@ -84,3 +112,8 @@
 {
     return m_criticallyLow;
 }
+
+bool StorageMonitor::isWriteable() const
+{
+    return m_writeable;
+}

=== modified file 'CameraApp/storagemonitor.h'
--- CameraApp/storagemonitor.h	2015-01-23 19:29:03 +0000
+++ CameraApp/storagemonitor.h	2016-02-26 17:17:00 +0000
@@ -34,6 +34,7 @@
     Q_PROPERTY(QString location READ location WRITE setLocation NOTIFY locationChanged)
     Q_PROPERTY(bool diskSpaceLow READ diskSpaceLow NOTIFY diskSpaceLowChanged)
     Q_PROPERTY(bool diskSpaceCriticallyLow READ diskSpaceCriticallyLow NOTIFY diskSpaceCriticallyLowChanged)
+    Q_PROPERTY(bool isWriteable READ isWriteable NOTIFY isWriteableChanged)
 
 public:
     explicit StorageMonitor(QObject *parent = 0);
@@ -42,21 +43,25 @@
     void setLocation(QString location);
     bool diskSpaceLow() const;
     bool diskSpaceCriticallyLow() const;
+    bool isWriteable() const;
 
 Q_SIGNALS:
     void locationChanged();
     void diskSpaceLowChanged();
     void diskSpaceCriticallyLowChanged();
+    void isWriteableChanged();
 
 private Q_SLOTS:
     void refresh();
 
 private:
     void checkDiskSpace();
+    void checkWriteable();
 
 private:
     bool m_low;
     bool m_criticallyLow;
+    bool m_writeable;
     QTimer m_timer;
     QString m_location;
     QStorageInfo m_storage;

=== modified file 'GalleryView.qml'
--- GalleryView.qml	2015-11-26 11:29:18 +0000
+++ GalleryView.qml	2016-02-26 17:17:00 +0000
@@ -30,9 +30,9 @@
     property bool userSelectionMode: false
     property Item currentView: state == "GRID" ? photogridView : slideshowView
     property var model: FoldersModel {
-        folders: [application.picturesLocation, application.videosLocation,
-                  application.removableStoragePicturesLocation,
-                  application.removableStorageVideosLocation]
+        folders: [StorageLocations.picturesLocation, StorageLocations.videosLocation,
+                  StorageLocations.removableStoragePicturesLocation,
+                  StorageLocations.removableStorageVideosLocation]
         typeFilters: !main.contentExportMode ? [ "image", "video" ]
                                               : [MimeTypeMapper.contentTypeToMimeType(main.transferContentType)]
         singleSelectionOnly: main.transfer.selectionType === ContentTransfer.Single

=== modified file 'GalleryViewHeader.qml'
--- GalleryViewHeader.qml	2015-10-30 15:01:10 +0000
+++ GalleryViewHeader.qml	2016-02-26 17:17:00 +0000
@@ -73,7 +73,7 @@
             }
             width: units.gu(8)
             iconName: "back"
-            iconColor: theme.palette.normal.foregroundText
+            iconColor: "white"
             onClicked: editMode ? header.exitEditor() : header.exit()
         }
 
@@ -81,7 +81,7 @@
             text: main.contentExportMode || userSelectionMode ? i18n.tr("Select") :
                   (editMode ? i18n.tr("Edit Photo") : i18n.tr("Photo Roll"))
             fontSize: "x-large"
-            color: theme.palette.normal.foregroundText
+            color: "white"
             elide: Text.ElideRight
             Layout.fillWidth: true
         }
@@ -228,7 +228,7 @@
                         }
                         text: model.text
                         elide: Text.ElideRight
-                        color: action.enabled ? theme.palette.normal.foregroundText : Qt.darker(theme.palette.normal.foregroundText, 2.0)
+                        color: action.enabled ? "white" : Qt.darker("white", 2.0)
                     }
 
                     Icon {

=== added file 'PictureReview.qml'
--- PictureReview.qml	1970-01-01 00:00:00 +0000
+++ PictureReview.qml	2016-02-26 17:17:00 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Window 2.2
+
+Item {
+    id: snapshotRoot
+    property alias source: image.source
+    property ViewFinderGeometry geometry
+    property bool loaded: image.status == Image.Ready
+
+    // Rotation is locked at the moment the picture is shoot
+    // (in case processing is long, such as with HDR)
+    function lockOrientation() {
+        image.rotation = Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
+    }
+
+    Image {
+        id: image
+        anchors.centerIn: parent
+        anchors.verticalCenterOffset: -geometry.y
+
+        asynchronous: true
+        cache: false
+        fillMode: Image.PreserveAspectFit
+        smooth: false
+        width: rotation == 0 ? geometry.width : geometry.height
+        height: rotation == 0 ? geometry.height : geometry.width
+        sourceSize.width: width
+        sourceSize.height: height
+    }
+}

=== added file 'ProcessingFeedback.qml'
--- ProcessingFeedback.qml	1970-01-01 00:00:00 +0000
+++ ProcessingFeedback.qml	2016-02-26 17:17:00 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: processingFeedback
+
+    property bool processing: false
+
+    Timer {
+        interval: 2000
+        running: processing
+        onTriggered: spinner.running = true
+    }
+
+    onProcessingChanged: if (!processing) spinner.running = false
+
+    ActivityIndicator {
+        id: spinner
+        opacity: running ? 1.0 : 0.0
+        Behavior on opacity {
+            OpacityAnimator {
+                duration: UbuntuAnimation.SnapDuration
+                easing: UbuntuAnimation.StandardEasing
+            }
+        }
+    }
+}

=== modified file 'SharePopover.qml'
--- SharePopover.qml	2015-10-22 12:46:34 +0000
+++ SharePopover.qml	2016-02-26 17:17:00 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 
 PopupBase {
     property var transferContentType 
@@ -31,17 +31,9 @@
         contentPeerPicker.peerSelected.connect(contentPeerSelected);
     }
 
-    // FIXME: ContentPeerPicker should either have a background or not, not half of one
-    Rectangle {
-        anchors.fill: parent
-        color: theme.palette.normal.overlay
-    }
-
     ContentPeerPicker {
         id: contentPeerPicker
         // FIXME: ContentPeerPicker should define an implicit size and not refer to its parent
-        // FIXME: ContentPeerPicker should not be visible: false by default
-        visible: true
         Component.onCompleted: {
             contentType = parent.transferContentType;
         }

=== removed file 'Snapshot.qml'
--- Snapshot.qml	2015-10-22 12:21:14 +0000
+++ Snapshot.qml	1970-01-01 00:00:00 +0000
@@ -1,98 +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 as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import Ubuntu.Components 1.3
-
-Item {
-    id: snapshotRoot
-    property alias source: snapshot.source
-    property alias sliding: shoot.running
-    property int orientation
-    property ViewFinderGeometry geometry
-    property bool deviceDefaultIsPortrait: true
-    property bool loading: snapshot.status == Image.Loading
-
-    function startOutAnimation() {
-        shoot.restart()
-    }
-
-    visible: false
-
-    Item {
-        id: container
-        width: parent.width
-        height: parent.height
-
-        Image {
-            id: snapshot
-            anchors.centerIn: parent
-            anchors.verticalCenterOffset: -geometry.y
-            rotation: snapshotRoot.orientation * -1
-
-            asynchronous: true
-            cache: false
-            fillMode: Image.PreserveAspectFit
-            smooth: false
-            width: deviceDefaultIsPortrait ? geometry.height : geometry.width
-            height: deviceDefaultIsPortrait ? geometry.width : geometry.height
-            sourceSize.width: width
-            sourceSize.height: height
-        }
-
-        Image {
-            id: shadow
-
-            property bool rotated: (snapshot.rotation % 180) != 0
-            height: rotated ? snapshot.width : snapshot.height
-            width: units.gu(2)
-            x: (container.width - (rotated ? snapshot.height : snapshot.width)) / 2 - width
-            source: "assets/shadow.png"
-            fillMode: Image.Stretch
-            asynchronous: true
-            cache: false
-        }
-    }
-    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
-    property var angleToOrientation: {0: "PORTRAIT",
-                                      90: "LANDSCAPE",
-                                      270: "INVERTED_LANDSCAPE"}
-
-    SequentialAnimation {
-        id: shoot
-
-        PropertyAction { target: snapshotRoot; property: "visible"; value: true }
-        PauseAnimation { duration: 150 }
-        XAnimator {
-            target: container
-            to: angleToOrientation[orientationAngle] == "PORTRAIT" ? container.width + shadow.width : 0
-            duration: UbuntuAnimation.BriskDuration
-            easing: UbuntuAnimation.StandardEasing
-        }
-        YAnimator {
-            target: container
-            to: angleToOrientation[orientationAngle] == "LANDSCAPE" ? container.height + shadow.width :
-                angleToOrientation[orientationAngle] == "INVERTED_LANDSCAPE" ? -(container.height + shadow.width) : 0
-            duration: UbuntuAnimation.BriskDuration
-            easing: UbuntuAnimation.StandardEasing
-        }
-        PropertyAction { target: snapshot; property: "source"; value: ""}
-        PropertyAction { target: snapshotRoot; property: "visible"; value: false }
-        PropertyAction { target: container; property: "x"; value: 0 }
-        PropertyAction { target: container; property: "y"; value: 0 }
-    }
-}

=== modified file 'ViewFinderExportConfirmation.qml'
--- ViewFinderExportConfirmation.qml	2015-12-10 12:17:49 +0000
+++ ViewFinderExportConfirmation.qml	2016-02-26 17:17:00 +0000
@@ -22,39 +22,56 @@
 
     property bool isVideo
     property string mediaPath
-    property Snapshot snapshot
-
-    function confirmExport(path) {
-        viewFinder.visible = false;
-        viewFinderOverlay.visible = false;
-        mediaPath = path;
-        if (!isVideo) snapshot.visible = true;
-        visible = true;
-    }
-
-    function hide() {
-        viewFinder.visible = true;
-        viewFinderOverlay.visible = true;
-        snapshot.source = "";
-        snapshot.visible = false;
-        visible = false;
-    }
+    property bool waitingForPictureCapture: false
+
+    signal hideRequested()
+    signal showRequested()
+    property ViewFinderGeometry viewFinderGeometry
 
     visible: false
 
+    // For videos show immediately without waiting for the preview to load,
+    // since we will show a progress indicator instead of the preview
+    onMediaPathChanged: if (mediaPath && isVideo) showRequested()
+
+    function photoCaptureStarted() {
+        controls.item.lockPictureOrientation()
+        waitingForPictureCapture = true
+    }
+
     Loader {
+        id: controls
         anchors.fill: parent
         asynchronous: true
         sourceComponent: Component {
             Item {
+                function lockPictureOrientation() { pictureReview.lockOrientation() }
+
                 VideoReview {
                     id: videoReview
                     anchors.fill: parent
                     bottomMargin: buttons.height
-                    videoPath: mediaPath
+                    videoPath: isVideo ? mediaPath : ""
                     visible: isVideo
                 }
 
+                PictureReview {
+                    id: pictureReview
+                    anchors.fill: parent
+                    visible: !isVideo
+                    geometry: viewFinderGeometry
+                    source: !isVideo ? mediaPath : ""
+
+                    // Show export confirmation only when the snapshot is loaded to prevent the
+                    // screen being black while the image loads
+                    onLoadedChanged: {
+                        if (loaded) {
+                             viewFinderExportConfirmation.showRequested()
+                             waitingForPictureCapture = false
+                         }
+                    }
+                }
+
                 Item {
                     id: buttons
                     anchors.bottom: parent.bottom
@@ -74,7 +91,7 @@
                         }
 
                         iconName: "reload"
-                        onClicked: viewFinderExportConfirmation.hide()
+                        onClicked: hideRequested()
                     }
 
                     CircleButton {
@@ -90,8 +107,9 @@
 
                         iconName: "ok"
                         onClicked: {
-                            viewFinderExportConfirmation.hide();
+                            hideRequested();
                             main.exportContent([mediaPath]);
+                            mediaPath = "";
                         }
                     }
 
@@ -108,8 +126,9 @@
 
                         iconName: "close"
                         onClicked: {
-                            viewFinderExportConfirmation.hide();
+                            hideRequested();
                             main.cancelExport();
+                            mediaPath = "";
                         }
                     }
                 }

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-01-11 15:07:58 +0000
+++ ViewFinderOverlay.qml	2016-02-26 17:17:00 +0000
@@ -32,6 +32,7 @@
     property real revealProgress: noSpaceHint.visible ? 1.0 : bottomEdge.progress
     property var controls: controls
     property var settings: settings
+    property bool readyForCapture
 
     function showFocusRing(x, y) {
         focusRing.center = Qt.point(x, y);
@@ -217,12 +218,31 @@
             photoResolutionOptionsModel.insert(1, optionFitting);
         }
 
+        // If resolution setting is not supported select the resolution automatically
         var photoResolution = settings["photoResolution" + camera.advanced.activeCameraIndex];
-        // If resolution setting chosen is not supported select the fitting resolution
-        if (photoResolution != optionFitting.value &&
-            photoResolution != optionMaximum.value) {
-            settings["photoResolution" + camera.advanced.activeCameraIndex] = optionFitting.value;
-        }
+        if (!isResolutionAnOption(photoResolution)) {
+            settings["photoResolution" + camera.advanced.activeCameraIndex] = getAutomaticResolution();
+        }
+    }
+
+    function getAutomaticResolution() {
+        var fittingResolution = sizeToString(camera.advanced.fittingResolution);
+        var maximumResolution = sizeToString(camera.advanced.maximumResolution);
+        if (isResolutionAnOption(fittingResolution)) {
+            return fittingResolution;
+        } else {
+            return maximumResolution;
+        }
+    }
+
+    function isResolutionAnOption(resolution) {
+        for (var i=0; i<photoResolutionOptionsModel.count; i++) {
+            var option = photoResolutionOptionsModel.get(i);
+            if (option.value == resolution) {
+                return true;
+            }
+        }
+        return false;
     }
 
     function updateResolutionOptions() {
@@ -249,9 +269,9 @@
             settings.videoResolution = sizeToString(camera.advanced.videoRecorderResolution);
             updateResolutionOptions();
 
-            // If no resolution has ever been chosen, select the one that fits the screen
+            // If no resolution has ever been chosen, select one automatically
             if (!hasPhotoResolutionSetting) {
-                settings["photoResolution" + camera.advanced.activeCameraIndex] = sizeToString(camera.advanced.fittingResolution);
+                settings["photoResolution" + camera.advanced.activeCameraIndex] = getAutomaticResolution();
             }
         }
     }
@@ -288,16 +308,6 @@
                      && !camera.photoCaptureInProgress
             opacity: enabled ? 1.0 : 0.3
 
-            Item {
-                /* Use the 'trigger' feature of Panel so that tapping on the Panel
-                   has the same effect as tapping outside of it (bottomEdgeClose) */
-                id: clickReceiver
-                anchors.fill: parent
-                function trigger() {
-                    optionsOverlayClose();
-                }
-            }
-
             /* At startup, opened is false and 'bottomEdge.height' is 0 until
                optionsOverlayLoader has finished loading. When that happens
                'bottomEdge.height' becomes non 0 and 'bottomEdge.position' which
@@ -321,6 +331,7 @@
                     property bool available: true
                     property bool visible: true
                     property bool showInIndicators: true
+                    property bool colorize: !positionSource.isPrecise
 
                     ListElement {
                         icon: ""
@@ -492,7 +503,7 @@
                     property string label: i18n.tr("SD")
                     property bool isToggle: true
                     property int selectedIndex: bottomEdge.indexForValue(removableStorageOptionsModel, settings.preferRemovableStorage)
-                    property bool available: application.removableStoragePresent
+                    property bool available: StorageLocations.removableStoragePresent
                     property bool visible: available
 
                     ListElement {
@@ -555,12 +566,12 @@
                 }
             ]
 
-            /* FIXME: application.removableStoragePresent is not updated dynamically.
+            /* FIXME: StorageLocations.removableStoragePresent is not updated dynamically.
                Workaround that by reading it when the bottom edge is opened/closed.
             */
             Connections {
                 target: bottomEdge
-                onOpenedChanged: removableStorageOptionsModel.available = application.removableStoragePresent
+                onOpenedChanged: removableStorageOptionsModel.available = StorageLocations.removableStoragePresent
             }
 
             function indexForValue(model, value) {
@@ -601,6 +612,24 @@
                     }
                 }
             }
+
+            triggerSize: units.gu(3)
+
+            Item {
+                /* Use the 'trigger' feature of Panel so that tapping on the Panel
+                   can be acted upon */
+                id: clickReceiver
+                anchors.fill: parent
+                anchors.topMargin: -bottomEdge.triggerSize
+
+                function trigger() {
+                    if (bottomEdge.opened) {
+                        optionsOverlayClose();
+                    } else {
+                        bottomEdge.open();
+                    }
+                }
+            }
         }
     }
 
@@ -669,11 +698,11 @@
 
             if (camera.captureMode == Camera.CaptureVideo) {
                 if (main.contentExportMode) {
-                    camera.videoRecorder.outputLocation = application.temporaryLocation;
-                } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
-                    camera.videoRecorder.outputLocation = application.removableStorageVideosLocation;
+                    camera.videoRecorder.outputLocation = StorageLocations.temporaryLocation;
+                } else if (StorageLocations.removableStoragePresent && settings.preferRemovableStorage) {
+                    camera.videoRecorder.outputLocation = StorageLocations.removableStorageVideosLocation;
                 } else {
-                    camera.videoRecorder.outputLocation = application.videosLocation;
+                    camera.videoRecorder.outputLocation = StorageLocations.videosLocation;
                 }
 
                 if (camera.videoRecorder.recorderState == CameraRecorder.StoppedState) {
@@ -684,11 +713,10 @@
                 if (!main.contentExportMode) {
                     shootFeedback.start();
                 }
+                camera.photoCaptureInProgress = true;
                 camera.imageCapture.setMetadata("Orientation", orientation);
                 var position = positionSource.position;
-                if (settings.gpsEnabled && positionSource.valid
-                        && position.latitudeValid
-                        && position.longitudeValid) {
+                if (settings.gpsEnabled && positionSource.isPrecise) {
                     camera.imageCapture.setMetadata("GPSLatitude", position.coordinate.latitude);
                     camera.imageCapture.setMetadata("GPSLongitude", position.coordinate.longitude);
                     camera.imageCapture.setMetadata("GPSTimeStamp", position.timestamp);
@@ -698,13 +726,12 @@
                     }
                 }
 
-                camera.photoCaptureInProgress = true;
                 if (main.contentExportMode) {
-                    camera.imageCapture.captureToLocation(application.temporaryLocation);
-                } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
-                    camera.imageCapture.captureToLocation(application.removableStoragePicturesLocation);
+                    camera.imageCapture.captureToLocation(StorageLocations.temporaryLocation);
+                } else if (StorageLocations.removableStoragePresent && settings.preferRemovableStorage) {
+                    camera.imageCapture.captureToLocation(StorageLocations.removableStoragePicturesLocation);
                 } else {
-                    camera.imageCapture.captureToLocation(application.picturesLocation);
+                    camera.imageCapture.captureToLocation(StorageLocations.picturesLocation);
                 }
             }
         }
@@ -760,6 +787,11 @@
             id: positionSource
             updateInterval: 1000
             active: settings.gpsEnabled
+            property bool isPrecise: valid
+                                     && position.latitudeValid
+                                     && position.longitudeValid
+                                     && (!position.horizontalAccuracyValid ||
+                                          position.horizontalAccuracy <= 100)
         }
 
         Connections {
@@ -800,7 +832,7 @@
                 horizontalCenter: parent.horizontalCenter
             }
 
-            enabled: camera.imageCapture.ready && !storageMonitor.diskSpaceCriticallyLow
+            enabled: viewFinderOverlay.readyForCapture && !storageMonitor.diskSpaceCriticallyLow
             state: (camera.captureMode == Camera.CaptureVideo) ?
                    ((camera.videoRecorder.recorderState == CameraRecorder.StoppedState) ? "record_off" : "record_on") :
                    "camera"
@@ -878,15 +910,19 @@
 
             MouseArea {
                 id: manualFocusMouseArea
-                anchors.fill: parent
-                enabled: !camera.photoCaptureInProgress
+                anchors {
+                    fill: parent
+                    // Pinch gestures need more clearance at the edges of the screen, but
+                    // tap to focus should be safe all the way to the edges themselves instead.
+                    leftMargin: -bottomEdgeIndicators.height
+                    rightMargin: -bottomEdgeIndicators.height
+                }
+                enabled: camera.focus.isFocusPointModeSupported(Camera.FocusPointCustom) &&
+                         !camera.photoCaptureInProgress
                 onClicked: {
                     camera.manualFocus(mouse.x, mouse.y);
                     mouse.accepted = false;
                 }
-                // FIXME: calling 'isFocusPointModeSupported' fails with
-                // "Error: Unknown method parameter type: QDeclarativeCamera::FocusPointMode"
-                //enabled: camera.focus.isFocusPointModeSupported(Camera.FocusPointCustom)
             }
         }
 
@@ -941,16 +977,29 @@
         }
     }
 
+    ProcessingFeedback {
+        anchors {
+            top: parent.top
+            topMargin: units.gu(2)
+            left: parent.left
+            leftMargin: units.gu(2)
+        }
+        processing: camera.photoCaptureInProgress
+    }
+
     StorageMonitor {
         id: storageMonitor
-        location: (application.removableStoragePresent && settings.preferRemovableStorage) ?
-                   application.removableStorageLocation : application.videosLocation
+        location: (StorageLocations.removableStoragePresent && settings.preferRemovableStorage) ?
+                   StorageLocations.removableStorageLocation : StorageLocations.videosLocation
         onDiskSpaceLowChanged: if (storageMonitor.diskSpaceLow && !storageMonitor.diskSpaceCriticallyLow) {
                                    PopupUtils.open(freeSpaceLowDialogComponent);
                                }
         onDiskSpaceCriticallyLowChanged: if (storageMonitor.diskSpaceCriticallyLow) {
                                              camera.videoRecorder.stop();
                                          }
+        onIsWriteableChanged: if (!isWriteable && !diskSpaceLow && !main.contentExportMode) {
+                                  PopupUtils.open(readOnlyMediaDialogComponent);
+                              }
     }
 
     NoSpaceHint {
@@ -974,6 +1023,20 @@
          }
     }
 
+    Component {
+         id: readOnlyMediaDialogComponent
+         Dialog {
+             id: readOnlyMediaDialog
+             objectName: "readOnlyMediaDialog"
+             title: i18n.tr("External storage not writeable")
+             text: i18n.tr("It does not seem possible to write to your external storage media. Trying to eject and insert it again might solve the issue, or you might need to format it.")
+             Button {
+                 text: i18n.tr("Cancel")
+                 onClicked: PopupUtils.close(readOnlyMediaDialog)
+             }
+         }
+    }
+
     Connections {
         id: permissionErrorMonitor
         property var currentPermissionsDialog: null

=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml	2016-01-07 08:03:57 +0000
+++ ViewFinderOverlayLoader.qml	2016-02-26 17:17:00 +0000
@@ -24,6 +24,7 @@
     property real revealProgress: loader.item ? loader.item.revealProgress : 0
     property var controls: loader.item ? loader.item.controls : null
     property var settings: loader.item.settings
+    property bool readyForCapture
 
     function showFocusRing(x, y) {
         loader.item.showFocusRing(x, y);
@@ -35,6 +36,8 @@
 
     asynchronous: true
     Component.onCompleted: {
-        loader.setSource("ViewFinderOverlay.qml", { "camera": loader.camera });
+        loader.setSource("ViewFinderOverlay.qml", { "camera": loader.camera,
+                                                    "readyForCapture": Qt.binding(function() { return loader.readyForCapture})
+                                                  });
     }
 }

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-01-14 15:55:52 +0000
+++ ViewFinderView.qml	2016-02-26 17:17:00 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import QtQuick.Window 2.2
 import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import QtMultimedia 5.0
 import CameraApp 0.1
 import QtGraphicalEffects 1.0
@@ -96,36 +97,41 @@
         property bool switchInProgress: false
         property bool photoCaptureInProgress: false
 
+        onPhotoCaptureInProgressChanged: {
+            if (main.contentExportMode && camera.photoCaptureInProgress) {
+                viewFinderExportConfirmation.photoCaptureStarted();
+            }
+        }
+
         imageCapture {
             onReadyChanged: {
-                if (camera.imageCapture.ready && main.transfer) {
-                    if (main.transfer.contentType === ContentType.Videos) {
-                        viewFinderView.captureMode = Camera.CaptureVideo;
-                    } else {
-                        viewFinderView.captureMode = Camera.CaptureStillImage;
+                if (camera.imageCapture.ready) {
+                    if (camera.photoCaptureInProgress) {
+                        if (photoRollHint.necessary && !main.transfer) photoRollHint.enable();
+                        camera.photoCaptureInProgress = false;
+                    }
+
+                    if (main.transfer) {
+                        if (main.transfer.contentType === ContentType.Videos) {
+                            viewFinderView.captureMode = Camera.CaptureVideo;
+                        } else {
+                            viewFinderView.captureMode = Camera.CaptureStillImage;
+                        }
                     }
                 }
             }
+
             onCaptureFailed: {
+                console.log("Image capture failed for request " + requestId + ": " + message);
                 camera.photoCaptureInProgress = false;
-                console.log("Capture failed for request " + requestId + ": " + message);
-            }
-            onImageCaptured: {
-                snapshot.source = preview;
-                if (!main.contentExportMode) {
-                    viewFinderOverlay.visible = true;
-                    snapshot.startOutAnimation();
-                    if (photoRollHint.necessary) {
-                        photoRollHint.enable();
-                    }
-                }
-            }
+                viewFinderOverlay.visible = true;
+                PopupUtils.open(captureFailedDialogComponent);
+            }
+
             onImageSaved: {
-                if (main.contentExportMode) {
-                    viewFinderExportConfirmation.confirmExport(path);
-                }
+                if (main.contentExportMode) viewFinderExportConfirmation.mediaPath = path;
+
                 viewFinderView.photoTaken(path);
-                camera.photoCaptureInProgress = false;
                 metricPhotos.increment();
                 console.log("Picture saved as " + path);
             }
@@ -135,15 +141,19 @@
             onRecorderStateChanged: {
                 if (videoRecorder.recorderState === CameraRecorder.StoppedState) {
                     metricVideos.increment()
-                    viewFinderOverlay.visible = true;
                     viewFinderView.videoShot(videoRecorder.actualLocation);
                     if (main.contentExportMode) {
-                        viewFinderExportConfirmation.confirmExport(videoRecorder.actualLocation);
+                        viewFinderExportConfirmation.mediaPath = videoRecorder.actualLocation
                     } else if (photoRollHint.necessary) {
                         photoRollHint.enable();
                     }
                 }
             }
+            onErrorCodeChanged: {
+                if (videoRecorder.errorCode !== CameraRecorder.NoError) {
+                    PopupUtils.open(captureFailedDialogComponent);
+                }
+            }
         }
     }
 
@@ -235,18 +245,21 @@
             width: parent.width
             height: parent.height
             source: camera
+            opacity: ((main.contentExportMode && viewFinderExportConfirmation.waitingForPictureCapture) ||
+                      (!main.contentExportMode && camera.photoCaptureInProgress && !camera.imageCapture.ready))
+                      ? 0.1 : 1.0
 
             /* This rotation need to be applied since the camera hardware in the
-                   Galaxy Nexus phone is mounted at an angle inside the device, so the video
-                   feed is rotated too.
-                   FIXME: This should come from a system configuration option so that we
-                   don't have to have a different codebase for each different device we want
-                   to run on. Android has that information and QML has an API to reflect it:
-                   the camera.orientation property. Unfortunately it is not hooked up yet.
+               Galaxy Nexus phone is mounted at an angle inside the device, so the video
+               feed is rotated too.
+               FIXME: This should come from a system configuration option so that we
+               don't have to have a different codebase for each different device we want
+               to run on. Android has that information and QML has an API to reflect it:
+               the camera.orientation property. Unfortunately it is not hooked up yet.
 
-                   Ref.: http://doc.qt.io/qt-5/qml-qtmultimedia-camera.html#orientation-prop
-                         http://doc.qt.io/qt-5/qcamerainfocontrol.html#cameraOrientation
-                         http://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#orientation
+               Ref.: http://doc.qt.io/qt-5/qml-qtmultimedia-camera.html#orientation-prop
+                     http://doc.qt.io/qt-5/qcamerainfocontrol.html#cameraOrientation
+                     http://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#orientation
             */
             Component.onCompleted: {
                 // Set orientation only at startup because later on Screen.primaryOrientation
@@ -254,14 +267,6 @@
                 orientation = Screen.primaryOrientation === Qt.PortraitOrientation  ? -90 : 0;
             }
 
-            /* Convenience item tracking the real position and size of the real video feed.
-                   Having this helps since these values depend on a lot of rules:
-                   - the feed is automatically scaled to fit the viewfinder
-                   - the viewfinder might apply a rotation to the feed, depending on device orientation
-                   - the resolution and aspect ratio of the feed changes depending on the active camera
-                   The item is also separated in a component so it can be unit tested.
-                 */
-
             transform: Rotation {
                 origin.x: viewFinder.width / 2
                 origin.y: viewFinder.height / 2
@@ -270,6 +275,13 @@
             }
         }
 
+        /* Convenience item tracking the real position and size of the real video feed.
+           Having this helps since these values depend on a lot of rules:
+           - the feed is automatically scaled to fit the viewfinder
+           - the viewfinder might apply a rotation to the feed, depending on device orientation
+           - the resolution and aspect ratio of the feed changes depending on the active camera
+           The item is also separated in a component so it can be unit tested.
+         */
         ViewFinderGeometry {
             id: viewFinderGeometry
             anchors.centerIn: parent
@@ -330,12 +342,10 @@
             anchors.fill: parent
 
             function start() {
-                viewFinderOverlay.visible = false;
             }
 
             function stop() {
                 remainingSecsLabel.text = "";
-                viewFinderOverlay.visible = true;
             }
 
             function showRemainingSecs(secs) {
@@ -384,7 +394,6 @@
 
             function start() {
                 shootFeedback.opacity = 1.0;
-                viewFinderOverlay.visible = false;
                 shootFeedbackAnimation.restart();
             }
 
@@ -393,7 +402,7 @@
                 target: shootFeedback
                 from: 1.0
                 to: 0.0
-                duration: 50
+                duration: UbuntuAnimation.SnapDuration
                 easing: UbuntuAnimation.StandardEasing
             }
         }
@@ -410,38 +419,76 @@
         visible: radius !== 0
     }
 
+    PhotoRollHint {
+        id: photoRollHint
+        anchors.fill: parent
+        visible: enabled
+
+        Connections {
+            target: viewFinderView
+            onInViewChanged: if (!viewFinderView.inView) photoRollHint.disable()
+        }
+    }
+
     ViewFinderOverlayLoader {
         id: viewFinderOverlay
 
         anchors.fill: parent
         camera: camera
         opacity: status == Loader.Ready && overlayVisible && !photoRollHint.enabled ? 1.0 : 0.0
-        Behavior on opacity {UbuntuNumberAnimation {duration: UbuntuAnimation.SnapDuration}}
-    }
-
-    PhotoRollHint {
-        id: photoRollHint
-        anchors.fill: parent
-        visible: enabled && !snapshot.loading
-
-        Connections {
-            target: viewFinderView
-            onInViewChanged: if (!viewFinderView.inView) photoRollHint.disable()
-        }
-    }
-
-    Snapshot {
-        id: snapshot
-        anchors.fill: parent
-        orientation: viewFinder.orientation
-        geometry: viewFinderGeometry
-        deviceDefaultIsPortrait: Screen.primaryOrientation === Qt.PortraitOrientation
+        readyForCapture: main.contentExportMode &&
+                         viewFinderExportConfirmation.waitingForPictureCapture ? false : camera.imageCapture.ready
+
+        Behavior on opacity {
+            enabled: !photoRollHint.enabled
+            UbuntuNumberAnimation {duration: UbuntuAnimation.SnapDuration}
+        }
+
+        // Tapping anywhere on the screen should not trigger any camera
+        // controls while PhotoRoll hint is visible 
+        MouseArea {
+            anchors.fill: parent
+            enabled: photoRollHint.visible
+        }
     }
 
     ViewFinderExportConfirmation {
         id: viewFinderExportConfirmation
         anchors.fill: parent
-        snapshot: snapshot
+
         isVideo: main.transfer.contentType == ContentType.Videos
+        viewFinderGeometry: viewFinderGeometry
+
+        onShowRequested: {
+            viewFinder.visible = false;
+            viewFinderOverlay.visible = false;
+            visible = true;
+        }
+
+        onHideRequested: {
+            viewFinder.visible = true;
+            viewFinderOverlay.visible = true;
+            visible = false;
+        }
+    }
+
+    Component {
+         id: captureFailedDialogComponent
+         Dialog {
+             id: captureFailedDialog
+             objectName: "captureFailedDialog"
+             title: i18n.tr("Capture failed")
+
+             // If we are capturing to an SD card the problem can be a broken card, otherwise it is probably a
+             // crash in the driver and a reboot might fix things.
+             text: StorageLocations.removableStorageLocation && viewFinderOverlay.settings.preferRemovableStorage ?
+                   i18n.tr("Replacing your external media, formatting it, or restarting the device might fix the problem.") :
+                   i18n.tr("Restarting your device might fix the problem.")
+
+             Button {
+                 text: i18n.tr("Cancel")
+                 onClicked: PopupUtils.close(captureFailedDialog)
+             }
+         }
     }
 }

=== modified file 'cameraapplication.cpp'
--- cameraapplication.cpp	2015-11-25 17:47:00 +0000
+++ cameraapplication.cpp	2016-02-26 17:17:00 +0000
@@ -19,14 +19,8 @@
 
 #include "cameraapplication.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QUrl>
 #include <QtCore/QDebug>
-#include <QtCore/QStringList>
 #include <QtCore/QLibrary>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QDir>
-#include <QDate>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QScreen>
@@ -95,103 +89,3 @@
 
     return true;
 }
-
-QString CameraApplication::picturesLocation() const
-{
-    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
-    if (locations.isEmpty()) {
-        return QString();
-    }
-    QString location = locations.at(0) + "/" + QCoreApplication::applicationName();
-    QDir dir;
-    // Transition from old directory 'camera' to new one; see bug #1363112
-    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1363112
-    dir.rename(locations.at(0) + "/" + "camera", location);
-    dir.mkpath(location);
-    return location;
-}
-
-QString CameraApplication::videosLocation() const
-{
-    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
-    if (locations.isEmpty()) {
-        return QString();
-    }
-    QString location = locations.at(0) + "/" + QCoreApplication::applicationName();
-    QDir dir;
-    // Transition from old directory 'camera' to new one; see bug #1363112
-    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1363112
-    dir.rename(locations.at(0) + "/" + "camera", location);
-    dir.mkpath(location);
-    return location;
-}
-
-QString CameraApplication::temporaryLocation() const
-{
-    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::TempLocation);
-    if (locations.isEmpty()) {
-        return QString();
-    }
-    QString location = locations.at(0);
-    QDir dir;
-    dir.mkpath(location);
-    return location;
-}
-
-bool CameraApplication::removableStoragePresent() const
-{
-    return !removableStorageLocation().isEmpty();
-}
-
-QString CameraApplication::removableStorageLocation() const
-{
-    /* FIXME: when Qt5.4 is available, switch to using newly introduced
-     * QStorageInfo API.
-     * Ref.: http://doc-snapshot.qt-project.org/qt5-5.4/qstorageinfo.html
-     */
-    QString userName = qgetenv("USER");
-    QDir media("/media/" + userName);
-    QStringList mediaDirs = media.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-
-    if (mediaDirs.size() > 0) {
-        return QString("/media/" + userName + "/" + mediaDirs.at(0));
-    } else {
-        return QString();
-    }
-}
-
-QString CameraApplication::removableStoragePicturesLocation() const
-{
-    QString storageLocation = removableStorageLocation();
-    if (storageLocation.isEmpty()) {
-        return QString();
-    }
-
-    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
-    QString pictureDir = QString(locations.at(0)).split("/").value(3);
-    if (pictureDir.isEmpty()){
-        return QString();
-    }
-    QString location = storageLocation + "/" + pictureDir + "/" + QCoreApplication::applicationName();
-    QDir dir;
-    dir.mkpath(location);
-    return location;
-}
-
-QString CameraApplication::removableStorageVideosLocation() const
-{
-    QString storageLocation = removableStorageLocation();
-    if (storageLocation.isEmpty()) {
-        return QString();
-    }
-
-    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
-    QString movieDir = QString(locations.at(0)).split("/").value(3);
-    if (movieDir.isEmpty()){
-        return QString();
-    }
-    QString location = storageLocation + "/" + movieDir + "/" + QCoreApplication::applicationName();
-    QDir dir;
-    dir.mkpath(location);
-    return location;
-}

=== modified file 'cameraapplication.h'
--- cameraapplication.h	2015-11-25 17:47:00 +0000
+++ cameraapplication.h	2016-02-26 17:17:00 +0000
@@ -29,29 +29,14 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool desktopMode READ isDesktopMode CONSTANT)
-    Q_PROPERTY(QString picturesLocation READ picturesLocation CONSTANT)
-    Q_PROPERTY(QString videosLocation READ videosLocation CONSTANT)
-    Q_PROPERTY(QString temporaryLocation READ temporaryLocation CONSTANT)
-    Q_PROPERTY(bool removableStoragePresent READ removableStoragePresent NOTIFY removableStoragePresentChanged)
-    Q_PROPERTY(QString removableStorageLocation READ removableStorageLocation CONSTANT)
-    Q_PROPERTY(QString removableStoragePicturesLocation READ removableStoragePicturesLocation CONSTANT)
-    Q_PROPERTY(QString removableStorageVideosLocation READ removableStorageVideosLocation CONSTANT)
 
 public:
     CameraApplication(int &argc, char **argv);
     virtual ~CameraApplication();
     bool setup();
     bool isDesktopMode() const;
-    QString picturesLocation() const;
-    QString videosLocation() const;
-    QString temporaryLocation() const;
-    bool removableStoragePresent() const;
-    QString removableStorageLocation() const;
-    QString removableStoragePicturesLocation() const;
-    QString removableStorageVideosLocation() const;
 
 Q_SIGNALS:
-    void removableStoragePresentChanged();
 
 private:
     QScopedPointer<QQmlApplicationEngine> m_engine;

=== modified file 'debian/rules'
--- debian/rules	2015-11-18 06:44:35 +0000
+++ debian/rules	2016-02-26 17:17:00 +0000
@@ -11,10 +11,6 @@
 override_dh_auto_configure:
 	dh_auto_configure -- -DCLICK_MODE=OFF -DINSTALL_TESTS=ON
 
-override_dh_auto_test:
-	python3 -m flake8 .
-	dh_auto_test
-
 override_dh_install:
 	dh_install --fail-missing
 

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-11-25 17:56:59 +0000
+++ manifest.json.in	2016-02-26 17:17:00 +0000
@@ -1,6 +1,6 @@
 {
     "description": "An application to take pictures and videos with the device cameras",
-    "framework": "ubuntu-sdk-15.04.3",
+    "framework": "ubuntu-sdk-15.04.4",
     "architecture": "@CLICK_ARCH@",
     "hooks": {
         "camera": {

=== removed file 'run_tests.sh'
--- run_tests.sh	2012-10-24 15:18:16 +0000
+++ run_tests.sh	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-export PATH=/opt/qt5/bin:$PATH
-cd tests/autopilot
-
-echo running with arg: $1
-
-if [ "$1" == "" ]; then
-	autopilot run camera_app
-else
-	autopilot run -o ../../$1 -f xml -r -rd ../../ camera_app
-fi
-
-exit 0

=== modified file 'tests/autopilot/camera_app/tests/test_focus.py'
--- tests/autopilot/camera_app/tests/test_focus.py	2015-10-05 13:14:12 +0000
+++ tests/autopilot/camera_app/tests/test_focus.py	2016-02-26 17:17:00 +0000
@@ -28,6 +28,20 @@
     def tearDown(self):
         super(TestFocus, self).tearDown()
 
+    def verify_focus_ring_after_click_at(self, ring, x, y):
+        # The focus ring should be invisible in the beginning
+        self.assertThat(ring.opacity, Eventually(Equals(0.0)))
+
+        # Click in the designated spot
+        self.pointing_device.move(x, y)
+        self.pointing_device.click()
+
+        # The focus ring sould be visible now
+        self.assertThat(ring.opacity, Eventually(GreaterThan(0.5)))
+
+        # After some seconds the focus ring should fade out
+        self.assertThat(ring.opacity, Eventually(Equals(0.0)))
+
     """Test focusing in an area where we know the picture is"""
     @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir on maguro')
     def test_focus_valid_and_disappear(self):
@@ -36,21 +50,16 @@
         switch_cameras = self.main_window.get_swap_camera_button()
         exposure_button = self.main_window.get_exposure_button()
 
-        # The focus ring should be invisible in the beginning
-        self.assertThat(focus_ring.opacity, Eventually(Equals(0.0)))
-
-        self.pointing_device.move_to_object(feed)
-        self.pointing_device.click()
-        click_coords = list(self.pointing_device.position())
-
-        # The focus ring sould be visible and centered to the mouse click
-        # coords now
-        # focus_ring_center = self.get_center(focus_ring)
-        self.assertThat(focus_ring.opacity, Eventually(GreaterThan(0.5)))
-#        self.assertEquals(focus_ring_center, click_coords)
-
-        # After some seconds the focus ring should fade out
-        self.assertThat(focus_ring.opacity, Eventually(Equals(0.0)))
+        # Click in the center of the viewfinder area
+        mid_x, mid_y = self.get_center(feed)
+        self.verify_focus_ring_after_click_at(focus_ring, mid_x, mid_y)
+
+        # Then try on the side edges and top edge to verify they
+        # are focusable too
+        self.verify_focus_ring_after_click_at(focus_ring, 1, mid_y)
+        self.verify_focus_ring_after_click_at(focus_ring, feed.width - 1,
+                                              mid_y)
+        self.verify_focus_ring_after_click_at(focus_ring, mid_x, 1)
 
         # Switch cameras, wait for camera to settle, and try again
         self.pointing_device.move_to_object(switch_cameras)
@@ -58,19 +67,14 @@
         self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
 
         # Click in the center of the viewfinder area
-        click_coords = [feed.globalRect[2] // 2 + feed.globalRect[0],
-                        feed.globalRect[3] // 2 + feed.globalRect[1]]
-        self.pointing_device.move(click_coords[0], click_coords[1])
-        self.pointing_device.click()
-
-        # The focus ring sould be visible and centered to the mouse
-        # click coords now
-        # focus_ring_center = self.get_center(focus_ring)
-        self.assertThat(focus_ring.opacity, Eventually(GreaterThan(0.5)))
-#        self.assertEquals(focus_ring_center, click_coords)
-
-        # After some seconds the focus ring should fade out
-        self.assertThat(focus_ring.opacity, Eventually(Equals(0.0)))
+        self.verify_focus_ring_after_click_at(focus_ring, mid_x, mid_y)
+
+        # Then try on the side edges and top edge to verify they
+        # are focusable too
+        self.verify_focus_ring_after_click_at(focus_ring, 1, mid_y)
+        self.verify_focus_ring_after_click_at(focus_ring, feed.width - 1,
+                                              mid_y)
+        self.verify_focus_ring_after_click_at(focus_ring, mid_x, 1)
 
     @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir on maguro')
     def test_focus_invalid(self):

=== modified file 'tests/autopilot/camera_app/tests/test_options.py'
--- tests/autopilot/camera_app/tests/test_options.py	2015-11-20 15:01:02 +0000
+++ tests/autopilot/camera_app/tests/test_options.py	2016-02-26 17:17:00 +0000
@@ -42,6 +42,33 @@
         # check overlay is closed
         self.assertThat(bottom_edge.opened, Eventually(Equals(False)))
 
+        # try opening and closing by tapping on the bottom of the viewfinder
+        bottom_edge = self.main_window.get_bottom_edge()
+        bottom_edge.open()
+
+        # check overlay is opened
+        self.assertThat(bottom_edge.opened, Eventually(Equals(True)))
+
+        # tap on the bottom of the viewfinder to close overlay
+        viewfinder = self.main_window.get_viewfinder()
+        x = viewfinder.globalRect.x + viewfinder.width / 2.0
+        y = viewfinder.globalRect.y + viewfinder.height - 1.0
+        self.pointing_device.move(x, y)
+        self.pointing_device.click()
+
+        # check overlay is closed
+        self.assertThat(bottom_edge.opened, Eventually(Equals(False)))
+
+    """Test that the options overlay opens properly by tapping on the hint"""
+    def test_overlay_open_tapping_hint(self):
+        options_hint = self.app.wait_select_single(objectName="indicatorsRow")
+        self.pointing_device.move_to_object(options_hint)
+        self.pointing_device.click()
+
+        # check overlay is opened
+        bottom_edge = self.main_window.get_bottom_edge()
+        self.assertThat(bottom_edge.opened, Eventually(Equals(True)))
+
     """Test toggling on/off grid lines option"""
     def test_toggle_grid_lines(self):
         gridlines = self.app.wait_select_single(

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2015-03-12 22:36:12 +0000
+++ tests/unittests/CMakeLists.txt	2016-02-26 17:17:00 +0000
@@ -33,6 +33,7 @@
 
 qt5_use_modules(tst_storagemonitor Widgets Core Quick Qml Test)
 add_test(tst_storagemonitor tst_storagemonitor -xunitxml -o test.xml)
+add_test(flake8 python3 -m flake8 ${CMAKE_SOURCE_DIR}/tests/autopilot)
 set_tests_properties(tst_storagemonitor PROPERTIES
     TIMEOUT ${CTEST_TESTING_TIMEOUT}
     ENVIRONMENT "QT_QPA_PLATFORM=minimal"

=== modified file 'tests/unittests/qstorageinfo_stub.cpp'
--- tests/unittests/qstorageinfo_stub.cpp	2015-01-26 10:57:36 +0000
+++ tests/unittests/qstorageinfo_stub.cpp	2016-02-26 17:17:00 +0000
@@ -14,14 +14,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "qstorageinfo.h"
-#include "qstorageinfo_p.h"
+#include <QStorageInfo>
 #include "storageinfocontrol.h"
 
 #include <QDebug>
 
 QString location;
 
+class QStorageInfoPrivateRef {
+public:
+    bool deref() { return false; }
+};
+
+class QStorageInfoPrivate {
+public:
+    QStorageInfoPrivateRef ref;
+};
+
 QStorageInfo::QStorageInfo()
 {
 }
@@ -47,6 +56,11 @@
     location = path;
 }
 
+QString QStorageInfo::rootPath() const
+{
+    return location;
+}
+
 qint64 QStorageInfo::bytesAvailable() const
 {
     return StorageInfoControl::instance()->freeSpaceMap[location];