Merge lp:~schwann/gallery-app/gallery-events-design into lp:gallery-app

[Günter Schwann]

Use new design for organic view

Use new design for organic view

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/124
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/384
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/384/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/350

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/315/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/125
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/397
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/397/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/361

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/317/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/127
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/127
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/402
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/404
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/404/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/368

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

review: Needs Fixing (continuous-integration)

[lp:~schwann/gallery-app/gallery-events-design]

753. By Günter Schwann on 2013-06-27

Fix autopilot test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:753
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/318/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/373

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good.

review: Approve

=== modified file 'rc/qml/Components/EventCard.qml'
--- rc/qml/Components/EventCard.qml	2013-03-06 10:36:54 +0000
+++ rc/qml/Components/EventCard.qml	2013-06-27 06:18:25 +0000
@@ -45,29 +45,14 @@
     height: units.gu(12)
 
     Label {
-        id: eventDay
-
-        y: units.gu(0.5)
-        width: parent.width
-
-        font.family: "Ubuntu"
-
-        font.pixelSize: units.dp(62)
-        color: textColor
-
-        horizontalAlignment: Text.AlignHCenter
-
-        text: (event) ? Qt.formatDate(event.date, "dd") : ""
-    }
-
-    Label {
         id: eventMonthYear
 
-        y: units.gu(8.5)
+        y: units.gu(1.5)
         width: parent.width
+        height: units.gu(1)
 
         font.family: "Ubuntu"
-        fontSize: "medium"
+        font.pixelSize: units.dp(15)
         color: textColor
 
         font.capitalization: Font.AllUppercase
@@ -75,4 +60,19 @@
 
         text: (event) ? Qt.formatDate(event.date, "MMM yyyy") : ""
     }
+
+    Label {
+        id: eventDay
+
+        anchors.top: eventMonthYear.bottom
+        width: parent.width
+
+        font.family: "Ubuntu"
+        font.pixelSize: units.dp(67)
+        color: textColor
+
+        horizontalAlignment: Text.AlignHCenter
+
+        text: (event) ? Qt.formatDate(event.date, "dd") : ""
+    }
 }

=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2013-06-20 11:54:49 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2013-06-27 06:18:25 +0000
@@ -25,75 +25,62 @@
 import "../../js/Gallery.js" as Gallery
 import "../../js/GalleryUtility.js" as GalleryUtility
 
