Merge lp:~tpeeters/ubuntu-ui-toolkit/tabBarInStyle into lp:ubuntu-ui-toolkit

[Tim Peeters]

Move the TabBar instance from Tabs to the HeaderStyle.

[lp:~tpeeters/ubuntu-ui-toolkit/tabBarInStyle]

979. By Tim Peeters on 2014-03-18

update components.api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:978
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/tabBarInStyle/+merge/211575/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1914/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4039/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3624
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/862/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/862
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/862/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4082/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3626
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3626/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5951
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4931

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:979
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/tabBarInStyle/+merge/211575/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1915/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4045/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3630
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/863/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/863
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/863/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4089/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3632
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5957
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4938

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Code looks good. Thanks!!

review: Approve

[lp:~tpeeters/ubuntu-ui-toolkit/tabBarInStyle]

980. By Tim Peeters on 2014-03-24

merge tabsModelIndex

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1939/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4196/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3780
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/887/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/887
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/887/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4266/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3782
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3782/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6078
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5142

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/tabBarInStyle]

981. By Tim Peeters on 2014-04-08

fix test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:981
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2005/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/85
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/953/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/953
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/953/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4196
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4196/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5734
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4726/console

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/tabBarInStyle]

982. By Tim Peeters on 2014-04-09

merge tabsModelIndex branch

983. By Tim Peeters on 2014-04-09

deprecate Header.contents property

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:983
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2021/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4717/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/969/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/969/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4846/console

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

superseded

review: Disapprove

Unmerged revisions

=== modified file 'CHANGES'
--- CHANGES	2014-04-09 21:55:20 +0000
+++ CHANGES	2014-04-09 21:55:21 +0000
@@ -85,6 +85,7 @@
 * ADDED IN: Empty: property bool waitingConfirmationForRemoval
 * ADDED IN: Empty: function cancelItemRemoval()
 * CHANGED in CrossFadeImage: readonly property size sourceSize TO property size sourceSize
+* DEPRECATED in Header: property Item contents
 
 Compatibility Breaks
 ********************

=== modified file 'components.api'
--- components.api	2014-04-01 12:57:27 +0000
+++ components.api	2014-04-09 21:55:21 +0000
@@ -60,6 +60,7 @@
     function hide()
     property string title
     property Item contents
+    property var tabsModel
     property Flickable flickable
 modules/Ubuntu/Components/Icon.qml
 Item

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-03-12 09:36:00 +0000
+++ modules/Ubuntu/Components/Header.qml	2014-04-09 21:55:21 +0000
@@ -54,7 +54,7 @@
         internal.movementEnded();
     }
 
-    visible: title || contents
+    visible: title || contents || tabsModel
     onVisibleChanged: {
         internal.checkFlickableMargins();
     }
@@ -80,10 +80,21 @@
     onTitleChanged: contentsChanged()
 
     /*!
+      \deprecated
       The contents of the header. If this is set, \l title will be ignored.
+      This property is now DEPRECATED. Set tabsModel to show tabs navigation in header.
      */
     property Item contents: null
-    onContentsChanged: header.show()
+    onContentsChanged: {
+        print("Header.contents property is now DEPRECATED. Set tabsModel to show tabs navigation.");
+        header.show();
+    }
+
+    /*!
+      A model of tabs to represent in the header.
+      This is automatically set by \l Tabs.
+     */
+    property var tabsModel: null
 
     /*!
       The flickable that controls the movement of the header.

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-09 21:55:21 +0000
@@ -176,14 +176,14 @@
     readonly property Item currentPage: selectedTab ? selectedTab.page : null
 
     /*!
+      \deprecated
       The \l TabBar that will be shown in the header
       and provides scrollable tab buttons.
+      This property is DEPRECATED. TabBar is now part of the header style.
      */
-    property TabBar tabBar: TabBar {
-        id: bar
-        model: tabsModel
-        visible: tabs.active
-    }
+    property TabBar tabBar: internal.header && internal.header.__styleInstance &&
+                            internal.header.__styleInstance.hasOwnProperty("__tabBar") ?
+                                internal.header.__styleInstance.__tabBar : null
 
     /*!
       Children are placed in a separate item that has functionality to extract the Tab items.
@@ -205,10 +205,7 @@
      */
     signal modelChanged()
 
