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

[Arthur Mello]

Wait gallery ends collection processing before loading events model on picker mode

Wait gallery ends collection processing before loading events model on picker mode

Test steps
==========
1. Make sure that gallery has no media files for today events (delete the existing ones);
2. Make sure gallery is closed;
3. Take a photo with camera-app;
4. Open messaging-app, create a new message and try to attach a photo from gallery;
5. Make sure that the photo is visible on the events view.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/177
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/447/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1064
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28107

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

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-fix_1569844]

1307. By Arthur Mello on 2016-04-21

Do not display event if there is no media on it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1307
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/178
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/448/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1117/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1065
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28111

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

This doesn't work. I don't see all my photos anymorr in picking mode. Just todays.
I see spinners under photos like something is trying to load but they don't show up.

review: Needs Fixing

[Renato Araujo Oliveira Filho (renatofilho)]

works as expected just a small inline comment.

[lp:~artmello/gallery-app/gallery-app-fix_1569844]

1308. By Arthur Mello on 2016-04-26

Fix OrganicMediaList properties

1309. By Arthur Mello on 2016-04-26

Fix typo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1308
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/179
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/449/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1118/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1068
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28130

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1309
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/180
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/180/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/180
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/450/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1119/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1069
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28131

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

Use real for the height property.

[Renato Araujo Oliveira Filho (renatofilho)]

review: Needs Fixing

[lp:~artmello/gallery-app/gallery-app-fix_1569844]

1310. By Arthur Mello on 2016-04-26

Change property type

[Renato Araujo Oliveira Filho (renatofilho)]

looks good now.

review: Approve

=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2016-02-25 18:01:15 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2016-04-26 21:30:39 +0000
@@ -41,6 +41,8 @@
     property var event
     ///
     property alias mediaModel: eventView.model
+    readonly property real organicMediaListHeight: __bigSize + __smallSize + __photosTopMargin + __margin + __margin/2
+    readonly property alias mediaModelCount: mediaModel.count
     ///
     property SelectionState selection
 
@@ -83,7 +85,7 @@
 
     property alias mediaTypeFilter: mediaModel.mediaTypeFilter
 
-    height: __bigSize + __smallSize + __photosTopMargin + __margin + __margin/2
+    height: organicMediaListHeight
 
     function positionViewAtSelected(index) {
         eventView.positionViewAtIndex(index, ListView.Center);

=== modified file 'rc/qml/PickerScreen.qml'
--- rc/qml/PickerScreen.qml	2016-04-26 21:30:39 +0000
+++ rc/qml/PickerScreen.qml	2016-04-26 21:30:39 +0000
@@ -97,6 +97,16 @@
     }
 
     Loader {
+        id: eventCollectionModelLoader
+        sourceComponent: allLoaded ? eventCollectionModelComponent : ""        
+
+        Component {
+            id: eventCollectionModelComponent
+            EventCollectionModel { }
+        }
+    }
+
+    Loader {
         id: mediaLibraryLoader
         sourceComponent: allLoaded ? mediaLibraryComponent : ""        
 
@@ -157,13 +167,13 @@
                         head.actions: pickActions
 
                         selection: allLoaded ? selectionLoader.item : ""
-                        model: EventCollectionModel {
-                            mediaTypeFilter: getMediaTypeFilter()
-                        }
+                        model: allLoaded && eventCollectionModelLoader.status == Loader.Ready ? eventCollectionModelLoader.item : ""
 
                         delegate: OrganicMediaList {
                             id: organicList
                             width: eventSelectView.width
+                            height: visible ? organicMediaListHeight : 0
+                            visible: mediaModelCount > 0
                             event: model.event
                             selection: eventSelectView.selection
                             mediaTypeFilter: getMediaTypeFilter()