Merge into trunk : tabbar_dash : Code : Unity 8

Status:	Merged
Approved by:	Michał Sawicz on 2014-01-07
Approved revision:	536
Merged at revision:	617
Proposed branch:	lp:~aacid/unity8/tabbar_dash
Merge into:	lp:unity8
Diff against target:	1835 lines (+651/-644) 22 files modified plugins/Utils/qsortfilterproxymodelqml.cpp (+12/-0) plugins/Utils/qsortfilterproxymodelqml.h (+1/-0) qml/Components/PageHeader.qml (+13/-37) qml/Components/PageHeaderLabel.qml (+41/-0) qml/Dash/Dash.qml (+0/-18) qml/Dash/DashApps.qml (+0/-3) qml/Dash/DashBar.qml (+0/-128) qml/Dash/DashContent.qml (+134/-73) qml/Dash/DashContentOpenEffect.qml (+57/-0) qml/Dash/DashContentTabBarStyle.qml (+21/-0) qml/Dash/GenericScopeView.qml (+28/-228) qml/Dash/PreviewListView.qml (+212/-0) qml/Hud/HudParametrizedActionsPage.qml (+1/-1) tests/mocks/Unity/fake_scopes.cpp (+3/-0) tests/mocks/Unity/fake_scopes.h (+2/-1) tests/qmltests/CMakeLists.txt (+1/-2) tests/qmltests/Components/tst_PageHeaderLabel.qml (+2/-2) tests/qmltests/Dash/qml/FakeScopeView.qml (+1/-0) tests/qmltests/Dash/tst_Dash.qml (+6/-8) tests/qmltests/Dash/tst_DashBar.qml (+0/-111) tests/qmltests/Dash/tst_DashContent.qml (+67/-4) tests/qmltests/Dash/tst_GenericScopeView.qml (+49/-28)
To merge this branch:	bzr merge lp:~aacid/unity8/tabbar_dash
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-01-07
Michael Zanetti (community)			Approve on 2014-01-07
Michał Sawicz		2013-10-24	Needs Fixing on 2013-12-10
Review via email: mp+192505@code.launchpad.net

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-10-24:

#

Part of the big change in Dash/DashContent.qml is just indentation, you may want to review using a more space-friendly diff tool

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-10-24:

#

The search entry behaves wrong on wide screens - it should only take the *current* label into account when deciding whether to hide up or not.

Related to above - you should be able to scroll the tab bar by dragging / swiping without tapping first.

The tab bar should be limited to shell.width - textEntry.width so that they don't overlap.

The "fat horizontal divider" is always on screen for me.

After overshooting, the header does not come back to the original position, it stops some 1-2gu up from where it should be.

The header label travels behind the search entry.

When switching to the sides, the header label moves down some 1-2gu from where it should be.

review: Needs Fixing (functional)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-24:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1489/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-28:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1503/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-10-28:

#

> The search entry behaves wrong on wide screens - it should only take the
> *current* label into account when deciding whether to hide up or not.

Fixed

> Related to above - you should be able to scroll the tab bar by dragging /
> swiping without tapping first.

That works here :-S

> The tab bar should be limited to shell.width - textEntry.width so that they
> don't overlap.

Fixed

> The "fat horizontal divider" is always on screen for me.

Fixed

> After overshooting, the header does not come back to the original position, it
> stops some 1-2gu up from where it should be.

Hmmmm, you sure this is a bug? I mean, isn't it just that the list is a bit taller than the viewport and so it doesn't come back simply because it doesn't have to? If not can you tell me exactly what you do to repro?

>
> The header label travels behind the search entry.

Not sure if i understand this

>
> When switching to the sides, the header label moves down some 1-2gu from where
> it should be.

Is this the same thing than in the other 1-2gu comment?

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-10-28:

#

On 28.10.2013 09:31, Albert Astals Cid wrote:
>> Related to above - you should be able to scroll the tab bar by dragging /
>> swiping without tapping first.
>
> That works here :-S

Yeah, must've gotten fixed.

>> After overshooting, the header does not come back to the original position, it
>> stops some 1-2gu up from where it should be.
>
> Hmmmm, you sure this is a bug? I mean, isn't it just that the list is a bit taller than the viewport and so it doesn't come back simply because it doesn't have to? If not can you tell me exactly what you do to repro?

I'm still getting that sometimes, but need to find steps to repro.

>> The header label travels behind the search entry.
>
> Not sure if i understand this

Fixed.

>> When switching to the sides, the header label moves down some 1-2gu from where
>> it should be.
>
> Is this the same thing than in the other 1-2gu comment?

Fixed.

--
Michał (Saviq) Sawicz <email address hidden>
Canonical Services Ltd.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-28:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1505/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

http://i.imgur.com/GQIJAfN.png

Font color broken ^^

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

> Set the raised style so we can see text when it's white on white

yep, better

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

The progression arrow is still invisible with a white background

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

> >> After overshooting, the header does not come back to the original position,
> it
> >> stops some 1-2gu up from where it should be.
> >
> > Hmmmm, you sure this is a bug? I mean, isn't it just that the list is a bit
> taller than the viewport and so it doesn't come back simply because it doesn't
> have to? If not can you tell me exactly what you do to repro?
>
> I'm still getting that sometimes, but need to find steps to repro.

Confirming this. Flicking the Home scope upwards makes it end up a bit off in most of the cases here. Starting to drag the next time makes the title jump into the correct position.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

Here's a screenshot showing the white arrow on white background: http://i.imgur.com/LH6xe0D.png

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

> Confirming this. Flicking the Home scope upwards makes it end up a bit off in
> most of the cases here. Starting to drag the next time makes the title jump
> into the correct position.

Same in trunk. So ignore this for this review

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-29:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1514/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-29:

#

I really like this branch. Does a lot of good restructuring. Some things you might want to fix:

=====

20 + property alias childItem: itemContainer.children

61 + property bool narrowMode: {
62 + if (root.childItem.length == 0)
63 + return false;
64 + if (root.childItem.length > 1) {
65 + console.log("ERROR: PageHeader childItem must be a single item");
66 + return false;
67 + }
68 + var item = root.childItem[0];
69 + return parent.width < item.implicitWidth + units.gu(50)
70 + }

I think it would be more future proof and readable if the check for length == 1 is in the childItem assignment already instead of all the places where childItem is going to be used (admittedly its only one so far).

=====

