Merge lp:~fboucault/camera-app/fix_taking_pic_while_scanning into lp:camera-app

[Florian Boucault]

Fix case when pictures have been taken while the library is being scanned.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/camera-app-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/61
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/99/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/455
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/738/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/195
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17425
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/547/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'CameraApp/foldersmodel.cpp'
--- CameraApp/foldersmodel.cpp	2015-01-24 17:52:55 +0000
+++ CameraApp/foldersmodel.cpp	2015-01-25 19:05:38 +0000
@@ -144,8 +144,15 @@
     setFileInfoList(result.first, result.second);
 }
 
-void FoldersModel::setFileInfoList(const QFileInfoList& fileInfoList, const QStringList& filesToWatch)
+void FoldersModel::setFileInfoList(QFileInfoList fileInfoList, const QStringList& filesToWatch)
 {
+    // prepend files that have been added while the list was computed
+    Q_FOREACH (QFileInfo fileInfo, m_fileInfoList) {
+        if(!fileInfoList.contains(fileInfo)) {
+            fileInfoList.prepend(fileInfo);
+        }
+    }
+
     beginResetModel();
     m_fileInfoList = fileInfoList;
     endResetModel();

=== modified file 'CameraApp/foldersmodel.h'
--- CameraApp/foldersmodel.h	2015-01-24 17:52:55 +0000
+++ CameraApp/foldersmodel.h	2015-01-25 19:05:38 +0000
@@ -61,7 +61,7 @@
     QPair<QFileInfoList, QStringList> computeFileInfoList(QStringList folders);
     bool fileMatchesTypeFilters(const QFileInfo& newFileInfo);
     void insertFileInfo(const QFileInfo& newFileInfo);
-    void setFileInfoList(const QFileInfoList& fileInfoList, const QStringList& filesToWatch);
+    void setFileInfoList(QFileInfoList fileInfoList, const QStringList& filesToWatch);
 
     QHash<int, QByteArray> roleNames() const;
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

=== modified file 'GalleryView.qml'
--- GalleryView.qml	2015-01-24 17:52:55 +0000
+++ GalleryView.qml	2015-01-25 19:05:38 +0000
@@ -193,7 +193,7 @@
     Rectangle {
         objectName: "scanningMediaHint"
         anchors.fill: parent
-        visible: model.loading
+        visible: model.count === 0 && model.loading
         color: "#0F0F0F"
 
         Icon {