Merge lp:~tpeeters/unity8/new_tabbar-again into lp:unity8

[Tim Peeters]

Adapt to new TabBar

Re-do the changes (r820) to move the selectedIndex from the TabBar to the tabs model.

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/10-tabsModelIndex/+merge/215278

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:833
http://jenkins.qa.ubuntu.com/job/unity8-ci/2810/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/228
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1335
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4397
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6000
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4952
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4952/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2810/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
No, otto keeps being sad and broken

review: Approve

[Tim Peeters (tpeeters)]

I ran UITK and unity8 tests locally on mako with image 294:

http://paste.ubuntu.com/7254918/

UITK and unity8 tests pass. There are some failures in system-settings, same as here http://ci.ubuntu.com/smokeng/trusty/touch/mako/290:20140411.3:20140411.3/7698/ubuntu_system_settings/ I guess I have some older packages version or the tests are flaky?

review: Approve

[lp:~tpeeters/unity8/new_tabbar-again]

834. By Tim Peeters on 2014-04-29

merge trunk

835. By Tim Peeters on 2014-05-02

merge trunk

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-04-14 13:21:55 +0000
+++ qml/Dash/DashContent.qml	2014-05-02 15:19:11 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Unity 0.2
+import Utils 0.1
 import "../Components"
 
 Item {
@@ -183,23 +184,30 @@
                 width: parent.width
                 style: DashContentTabBarStyle {}
 
-                model: dashContentList.model
-
-                onSelectedIndexChanged: {
-                    if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
-                        // TODO This together with the Timer below
-                        // are a workaround for the first tab sometimes not showing the text.
-                        // But Tabs are going away in the future so not sure if makes
-                        // sense invetigating what's the problem at this stage
-                        selectionModeTimer.restart();
+                SortFilterProxyModel {
+                    id: tabBarModel
+
+                    model: dashContentList.model
+
+                    property int selectedIndex: -1
+                    onSelectedIndexChanged: {
+                        if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
+                            // TODO This together with the Timer below
+                            // are a workaround for the first tab sometimes not showing the text.
+                            // But Tabs are going away in the future so not sure if makes
+                            // sense invetigating what's the problem at this stage
+                            selectionModeTimer.restart();
+                        }
+                        dashContentList.currentIndex = selectedIndex;
                     }
-                    dashContentList.currentIndex = selectedIndex;
                 }
 
+                model: tabBarModel.count > 0 ? tabBarModel : null
+
                 Connections {
                     target: dashContentList
                     onCurrentIndexChanged: {
-                        tabBar.selectedIndex = dashContentList.currentIndex
+                        tabBarModel.selectedIndex = dashContentList.currentIndex
                     }
                 }