445 + /* FIXME: workaround rendering issue due to use of ShaderEffectSource in
446 + UbuntuShape. While switching from the home scope to the People scope the
447 + rendering would block midway.

Maybe a chance to update this one. We don't have a people scope any more but I think this is still valid with all the scopes.

=====
858 \ No newline at end of file

=====

I think we could use a test that switches to another scope using the TabBar, given that those tests were dropped with the DashBar.

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1523/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1525/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1526/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

#

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1532/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-02:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-12-10:

#

Otto trusty environment needed to be updated. A test run after the update passed, so re-building.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-12-10:

#

Failing tests:
qmltestrunner.DashContent::test_tabBar_index_change
qmltestrunner.GenericScopeView::test_show_spinner

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-12:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-12:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-12:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-12-12:

#

Silly me, i thought the needed sdk stuff was in but it is not ^_^

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-20:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-20:

#

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

review: Approve (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-12-22:

#

Yay, the SDK work has been finally merged and this can get some review. If someone needs work for Monday/Tuesday, this is available :-)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-02:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-07:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-01-07:

#

1258 \ No newline at end of file

====

Isn't it a bit messy how the PageHeader is set to the GenericScopeView? It seems that you have a property pageHeader in GenericScopeView where you set the PageHeader in DashContent to. But then you do only half the stuff on that while still emitting signals to position and resize the header. Can't we set everything inside GenericScopeView?

====

are the console.log()s in the tests being left intentionally?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-07:

#

> 1258 \ No newline at end of file

Done

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-07:

#

> are the console.log()s in the tests being left intentionally?

Nope

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-07:

#

> Isn't it a bit messy how the PageHeader is set to the GenericScopeView? It
> seems that you have a property pageHeader in GenericScopeView where you set
> the PageHeader in DashContent to. But then you do only half the stuff on that
> while still emitting signals to position and resize the header. Can't we set
> everything inside GenericScopeView?

Nope, as explained in the commit message: "The header of the LVWPH of GenericScopeView is now fake and only used for positioning. There is a single global floating header in DashContent (which is a PageHeader with a TabBar as childItem)"

i.e. since there is now only one PageHeader (a single tabbar) it can't be done inside GenericScopeView since there's multiple of them.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-07:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-01-07:

#

yip yip.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-07:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-07:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-07:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2014-01-07:

#

review: Approve (continuous-integration)

Unity 8

Merge lp:~aacid/unity8/tabbar_dash into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'plugins/Utils/qsortfilterproxymodelqml.cpp'
 --- plugins/Utils/qsortfilterproxymodelqml.cpp	2013-09-09 10:14:26 +0000
 +++ plugins/Utils/qsortfilterproxymodelqml.cpp	2014-01-07 17:09:31 +0000
@@ -68,6 +68,18 @@
+     }
+ }
++QVariantMap
++QSortFilterProxyModelQML::get(int row)
++{
++    QVariantMap res;
++    const QHash<int, QByteArray> roles = roleNames();
++    auto it = roles.begin();
++    for ( ; it != roles.end(); ++it) {
++        res[*it] = data(row, it.key());
++    }
++    return res;
++}
++
  QVariant
  QSortFilterProxyModelQML::data(int row, int role)
+ {
 === modified file 'plugins/Utils/qsortfilterproxymodelqml.h'
 --- plugins/Utils/qsortfilterproxymodelqml.h	2013-09-09 10:14:26 +0000
 +++ plugins/Utils/qsortfilterproxymodelqml.h	2014-01-07 17:09:31 +0000
@@ -31,6 +31,7 @@
  public:
      explicit QSortFilterProxyModelQML(QObject *parent = 0);
++    Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
      Q_INVOKABLE QVariant data(int row, int role);
      Q_INVOKABLE int count();
      Q_INVOKABLE int findFirst(int role, const QVariant& value) const;
 === modified file 'qml/Components/PageHeader.qml'
 --- qml/Components/PageHeader.qml	2013-12-02 17:43:09 +0000
 +++ qml/Components/PageHeader.qml	2014-01-07 17:09:31 +0000
@@ -21,17 +21,12 @@
  import Unity 0.1
  Item {
--    /*!
--     \preliminary
--     The text that is shown inside the Page Header
--     \qmlproperty string text
--    */
--    property alias text: label.text
--
++    id: root
      property bool searchEntryEnabled: false
      property alias searchQuery: searchField.text
      property ListModel searchHistory
      property Scope scope
++    property alias childItem: itemContainer.children
      height: units.gu(8.5)
      implicitHeight: units.gu(8.5)
@@ -82,29 +77,10 @@
              height: childrenRect.height
              Item {
--                id: textContainer
++                id: itemContainer
--                width: header.width
++                width: searchContainer.narrowMode ? header.width : header.width - searchContainer.width
                  height: header.height
--
--                Label {
--                    id: label
--                    anchors {
--                        left: parent.left
--                        leftMargin: units.gu(2)
--                        right: parent.right
--                        verticalCenter: parent.verticalCenter
--                    }
--
--                    color: Theme.palette.selected.backgroundText
--                    opacity: 0.8
--                    font.family: "Ubuntu"
--                    font.weight: Font.Light
--                    fontSize: "x-large"
--                    elide: Text.ElideRight
--                    style: Text.Raised
--                    styleColor: "black"
--                }
+             }
              Item {
@@ -115,12 +91,12 @@
                  property bool popoverShouldOpen: false
                  property bool popoverShouldClose: false
--                property bool narrowMode: parent.width < label.contentWidth + units.gu(50)
++                property bool narrowMode: parent.width < units.gu(80)
                  property bool active: searchField.text != "" || searchField.activeFocus
                  property var popover: null
--                anchors.right: textContainer.right
++                anchors.right: headerContainer.right
                  height: header.height
                  state:
@@ -255,13 +231,13 @@
                  states: [
                      State {
                          name: "wide"
--                        AnchorChanges { target: textContainer; anchors.top: headerContainer.top }
--                        AnchorChanges { target: searchContainer; anchors.left: undefined; anchors.top: textContainer.top }
++                        AnchorChanges { target: itemContainer; anchors.top: headerContainer.top }
++                        AnchorChanges { target: searchContainer; anchors.left: undefined; anchors.top: itemContainer.top }
                      },
                      State {
                          name: "narrow"
                          PropertyChanges { target: searchField; highlighted: true }
--                        AnchorChanges { target: textContainer; anchors.top: searchContainer.bottom }
++                        AnchorChanges { target: itemContainer; anchors.top: searchContainer.bottom }
                          AnchorChanges { target: searchContainer; anchors.left: headerContainer.left; anchors.top: headerContainer.top }
                      },
                      State {
@@ -299,7 +275,7 @@
                              ParallelAnimation {
                                  NumberAnimation { targets: [searchContainer, searchField]; property: "width"; duration: 200; easing.type: Easing.InOutQuad }
                                  PropertyAction  { target: primaryImage; property: "source" }
--                                AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }
++                                AnchorAnimation { targets: [searchContainer, itemContainer]; duration: 200; easing.type: Easing.InOutQuad }
+                             }
                              ScriptAction { script: if (searchContainer.popoverShouldOpen) { searchContainer.openPopover(); } }
+                         }
@@ -308,14 +284,14 @@
                          to: "inactive"
                          ScriptAction { script: if (searchContainer.popoverShouldClose) { searchContainer.closePopover(); } }
                          NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.InOutQuad }
--                        AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }
++                        AnchorAnimation { targets: [searchContainer, itemContainer]; duration: 200; easing.type: Easing.InOutQuad }
                      },
                      Transition {
                          to: "narrowActive"
                          SequentialAnimation {
                              ParallelAnimation {
                                  NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.OutQuad }
--                                AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }
++                                AnchorAnimation { targets: [searchContainer, itemContainer]; duration: 200; easing.type: Easing.InOutQuad }
+                             }
                              ScriptAction { script: if (searchContainer.popoverShouldOpen) { searchContainer.openPopover(); } }
+                         }
@@ -324,7 +300,7 @@
                          to: "narrowInactive"
                          ScriptAction { script: if (searchContainer.popoverShouldClose) { searchContainer.closePopover(); } }
                          NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.OutQuad }
--                        AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }
++                        AnchorAnimation { targets: [searchContainer, itemContainer]; duration: 200; easing.type: Easing.InOutQuad }
+                     }
+                 ]
 === added file 'qml/Components/PageHeaderLabel.qml'
 --- qml/Components/PageHeaderLabel.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/PageHeaderLabel.qml	2014-01-07 17:09:31 +0000
@@ -0,0 +1,41 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++PageHeader {
++    property alias text: label.text
++
++    childItem: Label {
++        id: label
++        anchors {
++            left: parent.left
++            leftMargin: units.gu(2)
++            right: parent.right
++            verticalCenter: parent.verticalCenter
++        }
++
++        color: Theme.palette.selected.backgroundText
++        opacity: 0.8
++        font.family: "Ubuntu"
++        font.weight: Font.Light
++        fontSize: "x-large"
++        elide: Text.ElideRight
++        style: Text.Raised
++        styleColor: "black"
++    }
++}
 === modified file 'qml/Dash/Dash.qml'
 --- qml/Dash/Dash.qml	2013-11-19 14:33:40 +0000
 +++ qml/Dash/Dash.qml	2014-01-07 17:09:31 +0000
@@ -66,11 +66,6 @@
          model: filteredScopes
          scopes: scopes
          searchHistory: dash.searchHistory
--        onMovementStarted: dashbar.startNavigation()
--        onMovementEnded: dashbar.stopNavigation()
--        onContentFlickStarted: dashbar.finishNavigation()
--        onContentEndReached: dashbar.finishNavigation()
--        onPreviewShown: dashbar.finishNavigation()
          onScopeLoaded: {
              if (scopeId == dash.showScopeOnLoaded) {
                  dash.setCurrentScope(scopeId, false, false)
@@ -80,17 +75,4 @@
          scale: dash.contentScale
          clip: scale != 1.0
+     }
--
--    DashBar {
--        id: dashbar
--        objectName: "dashbar"
--        anchors.bottom: parent.bottom
--        anchors.left: parent.left
--        anchors.right: parent.right
--        model: filteredScopes
--        currentIndex: dashContent.currentIndex
--        onItemSelected: dashContent.setCurrentScopeAtIndex(index, true, false)
--        opacity: dash.contentScale == 1.0 ? 1.0 : 0.0
--        Behavior on opacity { NumberAnimation { easing.type: Easing.OutQuad; duration: 150 } }
--    }
+ }
 === modified file 'qml/Dash/DashApps.qml'
 --- qml/Dash/DashApps.qml	2013-11-30 11:40:30 +0000
 +++ qml/Dash/DashApps.qml	2014-01-07 17:09:31 +0000
