Merge lp:~artmello/gallery-app/gallery-app-open_photo_not_in_collection into lp:gallery-app

[Arthur Mello]

Delay the opening photo process until all media files are loaded when called by url handler

Delay the opening photo process until all media files are loaded when called by url handler

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1112
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1075/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/3
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/10
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/38
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/15
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15583
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/40
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/40/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2014-09-23 18:08:10 +0000
+++ src/gallery-application.cpp	2014-11-07 21:12:02 +0000
@@ -69,7 +69,9 @@
       m_pickModeEnabled(false),
       m_defaultUiMode(BrowseContentMode),
       m_mediaTypeFilter(MediaSource::None),
-      m_mediaFile("")
+      m_mediaFile(""),
+      m_mediaLoadedTimer(this),
+      m_mediaLoaded(false)
 {
     m_bguSize = QProcessEnvironment::systemEnvironment().value("GRID_UNIT_PX", "8").toInt();
     if (m_bguSize <= 0)
@@ -117,6 +119,10 @@
 
     if (m_cmdLineParser->startupTimer())
         qDebug() << "Construct GalleryApplication" << m_timer->elapsed() << "ms";
+
+    m_mediaLoadedTimer.setSingleShot(false);
+    m_mediaLoadedTimer.setInterval(100);
+    QObject::connect(&m_mediaLoadedTimer, SIGNAL(timeout()), this, SLOT(onMediaLoaded()));
 }
 
 /*!
@@ -258,6 +264,7 @@
         qDebug() << "GalleryManager initialized" << m_timer->elapsed() << "ms";
 
     emit mediaLoaded();
+    m_mediaLoaded = true;
 
     if (m_cmdLineParser->startupTimer()) {
         qDebug() << "MainView loaded" << m_timer->elapsed() << "ms";
@@ -352,6 +359,14 @@
 {
     if(!mediaFile.isEmpty()) {
         m_mediaFile = "file://" + mediaFile;
+        m_mediaLoadedTimer.start();
+    }
+}
+
+void GalleryApplication::onMediaLoaded()
+{
+    if (m_mediaLoaded) {
+        m_mediaLoadedTimer.stop();
         Q_EMIT mediaFileChanged();
     }
 }

=== modified file 'src/gallery-application.h'
--- src/gallery-application.h	2014-09-23 13:30:29 +0000
+++ src/gallery-application.h	2014-11-07 21:12:02 +0000
@@ -23,6 +23,7 @@
 #include <QApplication>
 #include <QElapsedTimer>
 #include <QFileInfo>
+#include <QTimer>
 
 #include "media-source.h"
 
@@ -84,6 +85,7 @@
     void setFullScreen(bool fullScreen);
     void consistencyCheckFinished();
     void setMediaFile(const QString &mediaFile);
+    void onMediaLoaded();
 
 private:
     void registerQML();
@@ -100,6 +102,8 @@
     UiMode m_defaultUiMode;
     MediaSource::MediaType m_mediaTypeFilter;
     QString m_mediaFile;
+    QTimer m_mediaLoadedTimer;
+    bool m_mediaLoaded;
 
     static QElapsedTimer *m_timer;
 };