Merge lp:~tpeeters/ubuntu-ui-toolkit/back-in-header into lp:ubuntu-ui-toolkit

[Tim Peeters]

Don't review yet, I just need to see the diff

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:889
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1613/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2496/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2325/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/561/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/561/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2498/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2325/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1613/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Then should be set to work-in-progress

Unmerged revisions

889. By Tim Peeters on 2014-01-21

merge trunk

888. By Tim Peeters on 2013-12-11

remove test program that was meant for another branch

887. By Tim Peeters on 2013-12-11

add test program

886. By Tim Peeters on 2013-12-09

lock empty toolbar even when there is back

885. By Tim Peeters on 2013-12-09

adjust text margin if there are controls

884. By Tim Peeters on 2013-12-09

move the back button to the header

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-01-09 12:02:58 +0000
+++ modules/Ubuntu/Components/Header.qml	2014-01-21 14:52:29 +0000
@@ -85,6 +85,9 @@
     property Item contents: null
     onContentsChanged: header.show()
 
+    // TODO TIM: description
+    property Item controls: null
+
     /*!
       The flickable that controls the movement of the header.
       Will be set automatically by Pages inside a MainView, but can
 
=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-12-05 17:28:54 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-01-21 14:52:29 +0000
@@ -321,6 +321,15 @@
             property real bottomY: headerItem.y + headerItem.height
             animate: canvas.animate
 
+            Binding {
+                target: header
+                property: "controls"
+                when: mainView.activeLeafNode && mainView.activeLeafNode.hasOwnProperty("tools") &&
+                      mainView.activeLeafNode.tools && mainView.activeLeafNode.tools.hasOwnProperty("back") &&
+                      mainView.activeLeafNode.tools.back && mainView.activeLeafNode.tools.back.visible
+                value: mainView.activeLeafNode.tools.back
+            }
+
             property Item tabBar: null
             Binding {
                 target: headerItem
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2013-11-12 06:41:24 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-01-21 14:52:29 +0000
@@ -39,7 +39,7 @@
     property int fontWeight: Font.Light
     property string fontSize: "x-large"
     property color textColor: Theme.palette.selected.backgroundText
-    property real textLeftMargin: units.gu(2)
+    property real textLeftMargin: styledItem.controls ? 0 : units.gu(2)
 
     implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
 
@@ -63,9 +63,40 @@
     }
 
     Item {
+        id: controlContainer
+        anchors {
+            left: parent.left
+            top: parent.top
+        }
+        height: headerStyle.contentHeight
+        width: styledItem.controls ? styledItem.controls.width : 0
+
+        Binding {
+            target: styledItem.controls
+            property: "parent"
+            value: controlContainer
+            when: styledItem.controls
+        }
+
+        // Compensate for the lack of a MouseArea in the ToolbarButton by
+        //  adding a MouseArea on top of it.
+        MouseArea {
+            // FIXME: Currently this only works if the controls is a single
+            //  ToolbarButton. To support multiple controls, use a similar
+            //  detection of the clicked item as in Panel.qml.
+            anchors.fill: parent
+            onClicked: {
+                styledItem.controls.trigger();
+            }
+            visible: styledItem.controls && styledItem.controls.hasOwnProperty("trigger") &&
+                     !styledItem.controls.hasOwnProperty("clicked")
+        }
+    }
+
+    Item {
         id: foreground
         anchors {
-            left: parent.left
+            left: controlContainer.right
             right: parent.right
             top: parent.top
         }
 
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-01-21 14:52:29 +0000
@@ -175,7 +175,7 @@
           Determine whether this ToolbarItems has any visible Items
         */
         function hasVisibleItems() {
-            if (back && back.visible) return true;
+//            if (back && back.visible) return true;
             for (var i=0; i < toolsContainer.children.length; i++) {
                 if (toolsContainer.children[i].visible) return true;
             }
@@ -197,6 +197,8 @@
         // when toolbarItems.back is updated.
         property Item previousBackItem: null
 
+        // FIXME TIM: Don't set the parent of backItem to be the backContainer if the
+        //  back item is in the header. Why not use a Connection for this?
         function updateBackItem() {
             if (backContainer.previousBackItem) backContainer.previousBackItem.parent = null;
             backContainer.previousBackItem = toolbarItems.back;