@@ -29,9 +29,6 @@
      property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
      property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
--    //FIXME an alias to itself shouldn't be required. More than likely a Qt bug. Try removing with newer Qt.
--    property alias searchHistory: scopeView.searchHistory
--
      ListModel {
          id: dummyVisibilityModifier
 === removed file 'qml/Dash/DashBar.qml'
 --- qml/Dash/DashBar.qml	2013-10-21 14:53:26 +0000
 +++ qml/Dash/DashBar.qml	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity 0.1
--
--Item {
--    id: dashBar
--
--    property var model
--    property alias currentIndex: row.currentIndex
--
--    property int lineHeight: units.dp(2)
--    property int itemSize: units.gu(7)
--    property int iconSize: units.gu(3.5)
--
--    signal itemSelected(int index)
--
--    width: units.gu(40)
--    height: units.gu(6)
--
--    function startNavigation() {
--        timeout.stop()
--        panel.open()
--    }
--
--    function stopNavigation() {
--        timeout.restart()
--    }
--
--    function finishNavigation() {
--        panel.close()
--    }
--
--    Timer {
--        id: timeout
--        interval: 1500
--        running: false
--        repeat: false
--        onTriggered: finishNavigation()
--    }
--
--    Panel {
--        id: panel
--        objectName: "panel"
--        anchors.fill: parent
--
--        locked: true // TODO: remove this when lp bug #1179569 will be fixed
--
--        Rectangle {
--            color: "black"
--            anchors.fill: parent
--
--            ListView {
--                id: row
--                objectName: "row"
--                model: dashBar.model
--                orientation: ListView.Horizontal
--                width: Math.min(Math.max(dashBar.width/2, units.gu(40)), count * itemSize)
--                height: parent.height
--                anchors.horizontalCenter: parent.horizontalCenter
--                onMovingChanged: if (moving) { timeout.stop() } else { timeout.restart() }
--                interactive: visibleArea.widthRatio < 1 && panel.opened
--                highlightFollowsCurrentItem: false
--
--                onCurrentItemChanged: {
--                    highlightLine.width = currentItem.width
--                    highlightLine.x = x + currentItem.x
--                }
--
--                delegate:
--                    // FIXME: Use Panel's integrated trigger() once that works again.
--                    MouseArea {
--                        width: itemSize
--                        height: dashBar.height
--                        anchors.top: parent.top
--
--                        onClicked: {
--                            dashBar.itemSelected(index)
--                            timeout.restart()
--                        }
--
--                        Image {
--                            anchors.centerIn: parent
--                            source: scope.iconHint
--                            sourceSize { width: iconSize; height: iconSize }
--                            // opacity: index == currentIndex ? 1 : 1 // same opacity for now
--                        }
--                    }
--            }
--        }
--    }
--
--    Rectangle {
--        anchors {
--            left: parent.left
--            right: parent.right
--            bottom: parent.bottom
--        }
--        height: dashBar.lineHeight
--        color: "black"
--
--        Rectangle {
--            id: highlightLine
--            color: Theme.palette.selected.foreground
--            height: parent.height
--            anchors.bottom: parent.bottom
--            z: 1
--
--            Behavior on x {NumberAnimation { duration: 150; easing.type: Easing.OutCubic}}
--            Behavior on width {NumberAnimation { duration: 150; easing.type: Easing.OutCubic}}
--        }
--    }
--}
 === modified file 'qml/Dash/DashContent.qml'
 --- qml/Dash/DashContent.qml	2013-11-28 10:53:18 +0000
 +++ qml/Dash/DashContent.qml	2014-01-07 17:09:31 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
  import Unity 0.1
++import "../Components"
  Item {
      id: dashContent
@@ -33,7 +34,6 @@
      signal movementEnded()
      signal contentFlickStarted()
      signal contentEndReached()
--    signal previewShown()
      signal scopeLoaded(string scopeId)
      signal positionedAtBeginning()
@@ -80,77 +80,138 @@
+         }
+     }
--    ListView {
--        id: dashContentList
--        objectName: "dashContentList"
--
--        interactive: dashContent.scopes.loaded && !currentItem.previewShown && !currentItem.moving
--
--        anchors.fill: parent
--        model: dashContent.model
--        orientation: ListView.Horizontal
--        boundsBehavior: Flickable.DragAndOvershootBounds
--        flickDeceleration: units.gu(625)
--        maximumFlickVelocity: width * 5
--        snapMode: ListView.SnapOneItem
--        highlightMoveDuration: 250
--        highlightRangeMode: ListView.StrictlyEnforceRange
--        /* FIXME: workaround rendering issue due to use of ShaderEffectSource in
--           UbuntuShape. While switching from the home scope to the People scope the
--           rendering would block midway.
--        */
--        cacheBuffer: 2147483647
--        onMovementStarted: dashContent.movementStarted()
--        onMovementEnded: dashContent.movementEnded()
--
--        // If the number of items is less than the current index, then need to reset to another item.
--        onCountChanged: {
--            if (count > 0) {
--                if (currentIndex >= count) {
--                    dashContent.setCurrentScopeAtIndex(count-1, true, true)
--                } else if (currentIndex < 0) {
--                    // setting currentIndex directly, cause we don't want to loose set_current_index
--                    dashContent.currentIndex = 0
--                }
--            }
--        }
--
--        delegate:
--            Loader {
--                width: ListView.view.width
--                height: ListView.view.height
--                asynchronous: true
--                source: scopeMapper.map(scope.id)
--                objectName: scope.id + " loader"
--
--                readonly property bool previewShown: item ? item.previewShown : false
--                readonly property bool moving: item ? item.moving : false
--
--                // these are needed for autopilot tests
--                readonly property string scopeId: scope.id
--                readonly property bool isCurrent: ListView.isCurrentItem
--                readonly property bool isLoaded: status == Loader.Ready
--
--                onLoaded: {
--                    item.scope = Qt.binding(function() { return scope })
--                    item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
--                    item.searchHistory = Qt.binding(function() { return dashContent.searchHistory })
--                    dashContentList.movementStarted.connect(item.movementStarted)
--                    dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
--                    dashContent.scopeLoaded(item.scope.id)
--                }
--                Connections {
--                    target: item
--                    ignoreUnknownSignals: true
--                    onEndReached: contentEndReached()
--                    onPreviewShownChanged: {
--                        if (item.previewShown) {
--                            dashContent.previewShown()
--                        }
--                    }
--                }
--
--                Component.onDestruction: active = false
--            }
++    Item {
++        id: dashContentListHolder
++        anchors.fill: parent
++
++        ListView {
++            id: dashContentList
++            objectName: "dashContentList"
++
++            interactive: dashContent.scopes.loaded && !previewListView.onScreen && !currentItem.moving
++
++            anchors.fill: parent
++            model: dashContent.model
++            orientation: ListView.Horizontal
++            boundsBehavior: Flickable.DragAndOvershootBounds
++            flickDeceleration: units.gu(625)
++            maximumFlickVelocity: width * 5
++            snapMode: ListView.SnapOneItem
++            highlightMoveDuration: 250
++            highlightRangeMode: ListView.StrictlyEnforceRange
++            // TODO Investigate if we can switch to a smaller cache buffer when/if UbuntuShape gets more performant
++            cacheBuffer: 1073741823
++            onMovementStarted: dashContent.movementStarted()
++            onMovementEnded: dashContent.movementEnded()
++
++            // If the number of items is less than the current index, then need to reset to another item.
++            onCountChanged: {
++                if (count > 0) {
++                    if (currentIndex >= count) {
++                        dashContent.setCurrentScopeAtIndex(count-1, true, true)
++                    } else if (currentIndex < 0) {
++                        // setting currentIndex directly, cause we don't want to loose set_current_index
++                        dashContent.currentIndex = 0
++                    }
++                }
++            }
++
++            delegate:
++                Loader {
++                    width: ListView.view.width
++                    height: ListView.view.height
++                    asynchronous: true
++                    source: scopeMapper.map(scope.id)
++                    objectName: scope.id + " loader"
++
++                    readonly property bool moving: item ? item.moving : false
++                    readonly property var categoryView: item ? item.categoryView : null
++                    readonly property Scope theScope: scope
++
++                    // these are needed for autopilot tests
++                    readonly property string scopeId: scope.id
++                    readonly property bool isCurrent: ListView.isCurrentItem
++                    readonly property bool isLoaded: status == Loader.Ready
++
++                    onLoaded: {
++                        item.scope = Qt.binding(function() { return scope })
++                        item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
++                        item.tabBarHeight = pageHeader.implicitHeight;
++                        item.pageHeader = pageHeader;
++                        item.openEffect = openEffect;
++                        item.previewListView = previewListView;
++                        dashContentList.movementStarted.connect(item.movementStarted)
++                        dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
++                        dashContent.scopeLoaded(item.scope.id)
++                    }
++                    Connections {
++                        target: item
++                        ignoreUnknownSignals: true
++                        onEndReached: contentEndReached()
++                    }
++
++                    Component.onDestruction: active = false
++                }
++        }
++
++        PageHeader {
++            id: pageHeader
++            width: parent.width
++            searchEntryEnabled: true
++            searchHistory: dashContent.searchHistory
++
++            childItem: TabBar {
++                id: tabBar
++                objectName: "tabbar"
++                height: units.gu(7)
++                width: parent.width
++                selectionMode: false
++                style: DashContentTabBarStyle {}
++
++                model: dashContentList.model
++
++                onSelectedIndexChanged: {
++                    dashContentList.currentIndex = selectedIndex;
++                }
++
++                Connections {
++                    target: dashContentList
++                    onCurrentIndexChanged: {
++                        tabBar.selectedIndex = dashContentList.currentIndex
++                    }
++                }
++
++                Connections {
++                    target: model
++                    onCountChanged: {
++                        if (tabBar.selectedIndex < 0 && model.count > 0)
++                            tabBar.selectedIndex = 0;
++                    }
++                }
++
++                Component.onCompleted: {
++                    __styleInstance.headerTextStyle = Text.Raised
++                    __styleInstance.headerTextStyleColor = "black"
++                }
++            }
++        }
++    }
++
++    DashContentOpenEffect {
++        id: openEffect
++        anchors {
++            fill: parent
++            bottomMargin: -bottomOverflow
++        }
++        sourceItem: dashContentListHolder
++        previewListView: previewListView
++    }
++
++    PreviewListView {
++        id: previewListView
++        openEffect: openEffect
++        categoryView: dashContentList.currentItem ? dashContentList.currentItem.categoryView : null
++        scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
++        anchors.fill: parent
+     }
+ }
 === added file 'qml/Dash/DashContentOpenEffect.qml'
 --- qml/Dash/DashContentOpenEffect.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/DashContentOpenEffect.qml	2014-01-07 17:09:31 +0000
