Merge lp:~tpeeters/ubuntu-ui-toolkit/10-subheader into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Add extension property to PageHeader.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1728
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2535/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1265
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1262

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2535/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1729
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2536/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1266
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1263

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2536/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1732
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1270
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1270/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1267

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2540/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1733
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1271
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1271/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1268/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2541/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Very nice. Thanks for adding the additional tests for the sections.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1735
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2542/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1272
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1272/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1269/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2542/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/1369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/676
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/676/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/676/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1736
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2543/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1273
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1273/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1270

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2543/rebuild

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-11-20 07:47:08 +0000
+++ components.api	2015-11-27 15:50:01 +0000
@@ -738,6 +738,7 @@
     property int textSize
 Ubuntu.Components.PageHeader 1.3: Header
     property Item contents
+    property Item extension
     readonly property ActionBar leadingActionBar
     property list<Action> navigationActions
     readonly property Sections sections

=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2015-10-23 16:05:00 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2015-11-27 15:50:01 +0000
@@ -74,11 +74,11 @@
      */
     property Item contents
 
-    Component.onCompleted: holder.updateContents()
-    onContentsChanged: holder.updateContents()
+    Component.onCompleted: contentsHolder.updateContents()
+    onContentsChanged: contentsHolder.updateContents()
 
     Item {
-        id: holder
+        id: contentsHolder
         anchors {
             left: leading.right
             right: trailing.left
@@ -95,17 +95,17 @@
         property Item previousContentsParent: null
 
         function updateContents() {
-            if (holder.previousContents) {
-                holder.previousContents.parent = holder.previousContentsParent;
+            if (previousContents) {
+                previousContents.parent = previousContentsParent;
             }
-            if (contents) {
+            if (header.contents) {
                 titleLoader.sourceComponent = null;
-                holder.previousContents = header.contents;
-                holder.previousContentsParent = header.contents.parent;
-                header.contents.parent = holder;
+                previousContents = header.contents;
+                previousContentsParent = header.contents.parent;
+                header.contents.parent = contentsHolder;
             } else {
-                holder.previousContents = null;
-                holder.previousContentsParent = null;
+                previousContents = null;
+                previousContentsParent = null;
                 titleLoader.sourceComponent = __styleInstance.titleComponent;
             }
         }
@@ -206,10 +206,63 @@
     }
 
     /*!
+      Item shown at the bottom of the header.
+      The extension can be any Item, but it must have a height so that
+      the PageHeader correctly adjusts its height for the extension to fit.
+      The extension Item should anchor to the left, right and bottom of
+      its parent so that it will be automatically positioned above the
+      header divider. This property replaces the sections property. Sections
+      can now be added to the header as follows:
+      \qml
+        PageHeader {
+            title: "Header with sections"
+            extension: Sections {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    bottom: parent.bottom
+                }
+                model: ["one", "two", "three"]
+            }
+        }
+      \endqml
+    */
+    property Item extension
+
+    onExtensionChanged: extensionHolder.updateExtension()
+    Item {
+        id: extensionHolder
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: contentsHolder.bottom
+        }
+        height: header.extension ? header.extension.height : 0
+
+        property Item previousExtension: header.extension
+        property Item previousExtensionParent: null
+
+        function updateExtension() {
+            if (previousExtension) {
+                previousExtension.parent = previousExtensionParent;
+            }
+            if (header.extension) {
+                previousExtension = header.extension;
+                previousExtensionParent = header.extension.parent;
+                header.extension.parent = extensionHolder;
+            } else {
+                previousExtension = null;
+                previousExtensionParent = null;
+            }
+        }
+    }
+
+    /*!
       \qmlproperty Sections sections
       Sections shown at the bottom of the header. By default,
       the sections will only be visible if its actions or model
       is set. See \l Sections.
+      \deprecated Use \l extension instead.
      */
     readonly property alias sections: sectionsItem
     Sections {
@@ -217,9 +270,9 @@
         anchors {
             left: parent.left
             leftMargin: units.gu(2)
-            top: holder.bottom
+            top: contentsHolder.bottom
         }
-        visible: model && model.length > 0
+        visible: model && model.length > 0 && !header.extension
         height: visible ? implicitHeight : 0
     }
 

=== modified file 'src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2015-10-10 13:02:00 +0000
+++ src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2015-11-27 15:50:01 +0000
@@ -51,7 +51,7 @@
     property Component titleComponent
 
     /*!
-      The height of the header excluding the divider and sections.
+      The height of the header excluding the divider and extension.
      */
     property real contentHeight
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2015-10-23 14:56:28 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2015-11-27 15:50:01 +0000
@@ -27,7 +27,14 @@
     property int textSize: Label.Large
 
     contentHeight: units.gu(6)
-    implicitHeight: contentHeight + divider.height + styledItem.sections.height
+    implicitHeight: contentHeight + divider.height + internal.extensionHeight
+
+    Object {
+        id: internal
+        property real extensionHeight: styledItem.extension ?
+                                         styledItem.extension.height
+                                       : styledItem.sections.height
+    }
 
     defaultActionDelegate: AbstractButton {
         style: IconButtonStyle { }

=== modified file 'tests/unit_x11/tst_components/tst_pageheader.qml'
--- tests/unit_x11/tst_components/tst_pageheader.qml	2015-10-22 13:26:51 +0000
+++ tests/unit_x11/tst_components/tst_pageheader.qml	2015-11-27 15:50:01 +0000
@@ -77,6 +77,23 @@
             }
         ]
 
+        Rectangle {
+            id: appendix
+            anchors {
+                left: parent ? parent.left : undefined
+                right: parent ? parent.right : undefined
+                bottom: parent ? parent.bottom : undefined
+            }
+            height: units.gu(4)
+            color: UbuntuColors.orange
+            Label {
+                anchors.centerIn: parent
+                text: "Mock extension"
+                color: "white"
+            }
+            visible: header.extension === appendix
+        }
+
         PageHeader {
             id: header
             flickable: flickable
@@ -89,6 +106,7 @@
                                            root.actionList : []
             navigationActions: leadingActionsSwitch.checked ?
                                           root.actionList : []
+            extension: extensionSwitch.checked ? appendix : null
         }
 
         Flickable {
@@ -169,6 +187,14 @@
                 Label {
                     text: "show sections"
                 }
+
+                Switch {
+                    id: extensionSwitch
+                    checked: false
+                }
+                Label {
+                    text: "extension"
+                }
             }
 
             PageHeader {
@@ -239,6 +265,15 @@
                 sections.actions = [];
                 compare(header.height, initialHeight,
                         "Unsetting sections does not revert the header height.");
+
+                header.extension = appendix;
+                compare(appendix.height > 0, true, "Extension height is 0.");
+                compare(header.height, initialHeight + appendix.height,
+                        "Setting extension does not correctly update header height.");
+
+                header.extension = null;
+                compare(header.height, initialHeight,
+                        "Unsetting extension does not revert the header height.");
             }
 
             function test_background_color() {
@@ -362,6 +397,23 @@
                         "Reverting leading actions changes navigationActions.");
             }
 
+            function test_sections_visible() {
+                compare(header.sections.visible, false,
+                        "Sections is not hidden by default.");
+                header.sections.actions = root.sectionActions;
+                compare(header.sections.visible, true,
+                        "Sections is not made visible by setting actions.");
+                header.extension = appendix;
+                compare(header.sections.visible, false,
+                        "Sections are not hidden when extension is set.");
+                header.extension = null;
+                compare(header.sections.visible, true,
+                        "Sections are not shown when extension is unset.");
+                header.sections.actions = [];
+                compare(header.sections.visible, false,
+                        "Sections is not hidden by clearing the actions.");
+            }
+
             // The properties of header.sections, header.leadingActionBar and
             //  header.trailingActionBar are tested in tst_sections.qml and tst_actionbar.qml.
         }