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

[Florian Boucault]

Improve thumbnail generation performance: do not retrieve thumbnails for the view that is not visible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/camera-app-ci/355/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/51
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/76
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/383
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/137
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17009
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/389
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/389/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

LGTM

review: Approve

=== modified file 'GalleryView.qml'
--- GalleryView.qml	2014-12-05 18:50:53 +0000
+++ GalleryView.qml	2015-01-12 16:30:52 +0000
@@ -70,7 +70,7 @@
             anchors.fill: parent
             model: galleryView.model
             visible: opacity != 0.0
-            inView: galleryView.inView
+            inView: galleryView.inView && galleryView.currentView == slideshowView
             onToggleHeader: header.toggle();
         }
 
@@ -81,7 +81,7 @@
             userSelectionMode: galleryView.userSelectionMode
             model: galleryView.model
             visible: opacity != 0.0
-            inView: galleryView.inView
+            inView: galleryView.inView && galleryView.currentView == photogridView
             inSelectionMode: main.contentExportMode || galleryView.userSelectionMode
             onPhotoClicked: {
                 slideshowView.showPhotoAtIndex(index);