@@ -0,0 +1,57 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import "../Components"
++
++OpenEffect {
++    property PreviewListView previewListView: null
++
++    objectName: "openEffect"
++    anchors {
++        fill: parent
++        bottomMargin: -bottomOverflow
++    }
++
++    enabled: gap > 0.0
++
++    topGapPx: (1 - gap) * positionPx
++    topOpacity: (1 - gap * 1.2)
++    bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
++    bottomOverflow: units.gu(20)
++    live: !expansionAnimation.running
++
++    property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
++    property real gap: previewListView.open ? 1.0 : 0.0
++
++    Behavior on gap {
++        NumberAnimation {
++            id: expansionAnimation
++            duration: 200
++            easing.type: Easing.InOutQuad
++            onRunningChanged: {
++                if (!previewListView.open && !running) {
++                    previewListView.onScreen = false
++                }
++            }
++        }
++    }
++    Behavior on positionPx {
++        enabled: previewListView.open
++        UbuntuNumberAnimation {}
++    }
++}
 === added file 'qml/Dash/DashContentTabBarStyle.qml'
 --- qml/Dash/DashContentTabBarStyle.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/DashContentTabBarStyle.qml	2014-01-07 17:09:31 +0000
@@ -0,0 +1,21 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import Ubuntu.Components.Themes.Ambiance 0.1
++
++TabBarStyle {
++    indicatorImageSource: "graphics/tabbarchevron.png"
++}
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2013-12-05 10:45:25 +0000
 +++ qml/Dash/GenericScopeView.qml	2014-01-07 17:09:31 +0000
@@ -27,15 +27,18 @@
      property Scope scope
      property SortFilterProxyModel categories: categoryFilter
      property bool isCurrent
--    property ListModel searchHistory
      property alias moving: categoryView.moving
++    property int tabBarHeight: 0
++    property PageHeader pageHeader: null
++    property OpenEffect openEffect: null
++    property Item previewListView: null
      signal endReached
      signal movementStarted
      signal positionedAtBeginning
--    readonly property alias previewShown: previewListView.onScreen
      property bool enableHeightBehaviorOnNextCreation: false
++    property var categoryView: categoryView
      // FIXME delay the search so that daemons have time to settle, note that
      // removing this will break ScopeView::test_changeScope
@@ -84,12 +87,14 @@
          target: scopeView.scope
          property: "searchQuery"
          value: pageHeader.searchQuery
++        when: isCurrent
+     }
      Binding {
          target: pageHeader
          property: "searchQuery"
          value: scopeView.scope.searchQuery
++        when: isCurrent
+     }
      Connections {
@@ -119,6 +124,10 @@
          property string expandedCategoryId: ""
          signal correctExpandedCategory();
++        onContentYChanged: pageHeader.positionRealHeader();
++        onOriginYChanged: pageHeader.positionRealHeader();
++        onContentHeightChanged: pageHeader.positionRealHeader();
++
          Behavior on contentY {
              enabled: previewListView.open
              UbuntuNumberAnimation {}
@@ -176,7 +185,7 @@
                      target: rendererLoader.item
                      onClicked: {
                          // Prepare the preview in case activate() triggers a preview only
--                        effect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + categoryView.stickyHeaderHeight);
++                        openEffect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + categoryView.stickyHeaderHeight);
                          previewListView.categoryId = categoryId
                          previewListView.categoryDelegate = rendererLoader.item
                          previewListView.model = target.model;
@@ -197,7 +206,7 @@
+                         }
+                     }
                      onPressAndHold: {
--                        effect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + categoryView.stickyHeaderHeight);
++                        openEffect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + categoryView.stickyHeaderHeight);
                          previewListView.categoryId = categoryId
                          previewListView.categoryDelegate = rendererLoader.item
                          previewListView.model = target.model;
@@ -288,14 +297,20 @@
                      categoryView.expandedCategoryId = "";
