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

[Arthur Mello]

If the photo requested to be opened is not on the collection yet, make sure to check again when the collection is updated. That is a problem since now the load process is async

If the photo requested to be opened is not on the collection yet, make sure to check again when the collection is updated. That is a problem since now the load process is async

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1150
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/150
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/624/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/325
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18068
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/505/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/734
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/734/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1150
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/694/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/694/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/3/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1150. By Arthur Mello on 2015-02-13

If the photo requested to be opened is not on the collection yet, make sure to check again when the collection is
updated. That is a problem since now the load process is async

=== modified file 'rc/qml/MainScreen.qml'
--- rc/qml/MainScreen.qml	2015-02-09 18:26:03 +0000
+++ rc/qml/MainScreen.qml	2015-02-13 19:14:15 +0000
@@ -38,6 +38,8 @@
     property string mediaCurrentlyInView
     StateSaver.properties: "mediaCurrentlyInView"
 
+    property string mediaRequestedButNotFound
+
     property bool applicationLoaded: application.allLoaded
 
     //fullScreen property is used on autopilot tests
@@ -51,6 +53,7 @@
             photoViewerLoader.item.fadeClosed();
         }
 
+        mediaRequestedButNotFound = "";
         mediaCurrentlyInView = media;
         for (var i = 0; i < MANAGER.mediaLibrary.count; i++) {
             if (MANAGER.mediaLibrary.getAt(i).path == mediaCurrentlyInView) {
@@ -71,6 +74,8 @@
                 return;
             }
         }
+
+	mediaRequestedButNotFound = media;
     }
 
     function setHeaderVisibility(visible)
@@ -116,6 +121,14 @@
         }
     }
 
+    Connections {
+        target: MANAGER
+        onCollectionChanged: {
+            if (mediaRequestedButNotFound !== "")
+                openMediaFile(mediaRequestedButNotFound);
+        }
+    }
+
     function pushPage(page) {
         pageStack.push(page);
     }