-// An "organic" list of photos.  Used as the "tray" contents for each event in
-// the OrganicEventView, and the layout of the OrganicAlbumView.
+/*!
+An "organic" list of photos.  Used as the "tray" contents for each event in
+the OrganicEventView, and the layout of the OrganicAlbumView.
+*/
 Item {
     id: organicMediaList
     objectName: "organicMediaList"
 
-    /*!
-    */
+    ///
     signal pressed(var mediaSource, var thumbnailRect)
 
-    /*!
-    */
+    ///
     property var event
-    /*!
-    */
+    ///
     property alias mediaModel: eventView.model
-    /*!
-    */
+    ///
     property SelectionState selection
 
-    /*!
-    */
+    ///
     property int animationDuration: Gallery.FAST_DURATION
-    /*!
-    */
+    ///
     property int animationEasingType: Easing.InQuint
 
     // readonly
-    /*!
-    */
+    ///
     property int __mediaPerPattern: 6
-    /*!
-    */
+    /// Size of the bigger thumbnails
     property var __bigSize: units.gu(19)
-    /*!
-    */
+    /// Size of the smaller thumbnails
     property var __smallSize: units.gu(12)
-    /*!
-    */
+    /// Space between the thumbnails
     property real __margin: units.gu(2)
 
-    // internal
-    /*!
-    */
-    property var __photoX: [0, 0, __smallSize + __margin,
-        (__bigSize + __margin), (__bigSize + __smallSize + __margin * 2), -(__bigSize+__margin)]
-    /*!
-    */
-    property var __photoY: [0, __bigSize + __margin, __bigSize + __margin, 0, 0,
-        __smallSize + __margin]
-    /*!
-    */
-    property var __photoSize: [__bigSize, __smallSize, __smallSize, __smallSize, __smallSize,
-        __bigSize]
-    /*!
-    */
-    property var __photoWidth: [0, __smallSize + __margin, (2 * __smallSize + 2 * __margin) - (__bigSize + __margin),
-        __smallSize + __margin, __smallSize + __margin, 0]
-    /*!
-    */
-    property var __footerWidth: [0, __bigSize + __margin, __bigSize - __smallSize,
-        __bigSize - __smallSize, 0, 0]
-    /*!
-    */
+    // internal, used to get the organix effect
+    /// X-position shift for the delegates in one of the organic blocks
+    property var __photoX: [-__margin, 0, 0, 0, 0, 0]
+    /// Y-position shift for the delegates in one of the organic blocks
+    property var __photoY: [__smallSize + __margin, 0, __bigSize + __margin,
+        0, __bigSize + __margin, 0]
+    /// Size of the delegate in one of the organic blocks
+    property var __photoSize: [__bigSize,__smallSize, __smallSize,
+        __bigSize, __smallSize, __smallSize]
+    /// Size to be adapted for the organic effect
+    property var __photoWidth: [__smallSize-__margin, __bigSize - (__smallSize + __margin),
+        2 * __smallSize - __bigSize,__bigSize - (__smallSize + __margin),
+        __smallSize, 0]
+    /// Extra space on the right, for correct scroll boundary
+    property var __footerWidth: [__smallSize, __bigSize - __smallSize,
+        2 * __smallSize - __bigSize + __margin,
+        __bigSize - __smallSize, __smallSize + __margin,
+        0]
+
+    /// Used to generate a spacing between the events
     property real __photosTopMargin: __margin / 2
 
-    height: (mediaModel.count > 1) ?
-                (__bigSize + __smallSize + __photosTopMargin + __margin + __margin/2) :
-                (__bigSize + __photosTopMargin + __margin / 2)
+    height: __bigSize + __smallSize + __photosTopMargin + __margin + __margin/2
 
     Behavior on height {
         NumberAnimation {
@@ -105,7 +92,7 @@
     Component {
         id: eventHeader
         Item {
-            width: eventView.leftBuffer + __margin + __smallSize
+            width: eventView.leftBuffer + 2*__margin //+ __smallSize
             height: __smallSize
             EventCard {
                 x: eventView.leftBuffer + __margin
@@ -139,7 +126,7 @@
 
                 property bool isLoading: image.status === Image.Loading
 
-                x: patternPhoto < 5 ? __margin : -__bigSize
+                x: __photoX[patternPhoto]
                 y: __photosTopMargin + __photoY[patternPhoto]
                 width: parent.height
                 height: parent.height
@@ -220,8 +207,8 @@
         id: eventView
         // the buffers are needed, as the listview does not draw items outside is visible area
         // but for the organic effect, x and width are "displaced" for some items (first, last)
-        property int leftBuffer: __bigSize + __margin
-        property int rightBuffer: __bigSize
+        property int leftBuffer: __smallSize + __margin
+        property int rightBuffer: __smallSize
         anchors {
             top: parent.top
             bottom: parent.bottom
@@ -244,6 +231,7 @@
         orientation: Qt.Horizontal
 
         header: eventHeader
+        spacing: __margin
         delegate: thumbnailDelegate
         footer: Item {
             width: eventView.rightBuffer +

=== modified file 'rc/qml/OrganicView/OrganicView.qml'
--- rc/qml/OrganicView/OrganicView.qml	2013-06-20 11:54:49 +0000
+++ rc/qml/OrganicView/OrganicView.qml	2013-06-27 06:18:25 +0000
@@ -55,7 +55,7 @@
     property real organicMediaListPatternWidth: units.gu(49) // OrganicMediaList.patternWidth
     /*!
     */
-    property real organicMediaListMargin: units.gu(2) // OrganicMediaList.margin
+    property real organicMediaListMargin: units.gu(1)
 
     Image {
         anchors.fill: parent
@@ -79,11 +79,11 @@
         // so we also get a full row on top and bottom of the whole bunch.
         header: Item {
             width: parent.width
-            height: organicMediaListMargin / 2
+            height: organicMediaListMargin
         }
         footer: Item {
             width: parent.width
-            height: organicMediaListMargin / 2
+            height: organicMediaListMargin
         }
 
         displaced: Transition {

=== modified file 'tests/autopilot/gallery_app/emulators/media_selector.py'
--- tests/autopilot/gallery_app/emulators/media_selector.py	2013-06-18 13:22:53 +0000
+++ tests/autopilot/gallery_app/emulators/media_selector.py	2013-06-27 06:18:25 +0000
@@ -26,10 +26,6 @@
     def get_second_photo(self):
         """Returns the second photo item"""
         selector = self.get_media_selector()
-        list_view = selector.get_children_by_type("QQuickListView")[0]
-        item = list_view.get_children_by_type("QQuickItem")[0]
-        media_list = item.get_children_by_type("OrganicMediaList")[0]
-        list_view = media_list.get_children_by_type("QQuickListView")[0]
-        item = list_view.get_children_by_type("QQuickItem")[0]
-        item = item.get_children_by_type("QQuickItem")[3]
-        return item.get_children_by_type("UbuntuShape")[0]
+        medias = selector.select_many("OrganicItemInteraction",
+                                      objectName="eventsViewPhoto")
+        return medias[1]