+             }
+         }
--        pageHeader: PageHeader {
--            id: pageHeader
--            objectName: "pageHeader"
--            width: categoryView.width
--            text: scopeView.scope.name
--            searchEntryEnabled: true
--            scope: scopeView.scope
--            searchHistory: scopeView.searchHistory
++        pageHeader: Item {
++            implicitHeight: scopeView.tabBarHeight
++            onHeightChanged: {
++                if (scopeView.pageHeader) {
++                    scopeView.pageHeader.height = height;
++                }
++            }
++            onYChanged: positionRealHeader();
++
++            function positionRealHeader() {
++                if (scopeView.pageHeader) {
++                    scopeView.pageHeader.y = y + parent.y;
++                }
++            }
+         }
+     }
@@ -346,44 +361,6 @@
+         }
+     }
--    OpenEffect {
--        id: effect
--        objectName: "openEffect"
--        anchors {
--            fill: parent
--            bottomMargin: -bottomOverflow
--        }
--        sourceItem: categoryView
--
--        enabled: gap > 0.0
--
--        topGapPx: (1 - gap) * positionPx
--        topOpacity: (1 - gap * 1.2)
--        bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
--        bottomOverflow: units.gu(20)
--        live: !expansionAnimation.running
--
--        property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
--        property real gap: previewListView.open ? 1.0 : 0.0
--
--        Behavior on gap {
--            NumberAnimation {
--                id: expansionAnimation
--                duration: 200
--                easing.type: Easing.InOutQuad
--                onRunningChanged: {
--                    if (!previewListView.open && !running) {
--                        previewListView.onScreen = false
--                    }
--                }
--            }
--        }
--        Behavior on positionPx {
--            enabled: previewListView.open
--            UbuntuNumberAnimation {}
--        }
--    }
--
      Connections {
          target: scopeView.scope
          onPreviewReady: {
@@ -402,190 +379,13 @@
+         }
+     }
--    PreviewDelegateMapper {
--        id: previewDelegateMapper
--    }
--
--    ListView  {
--        id: previewListView
--        objectName: "previewListView"
--        height: effect.bottomGapPx - effect.topGapPx
--        anchors {
--            top: parent.top
--            topMargin: effect.topGapPx
--            left: parent.left
--            right: parent.right
--        }
--        orientation: ListView.Horizontal
--        highlightRangeMode: ListView.StrictlyEnforceRange
--        snapMode: ListView.SnapOneItem
--        boundsBehavior: Flickable.DragAndOvershootBounds
--        highlightMoveDuration: 250
--        flickDeceleration: units.gu(625)
--        maximumFlickVelocity: width * 5
--        cacheBuffer: 0
--
--        // To be set before opening the preview
--        property string categoryId: ""
--        property var categoryDelegate
--
--        // because the ListView is built asynchronous, setting the
--        // currentIndex directly won't work. We need to refresh it
--        // when the first preview is ready to be displayed.
--        property bool init: true
--
--        onCurrentIndexChanged: {
--            var row = Math.floor(currentIndex / categoryDelegate.columns);
--            if (categoryDelegate.collapsedRowCount <= row) {
--                categoryView.expandedCategoryId = categoryId
--            }
--
--            if (open) {
--                categoryDelegate.highlightIndex = currentIndex
--            }
--
--            if (!init && model !== undefined) {
--                var item = model.get(currentIndex)
--                scopeView.scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
--            }
--
--            // Adjust contentY in case we need to change to it to show the next row
--            if (categoryDelegate.rows > 1) {
--                var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
--
--                // Find new contentY and effect.postionPx
--                var newContentY = itemY - effect.positionPx - categoryDelegate.verticalSpacing;
--
--                // Make sure the item is not covered by a header. Move the effect split down if necessary
--                var headerHeight = pageHeader.height + categoryView.stickyHeaderHeight;
--                var effectAdjust = Math.max(effect.positionPx, headerHeight);
--
--                // Make sure we don't overscroll the listview. If yes, adjust effect position
--                if (newContentY < 0) {
--                    effectAdjust += newContentY;
--                    newContentY = 0;
--                }
--                if (newContentY > Math.max(0, categoryView.contentHeight - categoryView.height)) {
--                    effectAdjust += -(categoryView.contentHeight - categoryView.height) + newContentY
--                    newContentY = categoryView.contentHeight - categoryView.height;
--                }
--
--                effect.positionPx = effectAdjust;
--                categoryView.contentY = newContentY;
--            }
--        }
--
--        property bool open: false
--        property bool onScreen: false
--
--        onOpenChanged: {
--            if (open) {
--                onScreen = true;
--                categoryDelegate.highlightIndex = currentIndex;
--                pageHeader.unfocus();
--            } else {
--                // Cancel any pending preview requests or actions
--                if (previewListView.currentItem.previewData !== undefined) {
--                    previewListView.currentItem.previewData.cancelAction();
--                }
--                scopeView.scope.cancelActivation();
--                model = undefined;
--                categoryView.correctExpandedCategory();
--                categoryDelegate.highlightIndex = -1;
--            }
--        }
--
--        Rectangle {
--            anchors.fill: parent
--            color: Qt.rgba(0, 0, 0, .3)
--            z: -1
--        }
--
--        delegate: Loader {
--            id: previewLoader
--            objectName: "previewLoader" + index
--            height: previewListView.height
--            width: previewListView.width
--            asynchronous: true
--            source: previewListView.onScreen ?
--                         (previewData !== undefined ? previewDelegateMapper.map(previewData.rendererName) : "DashPreviewPlaceholder.qml") : ""
--
--            onPreviewDataChanged: {
--                if (previewData !== undefined && source.toString().indexOf("DashPreviewPlaceholder.qml") != -1) {
--                    previewLoader.opacity = 0;
--                }
--            }
--
--            onSourceChanged: {
--                if (previewData !== undefined) {
--                    fadeIn.start()
--                }
--            }
--
--            PropertyAnimation {
--                id: fadeIn
--                target: previewLoader
--                property: "opacity"
--                from: 0.0
--                to: 1.0
--                duration: UbuntuAnimation.BriskDuration
--            }
--
--            property var previewData
--            property bool valid: item !== null
--
--            onLoaded: {
--                if (previewListView.onScreen && previewData !== undefined) {
--                    item.previewData = Qt.binding(function() { return previewData })
--                    item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
--                }
--            }
--
--            Connections {
--                ignoreUnknownSignals: true
--                target: item
--                onClose: {
--                    previewListView.open = false
--                }
--            }
--
--            function closePreviewSpinner() {
--                if (item) {
--                    item.showProcessingAction = false;
--                }
--            }
--        }
--    }
--
--    Image {
--        objectName: "pointerArrow"
--        anchors {
--            top: previewListView.bottom
--            left: parent.left
--            leftMargin: previewListView.categoryDelegate !== undefined && previewListView.categoryDelegate.currentItem ?
--                            previewListView.categoryDelegate.currentItem.center + (-width + margins) / 2 : 0
--
--            Behavior on leftMargin {
--                SmoothedAnimation {
--                    duration: UbuntuAnimation.FastDuration
--                }
--            }
--        }
--        height: units.gu(1)
--        width: units.gu(2)
--        property int margins: previewListView.categoryDelegate ? previewListView.categoryDelegate.margins : 0
--        opacity: previewListView.open ? .5 : 0
--
--        source: "graphics/tooltip_arrow.png"
--    }
--
      // TODO: Move as InverseMouseArea to DashPreview
      MouseArea {
          objectName: "closePreviewMouseArea"
          enabled: previewListView.onScreen
          anchors {
              fill: parent
--            topMargin: effect.bottomGapPx
++            topMargin: openEffect.bottomGapPx
+         }
          onClicked: {
              previewListView.open = false;
 === added file 'qml/Dash/PreviewListView.qml'
 --- qml/Dash/PreviewListView.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/PreviewListView.qml	2014-01-07 17:09:31 +0000
@@ -0,0 +1,212 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Unity 0.1
++import "../Components"
++
++Item {
++    property OpenEffect openEffect: null
++    property ScopeListView categoryView: null
++    property Scope scope: null
++
++    property alias open: previewListView.open
++    property alias onScreen: previewListView.onScreen
++    property alias categoryId: previewListView.categoryId
++    property alias categoryDelegate: previewListView.categoryDelegate
++    property alias init: previewListView.init
++    property alias model: previewListView.model
++    property alias currentIndex: previewListView.currentIndex
++    property alias currentItem: previewListView.currentItem
++
++    Image {
++        objectName: "pointerArrow"
++        anchors {
++            top: previewListView.bottom
++            left: parent.left
++            leftMargin: previewListView.categoryDelegate !== undefined && previewListView.categoryDelegate.currentItem ?
++                            previewListView.categoryDelegate.currentItem.center + (-width + margins) / 2 : 0
++
++            Behavior on leftMargin {
++                SmoothedAnimation {
++                    duration: UbuntuAnimation.FastDuration
++                }
++            }
++        }
++        height: units.gu(1)
++        width: units.gu(2)
++        property int margins: previewListView.categoryDelegate ? previewListView.categoryDelegate.margins : 0
++        opacity: previewListView.open ? .5 : 0
++
++        source: "graphics/tooltip_arrow.png"
++    }
++
++    ListView  {
++        id: previewListView
++        objectName: "previewListView"
++        height: openEffect.bottomGapPx - openEffect.topGapPx
++        anchors {
++            top: parent.top
++            topMargin: openEffect.topGapPx
++            left: parent.left
++            right: parent.right
++        }
++        orientation: ListView.Horizontal
++        highlightRangeMode: ListView.StrictlyEnforceRange
++        snapMode: ListView.SnapOneItem
++        boundsBehavior: Flickable.DragAndOvershootBounds
++        highlightMoveDuration: 250
++        flickDeceleration: units.gu(625)
++        maximumFlickVelocity: width * 5
++        cacheBuffer: 0
++
++        // To be set before opening the preview
++        property string categoryId: ""
++        property var categoryDelegate
++
++        // because the ListView is built asynchronous, setting the
++        // currentIndex directly won't work. We need to refresh it
++        // when the first preview is ready to be displayed.
++        property bool init: true
++
++        PreviewDelegateMapper {
++            id: previewDelegateMapper
++        }
++
++        onCurrentIndexChanged: {
++            var row = Math.floor(currentIndex / categoryDelegate.columns);
++            if (categoryDelegate.collapsedRowCount <= row) {
++                categoryView.expandedCategoryId = categoryId
++            }
++
++            if (open) {
++                categoryDelegate.highlightIndex = currentIndex
++            }
++
++            if (!init && model !== undefined) {
++                var item = model.get(currentIndex)
++                scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
++            }
++
++            // Adjust contentY in case we need to change to it to show the next row
++            if (categoryDelegate.rows > 1) {
++                var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
++
++                // Find new contentY and effect.postionPx
++                var newContentY = itemY - openEffect.positionPx - categoryDelegate.verticalSpacing;
++
++                // Make sure the item is not covered by a header. Move the effect split down if necessary
++                var headerHeight = pageHeader.height + categoryView.stickyHeaderHeight;
++                var effectAdjust = Math.max(openEffect.positionPx, headerHeight);
++
++                // Make sure we don't overscroll the listview. If yes, adjust effect position
++                if (newContentY < 0) {
++                    effectAdjust += newContentY;
++                    newContentY = 0;
++                }
++                if (newContentY > Math.max(0, categoryView.contentHeight - categoryView.height)) {
++                    effectAdjust += -(categoryView.contentHeight - categoryView.height) + newContentY
++                    newContentY = categoryView.contentHeight - categoryView.height;
++                }
++
++                openEffect.positionPx = effectAdjust;
++                categoryView.contentY = newContentY;
++            }
++        }
++
++        property bool open: false
++        property bool onScreen: false
++
++        onOpenChanged: {
++            if (open) {
++                onScreen = true;
++                categoryDelegate.highlightIndex = currentIndex;
++                pageHeader.unfocus();
++            } else {
++                // Cancel any pending preview requests or actions
++                if (previewListView.currentItem.previewData !== undefined) {
++                    previewListView.currentItem.previewData.cancelAction();
++                }
++                scope.cancelActivation();
++                model = undefined;
++                categoryView.correctExpandedCategory();
++                categoryDelegate.highlightIndex = -1;
++            }
++        }
++
++        Rectangle {
++            anchors.fill: parent
++            color: Qt.rgba(0, 0, 0, .3)
++            z: -1
++        }
++
++        delegate: Loader {
++            id: previewLoader
++            objectName: "previewLoader" + index
++            height: previewListView.height
++            width: previewListView.width
++            asynchronous: true
++            source: previewListView.onScreen ?
++                            (previewData !== undefined ? previewDelegateMapper.map(previewData.rendererName) : "DashPreviewPlaceholder.qml") : ""
++
++            onPreviewDataChanged: {
++                if (previewData !== undefined && source.toString().indexOf("DashPreviewPlaceholder.qml") != -1) {
++                    previewLoader.opacity = 0;
++                }
++            }
++
++            onSourceChanged: {
++                if (previewData !== undefined) {
++                    fadeIn.start()
++                }
++            }
++
++            PropertyAnimation {
++                id: fadeIn
++                target: previewLoader
++                property: "opacity"
++                from: 0.0
++                to: 1.0
++                duration: UbuntuAnimation.BriskDuration
++            }
++
++            property var previewData
++            property bool valid: item !== null
++
++            onLoaded: {
++                if (previewListView.onScreen && previewData !== undefined) {
++                    item.previewData = Qt.binding(function() { return previewData })
++                    item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
++                }
++            }
++
++            Connections {
++                ignoreUnknownSignals: true
++                target: item
++                onClose: {
++                    previewListView.open = false
++                }
++            }
++
++            function closePreviewSpinner() {
++                if (item) {
++                    item.showProcessingAction = false;
++                }
++            }
++        }
++    }
++}
 === added file 'qml/Dash/graphics/tabbarchevron@27.png'
 Binary files qml/Dash/graphics/tabbarchevron@27.png	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/tabbarchevron@27.png	2014-01-07 17:09:31 +0000 differ
 === modified file 'qml/Hud/HudParametrizedActionsPage.qml'
 --- qml/Hud/HudParametrizedActionsPage.qml	2013-06-05 22:03:08 +0000
 +++ qml/Hud/HudParametrizedActionsPage.qml	2014-01-07 17:09:31 +0000
@@ -89,7 +89,7 @@
              anchors.left: parent.left
              anchors.right: parent.right
--            PageHeader {
++            PageHeaderLabel {
                  id: header
                  anchors.top: parent.top
                  anchors.left: parent.left
 === modified file 'tests/mocks/Unity/fake_scopes.cpp'
 --- tests/mocks/Unity/fake_scopes.cpp	2013-09-02 20:34:05 +0000
 +++ tests/mocks/Unity/fake_scopes.cpp	2014-01-07 17:09:31 +0000
@@ -35,6 +35,7 @@
      m_roles[Scopes::RoleScope] = "scope";
      m_roles[Scopes::RoleId] = "id";
      m_roles[Scopes::RoleVisible] = "visible";
++    m_roles[Scopes::RoleTitle] = "title";
      QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
      QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
@@ -110,6 +111,8 @@
          return QVariant::fromValue(scope->id());
      } else if (role == Scopes::RoleVisible) {
          return QVariant::fromValue(scope->visible());
++    } else if (role == Scopes::RoleTitle) {
++        return QVariant::fromValue(scope->name());
      } else {
          return QVariant();
+     }
 === modified file 'tests/mocks/Unity/fake_scopes.h'
 --- tests/mocks/Unity/fake_scopes.h	2013-06-12 15:03:07 +0000
 +++ tests/mocks/Unity/fake_scopes.h	2014-01-07 17:09:31 +0000
@@ -41,7 +41,8 @@
      enum Roles {
          RoleScope,
          RoleId,
--        RoleVisible
++        RoleVisible,
++        RoleTitle
      };
      Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2013-11-30 11:40:30 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-01-07 17:09:31 +0000
@@ -37,9 +37,8 @@
                                             ${CMAKE_BINARY_DIR}/tests/mocks
                                             ${CMAKE_BINARY_DIR}/plugins)
  add_qml_test(Components Tile)
--add_qml_test(Components PageHeader)
++add_qml_test(Components PageHeaderLabel)
  add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Dash DashBar IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
  add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
  add_qml_test(Dash DashPreview)
  add_qml_test(Dash GenericPreview)
 === renamed file 'tests/qmltests/Components/tst_PageHeader.qml' => 'tests/qmltests/Components/tst_PageHeaderLabel.qml'
 --- tests/qmltests/Components/tst_PageHeader.qml	2013-12-17 16:04:47 +0000
 +++ tests/qmltests/Components/tst_PageHeaderLabel.qml	2014-01-07 17:09:31 +0000
@@ -31,7 +31,7 @@
+     }
      UT.UnityTestCase {
--        name: "PageHeaderTest"
++        name: "PageHeaderLabelTest"
          when: windowShown
          property alias searchEnabled : pageHeader.searchEntryEnabled
@@ -204,7 +204,7 @@
          anchors.fill: parent
          spacing: units.gu(1)
--        PageHeader {
++        PageHeaderLabel {
              id: pageHeader
              anchors {
                  left: parent.left
 === modified file 'tests/qmltests/Dash/qml/FakeScopeView.qml'
 --- tests/qmltests/Dash/qml/FakeScopeView.qml	2013-12-17 16:04:47 +0000
 +++ tests/qmltests/Dash/qml/FakeScopeView.qml	2014-01-07 17:09:31 +0000
@@ -23,6 +23,7 @@
      id: fakeScopeView
      property alias backColor : back.color
++    property var categoryView: null
      onEndReached: {
          if (scope != undefined && shell != undefined && shell.scopeStatus != undefined) {
 === modified file 'tests/qmltests/Dash/tst_Dash.qml'
 --- tests/qmltests/Dash/tst_Dash.qml	2013-12-17 19:15:09 +0000
 +++ tests/qmltests/Dash/tst_Dash.qml	2014-01-07 17:09:31 +0000
@@ -25,8 +25,6 @@
      width: units.gu(40)
      height: units.gu(80)
--    property ListModel searchHistory : ListModel {}
--
      Dash {
          id: dash
          anchors.fill: parent
@@ -83,14 +81,14 @@
              // wait for scopes to load
              tryCompare(scopes, "loaded", true);
--            var dashbar = findChild(dash, "dashbar");
--            verify(dashbar != undefined)
++            var tabbar = findChild(dash, "tabbar");
++            verify(tabbar != undefined)
              var dashContent = findChild(dash, "dashContent");
              var current_index = dashContent.currentIndex;
              dash.setCurrentScope(data.tag, true /* animate */, false /* reset */);
              compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
--            compare(dashbar.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
++            compare(tabbar.selectedIndex, data.shouldBeVisible ? data.visualIndex : current_index);
+         }
          function test_show_scope_on_load_data() {
@@ -127,12 +125,12 @@
              // wait for scopes to load
              tryCompare(scopes, "loaded", true);
--            var dashbar = findChild(dash, "dashbar");
--            verify(dashbar != undefined)
++            var tabbar = findChild(dash, "tabbar");
++            verify(tabbar != undefined)
              var dashContent = findChild(dash, "dashContent");
              var current_index = dashContent.currentIndex;
--            dashbar.itemSelected(data.visualIndex);
++            tabbar.selectedIndex = data.visualIndex;
              compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
+         }
+     }
 === removed file 'tests/qmltests/Dash/tst_DashBar.qml'
 --- tests/qmltests/Dash/tst_DashBar.qml	2013-12-17 16:04:47 +0000
 +++ tests/qmltests/Dash/tst_DashBar.qml	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
--/*
-- * Copyright 2013 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.0
--import QtTest 1.0
--import Unity 0.1
--import ".."
--import "../../../qml/Dash"
--import Ubuntu.Components 0.1
--import Unity.Test 0.1 as UT
--
--Item {
--    width: units.gu(40)
--    height: units.gu(71)
--
--    DashBar {
--        id: dashBar
--
--        anchors {
--            left: parent.left
--            right: parent.right
--            bottom: parent.bottom
--        }
--        model: scopes
--        onItemSelected: currentIndex = index
--    }
--
--    Scopes {
--        id: scopes
--    }
--
--    SignalSpy {
--        id: signalSpy
--        signalName: "itemSelected"
--        target: dashBar
--    }
--
--    UT.UnityTestCase {
--        name: "DashBar"
--        when: scopes.loaded
--
--        property alias model: dashBar.model
--        property alias currentIndex: dashBar.currentIndex
--
--        readonly property alias lineHeight: dashBar.lineHeight
--        readonly property alias itemSize: dashBar.itemSize
--        readonly property alias iconSize: dashBar.iconSize
--        readonly property var panel: findChild(dashBar, "panel");
--
--        function initTestCase() {
--            currentIndex = 2
--        }
--
--        function waitForAnimationToEnd() {
--            compare(panel.animating, true) // check the animation started
--            tryCompare(panel, "animating", false) // wait till the animation ends
--        }
--
--        function closePanel() {
--            dashBar.finishNavigation()
--            waitForAnimationToEnd()
--            tryCompare(panel, "opened", false)
--        }
--
--        function openPanel() {
--            dashBar.startNavigation()
--            waitForAnimationToEnd()
--            tryCompare(panel, "opened", true)
--        }
--
--        function test_navigationAndHide() {
--            openPanel()
--            closePanel()
--        }
--
--        function test_itemSelected() {
--            openPanel()
--
--            var row = findChild(dashBar, "row");
--            tryCompareFunction(function(){return row.width > 0;}, true);
--            for (var i = 0; i < model.rowCount(); i++) {
--                // coordinate x in the middle of item with index 'i'
--                var x = row.x + (row.width / model.rowCount()) * i + itemSize / 2
--
--                // FIXME workaround for a bug in SignalSpy
--                signalSpy.clear()
--
--                // (item, x, y, button, modifiers, delay)
--                mouseClick(panel, x, row.height / 2, Qt.LeftButton, Qt.NoModifier, 0)
--                compare(signalSpy.count > 0, true, "signal itemSelected not triggered")
--                compare(signalSpy.signalArguments[0][0], i, "signal itemSelected emitted unexpected index");
--                tryCompare(dashBar, "currentIndex", i);
--            }
--
--            closePanel()
--        }
--    }
--}
 === modified file 'tests/qmltests/Dash/tst_DashContent.qml'
 --- tests/qmltests/Dash/tst_DashContent.qml	2013-12-17 19:15:09 +0000
 +++ tests/qmltests/Dash/tst_DashContent.qml	2014-01-07 17:09:31 +0000
@@ -17,9 +17,11 @@
  import QtQuick 2.0
  import QtTest 1.0
  import "../../../qml/Dash"
++import "../../../qml/Components"
  import Ubuntu.Components 0.1
  import Unity 0.1
  import Unity.Test 0.1 as UT
++import Utils 0.1
  Item {
      id: shell
@@ -54,11 +56,13 @@
          id: dashContent
          anchors.fill: parent
--        model: scopesModel
++        model: SortFilterProxyModel {
++            model: scopesModel
++        }
          scopes : scopesModel
          scopeMapper : scopeDelegateMapper
--        searchHistory: ListModel {}
++        searchHistory: SearchHistoryModel {}
+     }
      ScopeDelegateMapper {
@@ -109,9 +113,10 @@
      UT.UnityTestCase {
          name: "DashContent"
--        when: windowShown
++        when: scopesModel.loaded
          function init() {
++            scopesModel.clear();
              scopesModel.load();
+         }
@@ -268,6 +273,65 @@
              tryCompare(scopesModel.get(2), "isActive", data.active2);
+         }
++        function doFindMusicButton(parent) {
++            for (var i = 0; i < parent.children.length; i++) {
++                var c = parent.children[i];
++                if (UT.Util.isInstanceOf(c, "AbstractButton") && parent.x >= 0) {
++                    for (var ii = 0; ii < c.children.length; ii++) {
++                        var cc = c.children[ii];
++                        if (UT.Util.isInstanceOf(cc, "Label") && cc.text == "Music") {
++                            return c;
++                        }
++                    }
++                }
++                var r = doFindMusicButton(c);
++                if (r !== undefined) {
++                    return r;
++                }
++            }
++            return undefined;
++        }
++
++        function findMusicButton() {
++            // We need to find a AbstractButton that has a Label child
++            // with text Music and it's parent x is >= 0
++            var tabbar = findChild(dashContent, "tabbar");
++            return doFindMusicButton(tabbar);
++        }
++
++        function test_tabBar_index_change() {
++            tryCompare(scopesModel, "loaded", true);
++            var tabbar = findChild(dashContent, "tabbar");
++
++            compare(dashContent.currentIndex, 0);
++            tryCompare(tabbar, "selectedIndex", 0);
++            tryCompare(tabbar, "selectionMode", false);
++
++            mouseClick(tabbar, units.gu(5), units.gu(5))
++
++            tryCompare(tabbar, "selectionMode", true);
++            tryCompare(tabbar, "selectedIndex", 0);
++            tryCompare(dashContent, "currentIndex", 0);
++
++            var button;
++            tryCompareFunction(function() { button = findMusicButton(); return button != undefined; }, true);
++            waitForRendering(button);
++
++            mouseClick(button, button.width / 2, button.height / 2)
++
++            tryCompare(tabbar, "selectionMode", false);
++            tryCompare(tabbar, "selectedIndex", 1);
++            tryCompare(dashContent, "currentIndex", 1);
++        }
++
++        function test_tabBar_listens_to_index_change() {
++            var tabbar = findChild(dashContent, "tabbar");
++            tryCompare(dashContent, "currentIndex", 0);
++            compare(tabbar.selectedIndex, 0);
++            dashContent.currentIndex = 1;
++            compare(tabbar.selectedIndex, 1);
++        }
++
          function checkFlickMovingAndNotInteractive()
+         {
              var dashContentList = findChild(dashContent, "dashContentList");
@@ -282,7 +346,6 @@
              return dashContentList.currentItem.moving && !dashContentList.interactive;
+         }
--
          function test_hswipe_disabled_vswipe() {
              var dashContentList = findChild(dashContent, "dashContentList");
 === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
 --- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-01-07 09:27:20 +0000
 +++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-01-07 17:09:31 +0000
@@ -41,54 +41,83 @@
          signal mainStageFocusedApplicationChanged()
+     }
++    PreviewListView {
++        id: previewListView
++        anchors.fill: parent
++        openEffect: openEffect
++        categoryView: genericScopeView.categoryView
++        scope: genericScopeView.scope
++    }
++
++    DashContentOpenEffect {
++        id: openEffect
++        previewListView: previewListView
++    }
++
++    PageHeaderLabel {
++        id: pageHeader
++        searchHistory: SearchHistoryModel {}
++    }
++
      GenericScopeView {
          id: genericScopeView
          anchors.fill: parent
--        searchHistory: SearchHistoryModel {}
++        previewListView: previewListView
++        openEffect: openEffect
++        pageHeader: pageHeader
++        tabBarHeight: pageHeader.implicitHeight
          UT.UnityTestCase {
              name: "GenericScopeView"
              when: scopes.loaded
--            function test_isCurrent() {
--                var pageHeader = findChild(genericScopeView, "pageHeader");
--                var previewListView = findChild(genericScopeView, "previewListView");
++             function test_isCurrent() {
                  genericScopeView.isCurrent = true
                  pageHeader.searchQuery = "test"
                  previewListView.open = true
                  genericScopeView.isCurrent = false
                  tryCompare(pageHeader, "searchQuery", "")
--                tryCompare(genericScopeView, "previewShown", false);
++                tryCompare(previewListView, "open", false);
+             }
              function test_showDash() {
--                var previewListView = findChild(genericScopeView, "previewListView");
                  previewListView.open = true;
++                tryCompare(openEffect, "live", true);
                  scopes.get(0).showDash();
--                tryCompare(genericScopeView, "previewShown", false);
++                tryCompare(previewListView, "open", false);
++                tryCompare(openEffect, "live", true);
+             }
              function test_hideDash() {
--                var previewListView = findChild(genericScopeView, "previewListView");
                  previewListView.open = true;
                  scopes.get(0).hideDash();
--                tryCompare(genericScopeView, "previewShown", false);
++                tryCompare(previewListView, "open", false);
+             }
              function openPreview() {
                  var categoryListView = findChild(genericScopeView, "categoryListView");
                  categoryListView.positionAtBeginning();
++                tryCompareFunction(function() {
++                                       var tile = findChild(findChild(genericScopeView, "0"), "delegate0");
++                                       return tile != undefined;
++                                   },
++                                   true);
                  var tile = findChild(findChild(genericScopeView, "0"), "delegate0");
                  mouseClick(tile, tile.width / 2, tile.height / 2);
--                var openEffect = findChild(genericScopeView, "openEffect");
++                tryCompare(previewListView, "open", true);
                  tryCompare(openEffect, "gap", 1);
+             }
              function checkArrowPosition(index) {
++                tryCompareFunction(function() {
++                                       var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);
++                                       return tile != undefined;
++                                   },
++                                   true);
                  var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);
                  var tileCenter = tile.x + tile.width/2;
--                var pointerArrow = findChild(genericScopeView, "pointerArrow");
++                var pointerArrow = findChild(previewListView, "pointerArrow");
                  var pointerArrowCenter = pointerArrow.x + pointerArrow.width/2;
                  compare(pointerArrowCenter, tileCenter, "Pointer did not move to tile");
+             }
@@ -97,9 +126,7 @@
                  var closePreviewMouseArea = findChild(genericScopeView, "closePreviewMouseArea");
                  mouseClick(closePreviewMouseArea, closePreviewMouseArea.width / 2, closePreviewMouseArea.height / 2);
--                var previewListView = findChild(genericScopeView, "previewListView");
                  tryCompare(previewListView, "open", false);
--                var openEffect = findChild(genericScopeView, "openEffect");
                  tryCompare(openEffect, "gap", 0);
                  var categoryListView = findChild(genericScopeView, "categoryListView");
@@ -108,13 +135,12 @@
+             }
              function test_previewOpenClose() {
--                var previewListView = findChild(genericScopeView, "previewListView");
                  tryCompare(previewListView, "open", false);
                  openPreview();
                  // check for it opening successfully
--                var currentPreviewItem = findChild(genericScopeView, "previewLoader0");
++                var currentPreviewItem = findChild(previewListView, "previewLoader0");
                  tryCompareFunction(function() {
                                         var parts = currentPreviewItem.source.toString().split("/");
                                         var name = parts[parts.length - 1];
@@ -138,26 +164,23 @@
                  var categoryListView = findChild(genericScopeView, "categoryListView");
                  categoryListView.positionAtBeginning();
                  waitForRendering(categoryListView);
--                categoryListView.flick(0, -units.gu(80));
++                categoryListView.flick(0, -units.gu(60));
                  tryCompare(categoryListView.flicking, false);
                  var tile = findChild(findChild(genericScopeView, "0"), "delegate0");
                  mouseClick(tile, tile.width / 2, tile.height - 1);
--                var openEffect = findChild(genericScopeView, "openEffect");
                  tryCompare(openEffect, "gap", 1);
--                var pageHeader = findChild(genericScopeView, "pageHeader");
                  verify(openEffect.positionPx >= pageHeader.height + categoryListView.stickyHeaderHeight);
+             }
              function test_previewCycle() {
--                var previewListView = findChild(genericScopeView, "previewListView");
                  tryCompare(previewListView, "open", false);
                  openPreview();
                  // wait for it to be loaded
--                var currentPreviewItem = findChild(genericScopeView, "previewLoader0");
++                var currentPreviewItem = findChild(previewListView, "previewLoader0");
                  tryCompareFunction(function() {
                                         var parts = currentPreviewItem.source.toString().split("/");
                                         var name = parts[parts.length - 1];
@@ -179,7 +202,7 @@
                                                  previewListView.height / 2);
                      // wait for it to be loaded
--                    var nextPreviewItem = findChild(genericScopeView, "previewLoader" + i);
++                    var nextPreviewItem = findChild(previewListView, "previewLoader" + i);
                      tryCompareFunction(function() {
                                             var parts = nextPreviewItem.source.toString().split("/");
                                             var name = parts[parts.length - 1];
@@ -206,11 +229,12 @@
              function test_show_spinner() {
                  openPreview();
--                var previewListView = findChild(genericScopeView, "previewListView");
--                var previewLoader = findChild(genericScopeView, "previewLoader0");
++                var previewLoader = findChild(previewListView, "previewLoader0");
++                tryCompare(previewLoader, "progress", 1.0);
++                tryCompareFunction(function() { return previewLoader.item != undefined; }, true);
                  previewLoader.item.showProcessingAction = true;
--                var waitingForAction = findChild(genericScopeView, "waitingForActionMouseArea");
++                var waitingForAction = findChild(previewListView, "waitingForActionMouseArea");
                  tryCompare(waitingForAction, "enabled", true);
                  previewLoader.closePreviewSpinner();
                  tryCompare(waitingForAction, "enabled", false);
@@ -252,12 +276,10 @@
                  tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != undefined; }, true);
                  var tile = findChild(genericScopeView, "carouselDelegate");
                  mouseClick(tile, tile.width / 2, tile.height / 2);
--                var openEffect = findChild(genericScopeView, "openEffect");
                  tryCompare(openEffect, "gap", 1);
                  // check for it opening successfully
--                var previewListView = findChild(genericScopeView, "previewListView");
--                var currentPreviewItem = findChild(genericScopeView, "previewLoader0");
++                var currentPreviewItem = findChild(previewListView, "previewLoader0");
                  tryCompareFunction(function() {
                                         var parts = currentPreviewItem.source.toString().split("/");
                                         var name = parts[parts.length - 1];
@@ -303,7 +325,6 @@
                  tryCompareFunction(
                      function() {
                          var header0 = findChild(genericScopeView, "dashSectionHeader0")
--                        var pageHeader = findChild(genericScopeView, "pageHeader");
                          return header0.y == pageHeader.height;
                      },
                      true);