-    /*!
-      \internal
-      required by TabsStyle
-     */
+    // Needed to set the tabs model of the header
     ListModel {
         id: tabsModel
 
@@ -292,13 +289,6 @@
         id: internal
         property Header header: tabs.__propagated ? tabs.__propagated.header : null
 
-        Binding {
-            target: tabBar
-            property: "animate"
-            when: internal.header && internal.header.hasOwnProperty("animate")
-            value: internal.header.animate
-        }
-
         /*
           List of connected Repeaters to avoid repeater "hammering" of itemAdded() signal.
           */
@@ -439,8 +429,8 @@
 
     Binding {
         target: internal.header
-        property: "contents"
-        value: tabs.active ? tabs.tabBar: null
+        property: "tabsModel"
+        value: tabsModel
         when: internal.header && tabs.active
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-03-12 09:36:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-09 21:55:21 +0000
@@ -43,6 +43,12 @@
 
     implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
 
+    /*!
+      \internal
+      Tabs needs to call sync of the TabBar
+     */
+    property TabBar __tabBar: tabBarLoader.sourceComponent ? tabBarLoader.item : null
+
     BorderImage {
         id: separator
         anchors {
@@ -81,7 +87,7 @@
             }
             text: styledItem.title
             font.weight: headerStyle.fontWeight
-            visible: !styledItem.contents
+            visible: !styledItem.tabsModel && !styledItem.contents
             fontSize: headerStyle.fontSize
             color: headerStyle.textColor
         }
@@ -98,5 +104,21 @@
             value: foreground
             when: styledItem.contents
         }
+
+        Loader {
+            id: tabBarLoader
+            sourceComponent: styledItem.tabsModel && !styledItem.contents ? tabBarComponent : null
+            anchors.fill: parent
+        }
+
+        Component {
+            id: tabBarComponent
+            TabBar {
+                id: tabBar
+                anchors.fill: parent
+                model: styledItem.tabsModel
+                animate: styledItem.animate
+            }
+        }
     }
 }

=== modified file 'tests/resources/navigation/TabView.qml'
--- tests/resources/navigation/TabView.qml	2014-04-09 21:55:20 +0000
+++ tests/resources/navigation/TabView.qml	2014-04-09 21:55:21 +0000
@@ -45,15 +45,7 @@
 
     Header {
         id: header
-        contents: TabBar {
-            id: tabBar
-            model: pages
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-        }
+        tabsModel: pages
     }
 
     Component {

=== modified file 'tests/unit/tst_components/tst_pagestack.qml'
--- tests/unit/tst_components/tst_pagestack.qml	2013-07-29 10:05:05 +0000
+++ tests/unit/tst_components/tst_pagestack.qml	2014-04-09 21:55:21 +0000
@@ -85,14 +85,14 @@
         pageStack.push(tabs);
         compare(pageStack.currentPage, tabs, "Tabs can be pushed on a PageStack");
         compare(tabs.active, true, "Tabs on top of a PageStack are active");
-        compare(mainView.__propagated.header.contents, tabs.tabBar, "Pushing Tabs on PageStack updates the header contents");
+        compare(mainView.__propagated.header.__styleInstance.__tabBar, tabs.tabBar, "Pushing Tabs on PageStack updates the header contents");
         pageStack.push(page1);
         compare(pageStack.currentPage, page1, "A page can be pushed on top of a Tabs");
         compare(tabs.active, false, "Tabs on a PageStack, but not on top, are inactive");
-        compare(mainView.__propagated.header.contents, null, "Contents of inactive Tabs is not applied to header");
+        compare(mainView.__propagated.header.__styleInstance.__tabBar, null, "Contents of inactive Tabs is not applied to header");
         pageStack.pop();
         compare(tabs.active, true, "Tabs on top of PageStack is active");
-        compare(mainView.__propagated.header.contents, tabs.tabBar, "Active Tabs controls header contents");
+        compare(mainView.__propagated.header.__styleInstance.__tabBar, tabs.tabBar, "Active Tabs controls header contents");
         pageStack.clear();
     }
 

=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	2013-12-04 21:01:53 +0000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-04-09 21:55:21 +0000
@@ -72,7 +72,7 @@
         function setTabBarSelectionMode(newSelectionMode) {
             var tabBar = tabs.tabBar;
             var header = mainView.__propagated.header;
-            compare(tabBar, header.contents, "TabBar is not the active header contents");
+            compare(tabBar, header.__styleInstance.__tabBar, "TabBar is not the active header contents");
             header.show();
             tabBar.selectionMode = newSelectionMode;
             compare(tabBar.selectionMode, newSelectionMode, "Failed to set the tab bar selection mode");