Unity 8

Merge lp:~unity-team/unity8/new-scopes-cleanup into lp:unity8

new-scopes-cleanup
Merge into trunk

Proposed by Michał Sawicz on 2014-03-06

Status:	Merged
Merge reported by:	Michał Sawicz
Merged at revision:	not available
Proposed branch:	lp:~unity-team/unity8/new-scopes-cleanup
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/new-scopes-clean-to-trunk
Diff against target:	7715 lines (+1067/-5236) 91 files modified data/unity8.conf (+4/-0) plugins/DashViews/listviewwithpageheader.cpp (+7/-7) qml/Components/OpenEffect.qml (+0/-138) qml/Components/PageHeader.qml (+1/-0) qml/Components/RatingStars.qml (+0/-41) qml/Components/Tile.qml (+0/-39) qml/Components/TileStyle.qml (+0/-81) qml/Dash/Apps/AppPreview.qml (+0/-167) qml/Dash/Apps/DashPluginFilterGrid.qml (+0/-47) qml/Dash/Apps/FrequentlyUsedAppsModel.qml (+0/-110) qml/Dash/Card.qml (+1/-0) qml/Dash/CardCarousel.qml (+1/-2) qml/Dash/CardFilterGrid.qml (+52/-25) qml/Dash/CardTool.qml (+1/-1) qml/Dash/DashCarousel.qml (+0/-47) qml/Dash/DashContent.qml (+26/-23) qml/Dash/DashFilterGrid.qml (+0/-65) qml/Dash/DashHome.qml (+0/-39) qml/Dash/DashPreview.qml (+0/-208) qml/Dash/DashPreviewPlaceholder.qml (+0/-25) qml/Dash/DashRenderer.qml (+1/-4) qml/Dash/Generic/FlatTileStyle.qml (+0/-79) qml/Dash/Generic/GenericCarousel.qml (+0/-53) qml/Dash/Generic/GenericFilterGrid.qml (+0/-46) qml/Dash/Generic/GenericFilterGridPotrait.qml (+0/-28) qml/Dash/Generic/GenericPreview.qml (+0/-197) qml/Dash/Generic/WeatherFilterGrid.qml (+0/-47) qml/Dash/GenericScopeView.qml (+3/-8) qml/Dash/Movie/MoviePreview.qml (+0/-71) qml/Dash/Music/CarouselDelegateMusic.qml (+0/-42) qml/Dash/Music/MusicCarousel.qml (+0/-34) qml/Dash/Music/MusicFilterGrid.qml (+0/-48) qml/Dash/Music/MusicPreview.qml (+0/-203) qml/Dash/Music/MusicTileStyle.qml (+0/-102) qml/Dash/PreviewDelegateMapper.qml (+0/-38) qml/Dash/PreviewListView.qml (+4/-2) qml/Dash/Previews/Header.qml (+0/-109) qml/Dash/Previews/Reviews.qml (+0/-194) qml/Dash/ScopeDelegateMapper.qml (+1/-3) qml/Dash/SearchableResultModel.qml (+0/-44) qml/Dash/Video/CarouselDelegateVideo.qml (+0/-42) qml/Dash/Video/VideoCarousel.qml (+0/-34) qml/Dash/Video/VideoFilterGrid.qml (+0/-47) qml/Dash/Video/VideoTileStyle.qml (+0/-87) tests/autopilot/unity8/shell/emulators/dash.py (+23/-52) tests/autopilot/unity8/shell/emulators/main_window.py (+0/-4) tests/autopilot/unity8/shell/tests/__init__.py (+1/-1) tests/autopilot/unity8/shell/tests/test_emulators.py (+26/-52) tests/autopilot/unity8/shell/tests/test_greeter.py (+0/-38) tests/mocks/Unity/CMakeLists.txt (+4/-4) tests/mocks/Unity/categoryresults.cpp (+0/-121) tests/mocks/Unity/categoryresults.h (+0/-68) tests/mocks/Unity/fake_applications_scope.cpp (+0/-76) tests/mocks/Unity/fake_applications_scope.h (+0/-33) tests/mocks/Unity/fake_categories.cpp (+127/-212) tests/mocks/Unity/fake_categories.h (+28/-32) tests/mocks/Unity/fake_preview.cpp (+0/-73) tests/mocks/Unity/fake_preview.h (+0/-65) tests/mocks/Unity/fake_previewmodel.cpp (+43/-53) tests/mocks/Unity/fake_previewmodel.h (+24/-25) tests/mocks/Unity/fake_previewstack.cpp (+76/-0) tests/mocks/Unity/fake_previewstack.h (+61/-0) tests/mocks/Unity/fake_previewwidgetmodel.cpp (+86/-0) tests/mocks/Unity/fake_previewwidgetmodel.h (+56/-0) tests/mocks/Unity/fake_resultsmodel.cpp (+117/-0) tests/mocks/Unity/fake_resultsmodel.h (+80/-0) tests/mocks/Unity/fake_scope.cpp (+20/-120) tests/mocks/Unity/fake_scope.h (+17/-18) tests/mocks/Unity/fake_scopes.cpp (+1/-5) tests/mocks/Unity/fake_unity_plugin.cpp (+8/-18) tests/qmltests/CMakeLists.txt (+0/-10) tests/qmltests/Components/tst_OpenEffect.qml (+0/-71) tests/qmltests/Components/tst_PageHeaderLabel.qml (+1/-1) tests/qmltests/Components/tst_RatingStars.qml (+0/-62) tests/qmltests/Components/tst_Tile.qml (+0/-71) tests/qmltests/Dash/Apps/tst_AppPreview.qml (+0/-276) tests/qmltests/Dash/Movie/tst_MoviePreview.qml (+0/-86) tests/qmltests/Dash/Music/tst_MusicPreview.qml (+0/-174) tests/qmltests/Dash/Previews/tst_Preview.qml (+3/-17) tests/qmltests/Dash/qml/FakeScopeView.qml (+1/-1) tests/qmltests/Dash/qml/fake_scopeView1.qml (+1/-1) tests/qmltests/Dash/qml/fake_scopeView2.qml (+1/-1) tests/qmltests/Dash/qml/fake_scopeView3.qml (+1/-1) tests/qmltests/Dash/tst_CardTool.qml (+1/-1) tests/qmltests/Dash/tst_Dash.qml (+12/-6) tests/qmltests/Dash/tst_DashContent.qml (+116/-34) tests/qmltests/Dash/tst_DashPreview.qml (+0/-202) tests/qmltests/Dash/tst_FilterGrids.qml (+0/-143) tests/qmltests/Dash/tst_GenericPreview.qml (+0/-125) tests/qmltests/Dash/tst_GenericScopeView.qml (+24/-231) tests/qmltests/tst_Shell.qml (+6/-25)
To merge this branch:	bzr merge lp:~unity-team/unity8/new-scopes-cleanup
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-03-06	Needs Fixing on 2014-03-18
Unity Team		2014-03-06	Pending
Review via email: mp+209642@code.launchpad.net

Commit message

New scopes + removal of unused files + passing tests

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
lp:~unity-team/unity8/new-scopes-clean-to-trunk
lp:~unity-team/unity8/fix-5.2-tests

* Did you perform an exploratory manual test run of your code change and any related functionality?
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?
Yes, the changes are wanted by design

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

FAILED: Continuous integration, rev:712
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/new-scopes-cleanup/+merge/209642/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-11:

FAILED: Continuous integration, rev:724
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/new-scopes-cleanup/+merge/209642/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-11

725. By Michał Sawicz on 2014-03-11: Temporarily force scope-registry to start.
726. By Albert Astals Cid on 2014-03-11: Merge
727. By Albert Astals Cid on 2014-03-11: This should help with the DashContent::test_showPreviewCarousel failure in CI
728. By Albert Astals Cid on 2014-03-11: Merge
729. By Albert Astals Cid on 2014-03-11: Access the proper template variable

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-11:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-11

730. By Albert Astals Cid on 2014-03-11: And need cardTool. here too

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-11:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-11:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-12

731. By Albert Astals Cid on 2014-03-12: The button needs to be non totally transparent before we can click on it
732. By Albert Astals Cid on 2014-03-12: Childrens have moved again

Revision history for this message

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

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

review: Approve (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-13

733. By Michał Sawicz on 2014-03-13

Revert FIXME for starting scope registry.

734. By Albert Astals Cid on 2014-03-13

Click on the correct tile

There's more than one dashCategory1 so make sure we look for the correct one
otherwise we may be clicking on something that is not on screen

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-13:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-14

735. By Michał Sawicz on 2014-03-14: Merge 5.2 fixes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

FAILED: Continuous integration, rev:735
http://jenkins.qa.ubuntu.com/job/unity8-ci/2498/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3924/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3509/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1019
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1023
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1023/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1019
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3425/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3957
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3957/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3511
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3511/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5848/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4788

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-17:

Looks good to me. Nice cleanup.

Waiting for all the prerequisites to get merged so the diff shrinks a bit before doing the final review/approval.

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-17

736. By Albert Astals Cid on 2014-03-17: Merge DashFilterGrid.qml to CardFilterGrid.qml
737. By Albert Astals Cid on 2014-03-17: DashFilterGrid -> CardFilterGrid in the tests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-17

738. By Michał Sawicz on 2014-03-17: Merge new-scopes-clean-to-trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new-scopes-cleanup updated on 2014-03-18

739. By Albert Astals Cid on 2014-03-18

Merge

740. By Albert Astals Cid on 2014-03-18

Turn this into a fuzzy compare too

I had another of those 80 != 80 cases that made the header animate when it should not

741. By Albert Astals Cid on 2014-03-18

And now make it compile ^_^

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-18:

Merged into lp:~unity-team/unity8/new-scopes-clean-to-trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'data/unity8.conf'
 --- data/unity8.conf	2014-03-18 10:57:24 +0000
 +++ data/unity8.conf	2014-03-18 10:57:24 +0000
@@ -1,6 +1,8 @@
  description "Unity Shell v8"
  author "Ricardo Mendoza <ricmm@ubuntu.com>"
++emits scope-ui-starting
++
  start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
  stop on desktop-end
@@ -38,6 +40,8 @@
      if [ -S "$MIR_SERVER_FILE" ]; then
          rm "$MIR_SERVER_FILE"
      fi
++
++    initctl emit scope-ui-starting
  end script
  exec ${BINARY:-unity8} $ARGS
 === modified file 'plugins/DashViews/listviewwithpageheader.cpp'
 --- plugins/DashViews/listviewwithpageheader.cpp	2014-03-18 10:57:24 +0000
 +++ plugins/DashViews/listviewwithpageheader.cpp	2014-03-18 10:57:24 +0000
@@ -376,13 +376,18 @@
+     }
+ }
++static inline bool uFuzzyCompare(qreal r1, qreal r2)
++{
++    return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
++}
++
  void ListViewWithPageHeader::showHeader()
+ {
      if (!m_headerItem)
          return;
--    auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);
--    if (to != contentY()) {
++    const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);
++    if (!uFuzzyCompare(to, contentY())) {
          const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();
          if (headerShownByItsOwn && m_headerItemShownHeight == 0) {
              // We are not clipping since we are just at the top of the viewport
@@ -485,11 +490,6 @@
      polish();
+ }
--static inline bool uFuzzyCompare(qreal r1, qreal r2)
--{
--    return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
--}
--
  void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
+ {
      // Check we are not being taken down and don't paint anything
 === removed file 'qml/Components/OpenEffect.qml'
 --- qml/Components/OpenEffect.qml	2013-07-09 15:24:41 +0000
 +++ qml/Components/OpenEffect.qml	1970-01-01 00:00:00 +0000
@@ -1,138 +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
--
--Item {
--    id: effect
--    property bool enabled: topGapPx != positionPx || bottomGapPx != positionPx
--    property alias live: effectSource.live
--    property Item sourceItem
--    property ShaderEffectSource source: ShaderEffectSource {
--        id: effectSource
--        sourceItem: effect.enabled ? effect.sourceItem : null
--        hideSource: effect.enabled
--        live: false
--        sourceRect: {
--          if (effect.enabled) {
--            Qt.rect(0, -effect.topOverflow, sourceItem.width, sourceItem.height + effect.topOverflow + effect.bottomOverflow)
--          } else {
--            Qt.rect(0, 0, 0, 0)
--          }
--        }
--    }
--
--    onEnabledChanged: if (!live && enabled) scheduleUpdate()
--
--    /*!
--    \qmlproperty real positionPx
--    The y coordinate of where to perform the split.
--
--    \qmlproperty real topGapPx
--    Gap's top edge.
--
--    \qmlproperty real bottomGapPx
--    Gap's bottom edge.
--
--    \qmlproperty real topOverflow
--    How much of the sourceItem should be sourced above its bounds.
--
--    \qmlproperty real bottomOverflow
--    How much of the sourceItem should be sourced below its bounds.
--    */
--
--    property real positionPx: 0
--    property real topGapPx: 0
--    property real bottomGapPx: height
--    property real topOverflow: 0.0
--    property real bottomOverflow: 0.0
--    property real topOpacity: 1.0
--    property real bottomOpacity: 1.0
--
--    property real __roundedPositionPx: Math.round(positionPx)
--
--    function scheduleUpdate() {
--        source.scheduleUpdate();
--    }
--
--    ShaderEffect {
--        id: top
--        visible: effect.enabled
--        opacity: topOpacity
--        property ShaderEffectSource source: effect.source
--        property real positionPx: __roundedPositionPx
--        property real factor: effect.height / height
--
--        clip: true
--
--        anchors {
--            top: parent.top
--            left: parent.left
--            right: parent.right
--            topMargin: -topOverflow - positionPx + topGapPx
--        }
--        height: topOverflow + positionPx
--
--        vertexShader: "
--            uniform highp mat4 qt_Matrix;
--            attribute highp vec4 qt_Vertex;
--            attribute highp vec2 qt_MultiTexCoord0;
--            varying highp vec2 qt_TexCoord0;
--            uniform highp float factor;
--
--            void main() {
--                highp vec4 pos = qt_Vertex;
--                pos.y *= factor;
--                gl_Position = qt_Matrix * pos;
--                qt_TexCoord0 = qt_MultiTexCoord0;
--            }
--        "
--    }
--
--    ShaderEffect {
--        id: bottom
--        visible: effect.enabled
--        opacity: bottomOpacity
--        property ShaderEffectSource source: effect.source
--        property real offset: effect.topOverflow + __roundedPositionPx
--        property real factor: effect.height / height
--
--        clip: true
--
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--        y: topOverflow + bottomGapPx
--        height: sourceItem.height - positionPx + bottomOverflow
--
--        vertexShader: "
--            uniform highp mat4 qt_Matrix;
--            attribute highp vec4 qt_Vertex;
--            attribute highp vec2 qt_MultiTexCoord0;
--            varying highp vec2 qt_TexCoord0;
--            uniform highp float factor;
--            uniform highp float offset;
--
--            void main() {
--                highp vec4 pos = qt_Vertex;
--                pos.y = (pos.y * factor) - offset;
--                gl_Position = qt_Matrix * pos;
--                qt_TexCoord0 = qt_MultiTexCoord0;
--            }
--        "
--    }
--}
 === modified file 'qml/Components/PageHeader.qml'
 --- qml/Components/PageHeader.qml	2014-03-18 10:57:24 +0000
 +++ qml/Components/PageHeader.qml	2014-03-18 10:57:24 +0000
@@ -74,6 +74,7 @@
          AbstractButton {
              id: backButton
++            objectName: root.objectName + "_backButton"
              visible: false
              height: header.height
              y: header.contentY
 === removed file 'qml/Components/RatingStars.qml'
 --- qml/Components/RatingStars.qml	2014-02-14 10:14:55 +0000
 +++ qml/Components/RatingStars.qml	1970-01-01 00:00:00 +0000
@@ -1,41 +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
--
--Row {
--    id: root
--    property int rating
--    property int maximumRating: 5
--    property int starCount: 5
--    height: childrenRect.height
--    width: childrenRect.width
--
--    readonly property int effectiveRating: Math.max(0, Math.min(root.starCount * root.rating / root.maximumRating, root.maximumRating))
--
--    Repeater {
--        model: root.effectiveRating
--        Image {
--            source: "graphics/icon_star_on.png"
--        }
--    }
--    Repeater {
--        model: root.starCount - root.effectiveRating
--        Image {
--            source: "graphics/icon_star_off.png"
--        }
--    }
--}
 === removed file 'qml/Components/Tile.qml'
 --- qml/Components/Tile.qml	2013-10-14 10:43:49 +0000
 +++ qml/Components/Tile.qml	1970-01-01 00:00:00 +0000
@@ -1,39 +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
--
--AbstractButton {
--    property url source
--    property int fillMode: Image.PreserveAspectCrop
--    property int horizontalAlignment: Text.AlignHCenter
--    property string text
--    property int imageWidth
--    property int imageHeight
--    property int maximumLineCount: 1
--
--    readonly property int center: (index % GridView.view.columns * width) + (width / 2)
--
--    opacity: GridView.view.highlightIndex === -1 ? 1 :
--                GridView.view.highlightIndex === index ? 0.6 : 0.2
--
--    Behavior on opacity {
--        UbuntuNumberAnimation {}
--    }
--
--    style: TileStyle {}
--}
 === removed file 'qml/Components/TileStyle.qml'
 --- qml/Components/TileStyle.qml	2013-10-10 10:20:36 +0000
 +++ qml/Components/TileStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,81 +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
--
--Item {
--    id: tile
--
--    anchors.fill: parent
--
--    UbuntuShape {
--        id: icon
--        anchors {
--            top: parent.top
--            horizontalCenter: parent.horizontalCenter
--        }
--        radius: "medium"
--        width: styledItem.imageWidth
--        height: styledItem.imageHeight
--        image: Image {
--            id: image
--            objectName: "image"
--            sourceSize { width: icon.width; height: icon.height }
--            asynchronous: true
--            cache: false
--            source: styledItem.source
--            fillMode: styledItem.fillMode
--            horizontalAlignment: Image.AlignHCenter
--            verticalAlignment: Image.AlignVCenter
--        }
--    }
--
--    UbuntuShape {
--        id: borderPressed
--        objectName: "borderPressed"
--
--        anchors.fill: icon
--        radius: "medium"
--        borderSource: "radius_pressed.sci"
--        opacity: styledItem.pressed ? 1.0 : 0.0
--        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
--    }
--
--    Label {
--        id: label
--        objectName: "label"
--        anchors {
--            baseline: icon.bottom
--            baselineOffset: units.gu(2)
--            left: parent.left
--            right: parent.right
--            leftMargin: units.gu(1)
--            rightMargin: units.gu(1)
--        }
--
--        color: Theme.palette.selected.backgroundText
--        opacity: 0.9
--        style: Text.Raised
--        styleColor: "black"
--        fontSize: "small"
--        elide: Text.ElideMiddle
--        horizontalAlignment: styledItem.horizontalAlignment
--        text: styledItem.text
--        wrapMode: Text.Wrap
--        maximumLineCount: styledItem.maximumLineCount
--    }
--}
 === removed file 'qml/Dash/Apps/AppPreview.qml'
 --- qml/Dash/Apps/AppPreview.qml	2014-01-15 06:32:25 +0000
 +++ qml/Dash/Apps/AppPreview.qml	1970-01-01 00:00:00 +0000
@@ -1,167 +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 Ubuntu.Components.ListItems 0.1 as ListItems
--import ".."
--import "../Generic"
--import "../Previews"
--import "../../Components"
--
--GenericPreview {
--    id: root
--
--    signal sendUserReview(string review)
--
--    previewImages: previewImagesComponent
--    description: descriptionComponent
--    header: headerComponent
--
--    // TODO: Ratings are not yet complete... enable this once they work
--    //ratings: ratingsComponent
--
--    Component {
--        id: previewImagesComponent
--        ListView {
--            id: previewImageListView
--            spacing: units.gu(1)
--            orientation: ListView.Horizontal
--            height: units.gu(22)
--            model: previewData.infoMap["more-screenshots"] != null ? previewData.infoMap["more-screenshots"].value : [previewData.image]
--            cacheBuffer: width * 3
--
--            // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)
--            // we finally reached the point where this ListView doesn't correctly get swipe input any more but
--            // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking
--            // layer to make sure this ListView can be swiped, regardless of what's behind it.
--            MouseArea {
--                anchors.fill: parent
--                enabled: parent.contentWidth > parent.width
--            }
--
--            LazyImage {
--                objectName: "placeholderScreenshot"
--                anchors {
--                    top: parent.top
--                    bottom: parent.bottom
--                }
--                scaleTo: "height"
--                source: "broken_image"
--                initialWidth: units.gu(13)
--                visible: previewImageListView.count == 0
--            }
--
--            delegate: LazyImage {
--                id: shape
--                anchors {
--                    top: parent.top
--                    bottom: parent.bottom
--                }
--                source: modelData ? modelData : ""
--                scaleTo: "height"
--                initialWidth: units.gu(13)
--            }
--        }
--    }
--
--    Component {
--        id: headerComponent
--        Header {
--            objectName: "previewHeader"
--            title: previewData.title
--            icon: previewData.appIcon
--            subtitle: root.previewData.infoMap["publisher"] ? root.previewData.infoMap["publisher"].value : ""
--            rating: Math.round(root.previewData.rating * 10)
--            reviews: root.previewData.numRatings
--            rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0
--        }
--    }
--
--    Component {
--        id: descriptionComponent
--        Column {
--            spacing: units.gu(1)
--
--            Label {
--                objectName: "descriptionLabel"
--                anchors { left: parent.left; right: parent.right }
--                text: root.previewData.description
--                fontSize: "medium"
--                color: Theme.palette.selected.backgroundText
--                opacity: .6
--                wrapMode: Text.WordWrap
--                style: Text.Raised
--                styleColor: "black"
--            }
--        }
--    }
--
--    Component {
--        id: ratingsComponent
--        Column {
--            id: columnReviewRating
--            objectName: "columnReviewRating"
--            visible: root.previewData.rating >= 0
--
--            spacing: units.gu(1)
--            height: childrenRect.height
--
--            ListItems.ThinDivider { }
--
--            Item {
--                anchors { left: parent.left; right: parent.right }
--                height: rateLabel.height
--
--                Label {
--                    id: rateLabel
--                    fontSize: "medium"
--                    color: "white"
--                    style: Text.Raised
--                    styleColor: "black"
--                    opacity: .9
--                    text: i18n.tr("Rate this")
--
--                    anchors.left: parent.left
--                    anchors.verticalCenter: parent.verticalCenter
--                }
--
--                // FIXME these need to be made interactive and connected to the scope
--                RatingStars {
--                    anchors.right: parent.right
--                    anchors.verticalCenter: parent.verticalCenter
--                }
--            }
--
--            ListItems.ThinDivider { }
--
--            Reviews {
--                id: appReviews
--                objectName: "appReviews"
--
--                anchors { left: parent.left; right: parent.right }
--
--                model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined
--
--                onSendReview: root.sendUserReview(review);
--
--                onEditing: {
--                    root.ensureVisible(appReviews.textArea);
--                }
--            }
--        }
--    }
--}
 === removed file 'qml/Dash/Apps/DashPluginFilterGrid.qml'
 --- qml/Dash/Apps/DashPluginFilterGrid.qml	2013-11-11 11:44:39 +0000
 +++ qml/Dash/Apps/DashPluginFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +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 "../../Components"
--import "../Generic"
--
--GenericFilterGrid {
--    id: filtergrid
--
--    delegate: Tile {
--        id: tile
--        objectName: "delegate" + index
--        width: filtergrid.cellWidth
--        height: filtergrid.cellHeight
--        text: model.title
--        imageWidth: filtergrid.iconWidth
--        imageHeight: filtergrid.iconHeight
--        source: model.icon
--
--        style: FlatTileStyle {
--            disabled: model.rendererHints['scope_disabled'] === 1;
--        }
--
--        onClicked: {
--            filtergrid.clicked(index, tile.y)
--        }
--
--        onPressAndHold: {
--            filtergrid.pressAndHold(index, tile.y)
--        }
--    }
--}
 === removed file 'qml/Dash/Apps/FrequentlyUsedAppsModel.qml'
 --- qml/Dash/Apps/FrequentlyUsedAppsModel.qml	2014-02-24 20:56:03 +0000
 +++ qml/Dash/Apps/FrequentlyUsedAppsModel.qml	1970-01-01 00:00:00 +0000
@@ -1,110 +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
--
--ListModel {
--    ListElement {
--        uri: "application://dialer-app.desktop"
--        icon: "../../graphics/applicationIcons/phone-app.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Dialer"
--        comment: ""
--        dndUri: "file:///usr/share/applications/dialer-app.desktop"
--        metadata: "subscope:applications.scope/applications-non-click.scope"
--    }
--    ListElement {
--        uri: "application://messaging-app.desktop"
--        icon: "../../graphics/applicationIcons/messages-app.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Messaging"
--        comment: ""
--        dndUri: "file:///usr/share/applications/messaging-app.desktop"
--        metadata: "subscope:applications.scope/applications-non-click.scope"
--    }
--    ListElement {
--        uri: "application://address-book-app.desktop"
--        icon: "../../graphics/applicationIcons/contacts-app.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Contacts"
--        comment: ""
--        dndUri: "file:///usr/share/applications/address-book-app.desktop"
--        metadata: "subscope:applications.scope/applications-non-click.scope"
--    }
--    ListElement {
--        uri: "appid://com.ubuntu.camera/camera/current-user-version"
--        icon: "../../graphics/applicationIcons/camera.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Camera"
--        comment: ""
--        dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
--        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
--    }
--    ListElement {
--        uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
--        icon: "../../graphics/applicationIcons/gallery.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Gallery"
--        comment: ""
--        dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
--        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
--    }
--    ListElement {
--        uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
--        icon: "../../graphics/applicationIcons/facebook.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Facebook"
--        comment: ""
--        dndUri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
--        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.developer.webapps.webapp-facebook"
--    }
--    ListElement {
--        uri: "application://webbrowser-app.desktop"
--        icon: "../../graphics/applicationIcons/browser.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "Browser"
--        comment: ""
--        dndUri: "file:///usr/share/applications/webbrowser-app.desktop"
--        metadata: "subscope:applications.scope/applications-non-click.scope"
--    }
--    ListElement {
--        uri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"
--        icon: "../../graphics/applicationIcons/gmail.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "GMail"
--        comment: ""
--        dndUri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"
--        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.developer.webapps.webapp-gmail"
--    }
--    ListElement {
--        uri: "application://ubuntu-system-settings.desktop"
--        icon: "../../graphics/applicationIcons/system-settings.png"
--        category: 0
--        mimetype: "application/x-desktop"
--        title: "System Settings"
--        comment: ""
--        dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"
--        metadata: "subscope:applications.scope/applications-non-click.scope"
--    }
--}
 === modified file 'qml/Dash/Card.qml'
 --- qml/Dash/Card.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/Card.qml	2014-03-18 10:57:24 +0000
@@ -26,6 +26,7 @@
      property alias fontScale: header.fontScale
      property alias headerAlignment: header.headerAlignment
      property alias headerHeight: header.height
++    readonly property alias title: header.title
      property bool showHeader: true
 === modified file 'qml/Dash/CardCarousel.qml'
 --- qml/Dash/CardCarousel.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/CardCarousel.qml	2014-03-18 10:57:24 +0000
@@ -42,7 +42,6 @@
          selectedItemScaleFactor: cardTool.carouselSelectedItemScaleFactor
          cacheBuffer: 1404 // 18px * 13gu * 6
          model: cardCarousel.model
--        highlightIndex: cardCarousel.highlightIndex
          onClicked: cardCarousel.clicked(index, itemY)
          onPressAndHold: cardCarousel.pressAndHold(index, itemY)
@@ -52,7 +51,7 @@
          itemComponent: Card {
              id: card
--            objectName: "delegate" + index
++            objectName: "carouselDelegate" + index
              headerHeight: carousel.headerHeight
              cardData: model
              template: cardTool.template
 === modified file 'qml/Dash/CardFilterGrid.qml'
 --- qml/Dash/CardFilterGrid.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/CardFilterGrid.qml	2014-03-18 10:57:24 +0000
@@ -15,35 +15,62 @@
   */
  import QtQuick 2.0
--import Ubuntu.Components 0.1
++import "../Components"
--DashFilterGrid {
++DashRenderer {
      id: genericFilterGrid
--    minimumHorizontalSpacing: units.gu(1)
--    delegateWidth: cardTool.cardWidth
--    delegateHeight: cardTool.cardHeight
++    expandable: filterGrid.expandable
++    collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)
++    collapsedHeight: filterGrid.collapsedHeight
++    columns: filterGrid.columns
++    rows: filter ? collapsedRowCount : uncollapsedRowCount
++    margins: filterGrid.margins
++    uncollapsedHeight: filterGrid.uncollapsedHeight
      verticalSpacing: units.gu(1)
--    collapsedRowCount: Math.min(2, template && template["collapsed-rows"] || 2)
--
--    delegate: Item {
--        width: genericFilterGrid.cellWidth
--        height: genericFilterGrid.cellHeight
--        Card {
--            id: card
--            width: cardTool.cardWidth
--            height: cardTool.cardHeight
--            headerHeight: cardTool.headerHeight
--            anchors.horizontalCenter: parent.horizontalCenter
--            objectName: "delegate" + index
--            cardData: model
--            template: cardTool.template
--            components: cardTool.components
--
--            headerAlignment: cardTool.headerAlignment
--
--            onClicked: genericFilterGrid.clicked(index, card.y)
--            onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
++    currentItem: filterGrid.currentItem
++    height: filterGrid.height
++
++    function startFilterAnimation(filter) {
++        filterGrid.startFilterAnimation(filter)
++    }
++
++    FilterGrid {
++        id: filterGrid
++        width: genericFilterGrid.width
++        minimumHorizontalSpacing: units.gu(1)
++        delegateWidth: cardTool.cardWidth
++        delegateHeight: cardTool.cardHeight
++        verticalSpacing: genericFilterGrid.verticalSpacing
++        model: genericFilterGrid.model
++        filter: genericFilterGrid.filter
++        collapsedRowCount: genericFilterGrid.collapsedRowCount
++        delegateCreationBegin: genericFilterGrid.delegateCreationBegin
++        delegateCreationEnd: genericFilterGrid.delegateCreationEnd
++        delegate: Item {
++            width: filterGrid.cellWidth
++            height: filterGrid.cellHeight
++            Card {
++                id: card
++                width: cardTool.cardWidth
++                height: cardTool.cardHeight
++                headerHeight: cardTool.headerHeight
++                anchors.horizontalCenter: parent.horizontalCenter
++                objectName: "delegate" + index
++                cardData: model
++                template: cardTool.template
++                components: cardTool.components
++
++                headerAlignment: cardTool.headerAlignment
++
++                onClicked: genericFilterGrid.clicked(index, card.y)
++                onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
++            }
++        }
++
++        onFilterChanged: {
++            genericFilterGrid.filter = filter
++            filter = Qt.binding(function() { return genericFilterGrid.filter })
+         }
+     }
+ }
 === modified file 'qml/Dash/CardTool.qml'
 --- qml/Dash/CardTool.qml	2014-03-06 15:46:54 +0000
 +++ qml/Dash/CardTool.qml	2014-03-18 10:57:24 +0000
@@ -163,7 +163,7 @@
      Card {
          id: card
--        objectName: "card"
++        objectName: "cardToolCard"
          template: cardTool.template
          components: cardTool.components
 === removed file 'qml/Dash/DashCarousel.qml'
 --- qml/Dash/DashCarousel.qml	2013-11-22 13:53:00 +0000
 +++ qml/Dash/DashCarousel.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +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 "../Components"
--
--DashRenderer {
--    id: dashCarousel
--
--    property alias cacheBuffer: carousel.cacheBuffer
--    property alias itemComponent: carousel.itemComponent
--    property alias minimumTileWidth: carousel.minimumTileWidth
--    property alias selectedItemScaleFactor: carousel.selectedItemScaleFactor
--    property alias tileAspectRatio: carousel.tileAspectRatio
--
--    currentItem: carousel.currentItem
--    height: carousel.implicitHeight + units.gu(6)
--    verticalSpacing: units.gu(3)
--
--    Carousel {
--        id: carousel
--        anchors.fill: parent
--        tileAspectRatio: 198 / 288
--        minimumTileWidth: units.gu(13)
--        selectedItemScaleFactor: 1.14
--        cacheBuffer: 1404 // 18px * 13gu * 6
--        model: dashCarousel.model
--        highlightIndex: dashCarousel.highlightIndex
--
--        onClicked: dashCarousel.clicked(index, itemY)
--        onPressAndHold: dashCarousel.pressAndHold(index, itemY)
--    }
--}
 === modified file 'qml/Dash/DashContent.qml'
 --- qml/Dash/DashContent.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/DashContent.qml	2014-03-18 10:57:24 +0000
@@ -24,7 +24,7 @@
      property var model: null
      property var scopes: null
--    property alias currentIndex: dashContentList.currentIndex
++    readonly property alias currentIndex: dashContentList.currentIndex
      property alias previewOpen: previewListView.open
      property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
@@ -51,6 +51,12 @@
+     }
      function setCurrentScopeAtIndex(index, animate, reset) {
++        // if the scopes haven't loaded yet, then wait until they are.
++        if (!scopes.loaded) {
++            set_current_index = [ index, animate, reset ]
++            return;
++        }
++
          var storedMoveDuration = dashContentList.highlightMoveDuration
          var storedMoveSpeed = dashContentList.highlightMoveVelocity
          if (!animate) {
@@ -58,11 +64,6 @@
              dashContentList.highlightMoveDuration = 0
+         }
--        // if the scopes haven't loaded yet, then wait until they are.
--        if (!scopes.loaded) {
--            set_current_index = [ index, animate, reset ]
--            return;
--        }
          set_current_index = undefined;
          if (dashContentList.count > index)
@@ -100,7 +101,7 @@
              id: dashContentList
              objectName: "dashContentList"
--            interactive: dashContent.scopes.loaded && !previewListView.open && !currentItem.moving
++            interactive: dashContent.scopes.loaded && !previewListView.open && currentItem && !currentItem.moving
              anchors.fill: parent
              model: dashContent.model
@@ -124,7 +125,7 @@
                          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
++                        dashContentList.currentIndex = 0
+                     }
+                 }
+             }
@@ -147,11 +148,12 @@
                      readonly property bool isLoaded: status == Loader.Ready
                      onLoaded: {
++                        item.objectName = scope.id
++                        item.pageHeader = dashPageHeader;
++                        item.previewListView = previewListView;
                          item.scope = Qt.binding(function() { return scope })
                          item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
                          item.tabBarHeight = dashPageHeader.implicitHeight;
--                        item.pageHeader = dashPageHeader;
--                        item.previewListView = previewListView;
                          dashContentList.movementStarted.connect(item.movementStarted)
                          dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
                          dashContent.scopeLoaded(item.scope.id)
@@ -177,23 +179,25 @@
              width: parent.width
              searchEntryEnabled: true
              searchHistory: dashContent.searchHistory
--            scope: dashContentList.currentItem.theScope
++            scope: dashContentList.currentItem && dashContentList.currentItem.theScope
              childItem: TabBar {
                  id: tabBar
                  objectName: "tabbar"
                  height: units.gu(6.5)
                  width: parent.width
--                selectionMode: false
                  style: DashContentTabBarStyle {}
--                // TODO This together with the __styleInstance onModelChanged 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
--                model: dashContentList.model.count > 0 ? dashContentList.model : null
++                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();
++                    }
                      dashContentList.currentIndex = selectedIndex;
+                 }
@@ -204,12 +208,10 @@
+                     }
+                 }
--                Connections {
--                    target: __styleInstance
--                    onModelChanged: {
--                        tabBar.selectedIndex = -1;
--                        tabBar.selectedIndex = 0;
--                    }
++                Timer {
++                    id: selectionModeTimer
++                    interval: 1
++                    onTriggered: tabBar.selectionMode = false
+                 }
+             }
+         }
@@ -217,6 +219,7 @@
      PreviewListView {
          id: previewListView
++        objectName: "dashContentPreviewList"
          visible: x != width
          scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
          pageHeader: dashPageHeader
 === removed file 'qml/Dash/DashFilterGrid.qml'
 --- qml/Dash/DashFilterGrid.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/DashFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,65 +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 "../Components"
--import ".."
--
--DashRenderer {
--    id: dashFilterGrid
--
--    property alias cellWidth: filterGrid.cellWidth
--    property alias cellHeight: filterGrid.cellHeight
--    property alias delegate: filterGrid.delegate
--    property alias delegateWidth: filterGrid.delegateWidth
--    property alias delegateHeight: filterGrid.delegateHeight
--    property alias verticalSpacing: filterGrid.verticalSpacing
--    property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
--    property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
--    property alias collapsedRowCount: filterGrid.collapsedRowCount
--
--    collapsedHeight: filterGrid.collapsedHeight
--    columns: filterGrid.columns
--    rows: filter ? filterGrid.collapsedRowCount : filterGrid.uncollapsedRowCount
--    currentItem: filterGrid.currentItem
--    expandable: filterGrid.expandable
--    height: filterGrid.height
--    margins: filterGrid.margins
--    uncollapsedHeight: filterGrid.uncollapsedHeight
--
--    function startFilterAnimation(filter) {
--        filterGrid.startFilterAnimation(filter)
--    }
--
--    FilterGrid {
--        id: filterGrid
--        width: dashFilterGrid.width
--        minimumHorizontalSpacing: units.gu(0.5)
--        delegateWidth: units.gu(11)
--        delegateHeight: units.gu(9.5)
--        verticalSpacing: units.gu(2)
--        model: dashFilterGrid.model
--        filter: dashFilterGrid.filter
--        highlightIndex: dashFilterGrid.highlightIndex
--        delegateCreationBegin: dashFilterGrid.delegateCreationBegin
--        delegateCreationEnd: dashFilterGrid.delegateCreationEnd
--
--        onFilterChanged: {
--            dashFilterGrid.filter = filter
--            filter = Qt.binding(function() { return dashFilterGrid.filter })
--        }
--    }
--}
 === removed file 'qml/Dash/DashHome.qml'
 --- qml/Dash/DashHome.qml	2013-08-11 21:21:38 +0000
 +++ qml/Dash/DashHome.qml	1970-01-01 00:00:00 +0000
@@ -1,39 +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 Utils 0.1
--import "../Components"
--import "../Components/ListItems"
--import "Apps"
--
--GenericScopeView {
--    id: root
--    objectName: "DashHome"
--
--    SearchableResultModel {
--        id: appsModel
--
--        model: FrequentlyUsedAppsModel {}
--        filterRole: 3
--        searchQuery: root.scope.searchQuery
--    }
--
--    onScopeChanged: {
--        root.scope.categories.overrideResults("applications.scope", appsModel);
--    }
--}
 === removed file 'qml/Dash/DashPreview.qml'
 --- qml/Dash/DashPreview.qml	2014-02-03 19:18:05 +0000
 +++ qml/Dash/DashPreview.qml	1970-01-01 00:00:00 +0000
@@ -1,208 +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
--
--Item {
--    id: root
--
--    property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
--    property var previewData
--    property alias showProcessingAction: waitingForActionMouseArea.enabled
--
--    property real previewWidthRatio: 0.5
--    property bool isCurrent: false
--
--    property Component previewImages
--    property Component header
--    property Component actions
--    property Component description
--    property Component ratings
--
--    readonly property bool narrowMode: width <= height * 1.5
--    readonly property int columnWidth: narrowMode ? contentRow.width : (contentRow.width / 3) - contentRow.spacing
--    readonly property int contentSpacing: units.gu(3)
--
--    clip: true
--
--    function ensureVisible(item) {
--        var o = leftFlickable.mapFromItem(item, 0, 0, item.width, item.height);
--        var keyboardY = shell.height - root.keyboardSize;
--        if ((o.y + o.height) > keyboardY) {
--            leftFlickable.contentY += o.y + o.height - keyboardY;
--        }
--    }
--
--    Connections {
--        target: shell.applicationManager
--        onMainStageFocusedApplicationChanged: {
--            root.close();
--        }
--        onSideStageFocusedApplicationChanged: {
--            root.close();
--        }
--    }
--
--    onPreviewDataChanged: showProcessingAction = false
--
--    MouseArea {
--        anchors.fill: parent
--    }
--
--    Row {
--        id: contentRow
--        anchors {
--            left: parent.left
--            top: parent.top
--            right: parent.right
--            bottom: parent.bottom
--            topMargin: root.contentSpacing
--            leftMargin: root.contentSpacing
--            rightMargin: root.contentSpacing
--        }
--        height: childrenRect.height
--
--        spacing: units.gu(2)
--
--
--        Flickable {
--            id: leftFlickable
--            objectName: "leftFlickable"
--            anchors {
--                top: parent.top
--                bottom: parent.bottom
--            }
--            width: root.columnWidth
--            contentHeight: leftColumn.height + root.contentSpacing
--            anchors.bottomMargin: root.keyboardSize
--            clip: true
--
--            Behavior on contentY { NumberAnimation { duration: 300 } }
--
--            Column {
--                id: leftColumn
--                objectName: "leftColumn"
--                height: childrenRect.height
--                spacing: root.contentSpacing
--                anchors {
--                    left: parent.left
--                    right: parent.right
--                }
--            }
--        }
--
--        Flickable {
--            id: centerFlickable
--            anchors {
--                top: parent.top
--                bottom: parent.bottom
--            }
--            width: root.columnWidth
--            contentHeight: centerColumn.height
--            clip: true
--
--            Column {
--                id: centerColumn
--                objectName: "centerColumn"
--                height: childrenRect.height
--                anchors {
--                    left: parent.left
--                    right: parent.right
--                }
--                spacing: root.contentSpacing
--            }
--        }
--
--        Flickable {
--            id: rightFlickable
--            anchors {
--                top: parent.top
--                bottom: parent.bottom
--            }
--            width: root.columnWidth
--            contentHeight: rightColumn.height
--            clip: true
--
--            Column {
--                id: rightColumn
--                objectName: "rightColumn"
--                height: childrenRect.height
--                anchors {
--                    left: parent.left
--                    right: parent.right
--                }
--            }
--        }
--    }
--
--    Loader {
--        id: previewImageLoader
--        parent: leftColumn
--        sourceComponent: root.previewImages
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--    }
--
--    Loader {
--        id: ratingsLoader
--        parent: root.narrowMode ? leftColumn : rightColumn
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--        sourceComponent: root.ratings
--    }
--
--    Loader {
--        id: descriptionLoader
--        parent: root.narrowMode ? leftColumn : centerColumn
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--        sourceComponent: root.description
--    }
--
--    Loader {
--        id: actionsLoader
--        parent: root.narrowMode ? leftColumn : centerColumn
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--        sourceComponent: root.actions
--    }
--
--    Loader {
--        id: headerLoader
--        parent: root.narrowMode ? leftColumn : centerColumn
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--        sourceComponent: root.header
--    }
--
--    MouseArea {
--        id: waitingForActionMouseArea
--        objectName: "waitingForActionMouseArea"
--        anchors.fill: parent
--        enabled: false
--    }
--}
 === removed file 'qml/Dash/DashPreviewPlaceholder.qml'
 --- qml/Dash/DashPreviewPlaceholder.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/DashPreviewPlaceholder.qml	1970-01-01 00:00:00 +0000
@@ -1,25 +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
--
--DashPreview {
--    ActivityIndicator {
--        anchors.centerIn: parent
--        running: visible
--    }
--}
 === modified file 'qml/Dash/DashRenderer.qml'
 --- qml/Dash/DashRenderer.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/DashRenderer.qml	2014-03-18 10:57:24 +0000
@@ -31,9 +31,6 @@
      property int rows: 1
--    // Index of the highlighted item
--    property int highlightIndex: -1
--
      property int margins: 0
      property int uncollapsedHeight: height
@@ -53,7 +50,7 @@
      /*!
       \brief CardTool component.
       */
--    property var cardTool
++    property var cardTool: undefined
      /// Emitted when the user clicked on an item
      /// @param index is the index of the clicked item
 === removed directory 'qml/Dash/Generic'
 === removed file 'qml/Dash/Generic/FlatTileStyle.qml'
 --- qml/Dash/Generic/FlatTileStyle.qml	2013-10-10 10:20:36 +0000
 +++ qml/Dash/Generic/FlatTileStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,79 +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
--
--Item {
--    id: tile
--
--    property bool disabled: false
--
--    anchors.fill: parent
--
--    Image {
--        id: icon
--        objectName: "image"
--        width: styledItem.imageWidth
--        height: styledItem.imageHeight
--
--        anchors.horizontalCenter: parent.horizontalCenter
--
--        sourceSize { width: width; height: height }
--        asynchronous: true
--        cache: false
--        source: styledItem.source
--        fillMode: styledItem.fillMode
--        opacity: tile.disabled ? 0.3 : 1.0
--        horizontalAlignment: Image.AlignHCenter
--        verticalAlignment: Image.AlignVCenter
--    }
--
--    UbuntuShape {
--        id: borderPressed
--        objectName: "borderPressed"
--
--        anchors.fill: icon
--        radius: "medium"
--        borderSource: "radius_pressed.sci"
--        opacity: styledItem.pressed ? 1.0 : 0.0
--        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
--    }
--
--    Label {
--        id: label
--        objectName: "label"
--        anchors {
--            baseline: icon.bottom
--            baselineOffset: units.gu(2)
--            left: parent.left
--            right: parent.right
--            leftMargin: units.gu(1)
--            rightMargin: units.gu(1)
--        }
--
--        color: Theme.palette.selected.backgroundText
--        opacity: 0.9
--        style: Text.Raised
--        styleColor: "black"
--        fontSize: "small"
--        elide: Text.ElideMiddle
--        horizontalAlignment: styledItem.horizontalAlignment
--        text: styledItem.text
--        wrapMode: Text.Wrap
--        maximumLineCount: styledItem.maximumLineCount
--    }
--}
 === removed file 'qml/Dash/Generic/GenericCarousel.qml'
 --- qml/Dash/Generic/GenericCarousel.qml	2013-12-05 18:01:29 +0000
 +++ qml/Dash/Generic/GenericCarousel.qml	1970-01-01 00:00:00 +0000
@@ -1,53 +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 "../../Components"
--import ".."
--
--DashCarousel {
--    id: genericCarousel
--    itemComponent: carouselDelegateGeneric
--
--    Component {
--        id: carouselDelegateGeneric
--
--        BaseCarouselDelegate {
--            id: item
--            objectName: "carouselDelegate"
--
--            UbuntuShape {
--                anchors.fill: parent
--                radius: "medium"
--                borderSource: ""
--                image: Image {
--                    asynchronous: true
--                    sourceSize { width: item.width; height: item.height }
--                    source: model ? model.icon : ""
--                }
--            }
--
--            BorderImage {
--                anchors.centerIn: parent
--                opacity: 0.6
--                source: "../../Components/graphics/non-selected.sci"
--                width: parent.width + units.gu(1.5)
--                height: parent.height + units.gu(1.5)
--            }
--        }
--    }
--}
 === removed file 'qml/Dash/Generic/GenericFilterGrid.qml'
 --- qml/Dash/Generic/GenericFilterGrid.qml	2013-11-22 13:53:00 +0000
 +++ qml/Dash/Generic/GenericFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,46 +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 "../../Components"
--import ".."
--
--DashFilterGrid {
--    id: genericFilterGrid
--
--    property int iconWidth: units.gu(8)
--    property int iconHeight: units.gu(7.5)
--
--    minimumHorizontalSpacing: units.gu(0.5)
--    delegateWidth: units.gu(11)
--    delegateHeight: units.gu(9.5)
--    verticalSpacing: units.gu(2)
--
--    delegate: Tile {
--        id: tile
--        objectName: "delegate" + index
--        width: genericFilterGrid.cellWidth
--        height: genericFilterGrid.cellHeight
--        text: model.title
--        imageWidth: genericFilterGrid.iconWidth
--        imageHeight: genericFilterGrid.iconHeight
--        source: model.icon
--
--        onClicked: genericFilterGrid.clicked(index, tile.y)
--        onPressAndHold: genericFilterGrid.pressAndHold(index, tile.y)
--    }
--}
 === removed file 'qml/Dash/Generic/GenericFilterGridPotrait.qml'
 --- qml/Dash/Generic/GenericFilterGridPotrait.qml	2013-11-20 00:10:01 +0000
 +++ qml/Dash/Generic/GenericFilterGridPotrait.qml	1970-01-01 00:00:00 +0000
@@ -1,28 +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 "../../Components"
--
--GenericFilterGrid {
--    minimumHorizontalSpacing: units.gu(0.5)
--    delegateWidth: units.gu(11)
--    delegateHeight: units.gu(18)
--    verticalSpacing: units.gu(2)
--    iconWidth: (width / columns) * 0.8
--    iconHeight: iconWidth * 16 / 11
--}
 === removed file 'qml/Dash/Generic/GenericPreview.qml'
 --- qml/Dash/Generic/GenericPreview.qml	2014-01-23 06:57:49 +0000
 +++ qml/Dash/Generic/GenericPreview.qml	1970-01-01 00:00:00 +0000
@@ -1,197 +0,0 @@
--/*
-- * Copyright (C) 2013, 2014 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 Ubuntu.Components.ListItems 0.1 as ListItems
--import Ubuntu.DownloadDaemonListener 0.1
--import "../../Components"
--import ".."
--import "../Previews"
--
--DashPreview {
--    id: genericPreview
--
--    previewImages: previewImagesComponent
--    header: headerComponent
--    actions: (previewData.infoMap !== undefined && previewData.infoMap["show_progressbar"]) ? progressComponent : actionsComponent
--    description: descriptionComponent
--
--    Component {
--        id: previewImagesComponent
--
--        LazyImage {
--            objectName: "genericPreviewImage"
--            anchors {
--                left: parent.left
--                right: parent.right
--            }
--            scaleTo: "width"
--            source: genericPreview.previewData.image
--            initialHeight: width
--        }
--    }
--
--    Component {
--        id: headerComponent
--        Header {
--            title: previewData.title
--            subtitle: previewData.subtitle
--        }
--    }
--
--    Component {
--        id: actionsComponent
--
--        Column {
--            id: buttonList
--            spacing: units.gu(1)
--            Repeater {
--                objectName: "buttonList"
--                model: previewData.actions
--
--                delegate: Button {
--                    objectName: "button" + index
--                    width: parent.width
--                    height: buttonList.buttonHeight
--                    color: Theme.palette.selected.foreground
--                    text: modelData.displayName
--                    iconSource: modelData.iconHint
--                    iconPosition: "right"
--                    onClicked: {
--                        previewData.execute(modelData.id, { })
--                        genericPreview.showProcessingAction = true;
--                    }
--                }
--            }
--        }
--    }
--
--    Component {
--        id: progressComponent
--
--        ProgressBar {
--            id: progressBar
--            objectName: "progressBar"
--            value: 0
--            maximumValue: 100
--            height: units.gu(5)
--
--            property var model: previewData.actions
--
--            DownloadTracker {
--                service: "com.canonical.applications.Downloader"
--                dbusPath: previewData.infoMap["progressbar_source"] ? previewData.infoMap["progressbar_source"].value : ""
--
--                onProgress: {
--                    var percentage = parseInt(received * 100 / total);
--                    progressBar.value = percentage;
--                }
--
--                onFinished: {
--                    previewData.execute(progressBar.model[0].id, { })
--                }
--
--                onError: {
--                    previewData.execute(progressBar.model[1].id, { "error": error });
--                }
--            }
--
--        }
--    }
--
--    Component {
--        id: descriptionComponent
--        Column {
--            spacing: units.gu(2)
--
--            Label {
--                id: descriptionLabel
--                objectName: "descriptionLabel"
--                anchors { left: parent.left; right: parent.right }
--                visible: text != ""
--                fontSize: "small"
--                opacity: 0.6
--                color: "white"
--                text: previewData.description.replace(/[\r\n]/g, "<br />")
--                style: Text.Raised
--                styleColor: "black"
--                wrapMode: Text.WordWrap
--                textFormat: Text.RichText
--                // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
--                onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
--            }
--
--            Column {
--                objectName: "infoHintColumn"
--                anchors {
--                    left: parent.left
--                    right: parent.right
--                }
--                Repeater {
--                    objectName: "infoHintRepeater"
--                    model: previewData.infoHints
--
--                    delegate: Item {
--                        objectName: "infoHintItem" + index
--                        width: parent.width
--                        height: units.gu(5)
--                        Row {
--                            width: parent.width
--                            spacing: units.gu(1)
--                            property int columnWidth: (width - spacing) / 2
--                            anchors.verticalCenter: parent.verticalCenter
--
--                            Label {
--                                objectName: "displayNameLabel"
--                                visible: valueLabel.visible
--                                fontSize: "small"
--                                opacity: 0.9
--                                color: "white"
--                                horizontalAlignment: Text.AlignLeft
--                                width: parent.columnWidth
--                                text: modelData.displayName
--                                style: Text.Raised
--                                styleColor: "black"
--                            }
--                            Label {
--                                id: valueLabel
--                                objectName: "valueLabel"
--                                visible: modelData.value != ""
--                                fontSize: "small"
--                                opacity: 0.6
--                                color: "white"
--                                horizontalAlignment: Text.AlignRight
--                                width: parent.columnWidth
--                                text: modelData.value ? modelData.value : ""
--                                style: Text.Raised
--                                styleColor: "black"
--                                wrapMode: Text.WordWrap
--                            }
--                        }
--                        ListItems.ThinDivider {
--                            anchors {
--                                left: parent.left
--                                bottom: parent.bottom
--                                right: parent.right
--                            }
--                        }
--                    }
--                }
--            }
--        }
--    }
--}
 === removed file 'qml/Dash/Generic/WeatherFilterGrid.qml'
 --- qml/Dash/Generic/WeatherFilterGrid.qml	2013-11-11 11:44:39 +0000
 +++ qml/Dash/Generic/WeatherFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +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 "../../Components"
--
--GenericFilterGrid {
--    id: filtergrid
--
--    delegateHeight: units.gu(11.5)
--
--    delegate: Tile {
--        id: tile
--        objectName: "delegate" + index
--        width: filtergrid.cellWidth
--        height: filtergrid.cellHeight
--        text: model.title
--        imageWidth: filtergrid.iconWidth
--        imageHeight: filtergrid.iconHeight
--        source: model.icon
--        maximumLineCount: 2
--
--        style: FlatTileStyle {}
--
--        onClicked: {
--            filtergrid.clicked(index, tile.y)
--        }
--
--        onPressAndHold: {
--            filtergrid.pressAndHold(index, tile.y)
--        }
--    }
--}
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/GenericScopeView.qml	2014-03-18 10:57:24 +0000
@@ -24,9 +24,9 @@
  FocusScope {
      id: scopeView
--    property Scope scope
++    property Scope scope: null
      property SortFilterProxyModel categories: categoryFilter
--    property bool isCurrent
++    property bool isCurrent: false
      property alias moving: categoryView.moving
      property int tabBarHeight: 0
      property PageHeader pageHeader: null
@@ -91,7 +91,7 @@
      Binding {
          target: pageHeader
          property: "searchQuery"
--        value: scopeView.scope.searchQuery
++        value: scopeView.scope ? scopeView.scope.searchQuery : ""
          when: isCurrent
+     }
@@ -122,11 +122,6 @@
          onOriginYChanged: pageHeader.positionRealHeader();
          onContentHeightChanged: pageHeader.positionRealHeader();
--        Behavior on contentY {
--            enabled: previewListView.open
--            UbuntuNumberAnimation {}
--        }
--
          delegate: ListItems.Base {
              id: baseItem
              objectName: "dashCategory" + category
 === removed directory 'qml/Dash/Movie'
 === removed file 'qml/Dash/Movie/MoviePreview.qml'
 --- qml/Dash/Movie/MoviePreview.qml	2013-10-02 19:21:33 +0000
 +++ qml/Dash/Movie/MoviePreview.qml	1970-01-01 00:00:00 +0000
@@ -1,71 +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 ".."
--import "../Generic"
--import "../../Components"
--import "../Previews"
--
--GenericPreview {
--    id: root
--
--    property bool ready: previewData ? true : false
--    property url url: ready ? previewData.image : ""
--
--    previewImages: previewImageComponent
--    header: headerComponent
--
--    Component {
--        id: previewImageComponent
--        LazyImage {
--            anchors.left: parent.left
--            anchors.right: parent.right
--            scaleTo: "width"
--            visible: height > 0
--            source: root.url
--            initialHeight: width * 10 / 16
--
--            Image {
--                objectName: "playButton"
--                anchors.centerIn: parent
--                readonly property bool bigButton: parent.width > units.gu(40)
--                width: bigButton ? units.gu(8) : units.gu(4.5)
--                height: width
--                source: "../graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")
--            }
--
--            MouseArea {
--                id: previewImageMouseArea
--                anchors.fill: parent
--                onClicked: {
--                    Qt.openUrlExternally(previewData.result.uri);
--                }
--            }
--        }
--    }
--
--    Component {
--        id: headerComponent
--        Header {
--            title: previewData.title
--            rating: Math.round(previewData.rating * 10)
--            reviews: previewData.numRatings
--            rated: previewData.infoMap["rated"] ? previewData.infoMap["rated"].value : 0
--        }
--    }
--}
 === removed directory 'qml/Dash/Music'
 === removed file 'qml/Dash/Music/CarouselDelegateMusic.qml'
 --- qml/Dash/Music/CarouselDelegateMusic.qml	2013-07-09 11:04:25 +0000
 +++ qml/Dash/Music/CarouselDelegateMusic.qml	1970-01-01 00:00:00 +0000
@@ -1,42 +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 "../../Components"
--
--BaseCarouselDelegate {
--    id: item
--
--    UbuntuShape {
--        anchors.fill: parent
--        radius: "medium"
--        borderSource: ""
--        image: Image {
--            asynchronous: true
--            sourceSize { width: item.width; height: item.height }
--            source: model ? model.icon : ""
--        }
--    }
--
--    BorderImage {
--        anchors.centerIn: parent
--        opacity: 0.6
--        source: "../../Components/graphics/non-selected.sci"
--        width: parent.width + units.gu(1.5)
--        height: parent.height + units.gu(1.5)
--    }
--}
 === removed file 'qml/Dash/Music/MusicCarousel.qml'
 --- qml/Dash/Music/MusicCarousel.qml	2013-11-20 00:10:01 +0000
 +++ qml/Dash/Music/MusicCarousel.qml	1970-01-01 00:00:00 +0000
@@ -1,34 +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 "../../Components"
--import ".."
--
--DashCarousel {
--    id: musicCarousel
--    tileAspectRatio: 1
--    minimumTileWidth: units.gu(13)
--    itemComponent: carouselDelegateMusic
--    selectedItemScaleFactor: 1.2
--    cacheBuffer: 1404 // 18px * 13gu * 6
--
--    Component {
--        id: carouselDelegateMusic
--        CarouselDelegateMusic {
--        }
--    }
--}
 === removed file 'qml/Dash/Music/MusicFilterGrid.qml'
 --- qml/Dash/Music/MusicFilterGrid.qml	2013-11-22 13:53:00 +0000
 +++ qml/Dash/Music/MusicFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,48 +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 "../../Components"
--import "../Generic"
--
--GenericFilterGrid {
--    id: musicFilterGrid
--
--    delegateWidth: units.gu(11)
--    delegateHeight: units.gu(16)
--    iconWidth: units.gu(11)
--    iconHeight: units.gu(11)
--
--    delegate: Tile {
--        id: tile
--        objectName: "delegate" + index
--        width: musicFilterGrid.cellWidth
--        height: musicFilterGrid.cellHeight
--        text: model.comment
--        imageWidth: musicFilterGrid.iconWidth
--        imageHeight: musicFilterGrid.iconHeight
--        source: model.icon
--        maximumLineCount: 2
--        horizontalAlignment: Text.AlignLeft
--
--        style: MusicTileStyle {
--            artist: model.title
--        }
--
--        onClicked: musicFilterGrid.clicked(index, tile.y)
--        onPressAndHold: musicFilterGrid.pressAndHold(index, tile.y)
--    }
--}
 === removed file 'qml/Dash/Music/MusicPreview.qml'
 --- qml/Dash/Music/MusicPreview.qml	2014-01-29 16:12:16 +0000
 +++ qml/Dash/Music/MusicPreview.qml	1970-01-01 00:00:00 +0000
@@ -1,203 +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 QtMultimedia 5.0
--import Ubuntu.Components 0.1
--import Ubuntu.Components.ListItems 0.1
--import ".."
--import "../Generic"
--import "../../Components"
--import "../Previews"
--
--GenericPreview {
--    id: root
--
--    previewImages: previewImageComponent
--    header: headerComponent
--    description: descriptionComponent
--
--    Component {
--        id: previewImageComponent
--        LazyImage {
--            height: units.gu(22)
--            scaleTo: "height"
--            source: previewData ? previewData.image : ""
--            initialHeight: height
--            initialWidth: height
--        }
--    }
--
--    Component {
--        id: headerComponent
--        Header {
--            title: previewData.title
--            subtitle: previewData.subtitle
--        }
--    }
--
--    Component {
--        id: descriptionComponent
--
--        Item {
--            height: childrenRect.height
--            Audio {
--                id: audioPlayer
--                objectName: "audioPlayer"
--                property real progress: audioPlayer.position / audioPlayer.duration
--
--                property Item playingItem
--
--                Component.onDestruction: {
--                    audioPlayer.stop();
--                }
--
--                onErrorStringChanged: console.warn("Audio player error:", errorString)
--
--            }
--
--            Connections {
--                target: root
--                onIsCurrentChanged: {
--                    if (!root.isCurrent) {
--                        audioPlayer.stop();
--                    }
--                }
--            }
--
--            Column {
--                anchors { left: parent.left; right: parent.right }
--                visible: trackRepeater.count > 0
--
--                ThinDivider {
--                    objectName: "topDivider"
--                    anchors { left: parent.left; right: parent.right }
--                }
--
--                Repeater {
--                    id: trackRepeater
--                    objectName: "trackRepeater"
--
--                    model: previewData.tracks
--
--                    delegate: Item {
--                        id: trackItem
--                        objectName: "trackItem" + index
--                        anchors { left: parent.left; right: parent.right }
--                        height: units.gu(5)
--                        property bool isPlayingItem: audioPlayer.playingItem == trackItem
--
--                        function play() {
--                            audioPlayer.stop();
--                            // Make sure we change the source, even if two items point to the same uri location
--                            audioPlayer.source = "";
--                            audioPlayer.source = model.uri;
--                            audioPlayer.playingItem = trackItem;
--                            audioPlayer.play();
--                        }
--
--                        Row {
--                            id: trackRow
--                            width: parent.width
--                            spacing: units.gu(1)
--                            property int column1Width: units.gu(3)
--                            property int column2Width: width - (2 * spacing) - column1Width - column3Width
--                            property int column3Width: units.gu(4)
--                            anchors.verticalCenter: parent.verticalCenter
--
--                            Button {
--                                objectName: "playButton"
--                                width: trackRow.column1Width
--                                height: width
--                                iconSource: audioPlayer.playbackState == Audio.PlayingState && trackItem.isPlayingItem ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
--
--                                // Can't be "transparent" or "#00xxxxxx" as the button optimizes away the surrounding shape
--                                // FIXME when this is resolved: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1251685
--                                color: "#01000000"
--
--                                onClicked: {
--                                    if (trackItem.isPlayingItem) {
--                                        if (audioPlayer.playbackState == Audio.PlayingState) {
--                                            audioPlayer.pause();
--                                        } else if (audioPlayer.playbackState == Audio.PausedState){
--                                            audioPlayer.play();
--                                        }
--                                    } else {
--                                        trackItem.play();
--                                    }
--                                }
--                            }
--
--                            Label {
--                                objectName: "trackTitleLabel"
--                                fontSize: "small"
--                                opacity: 0.9
--                                color: "white"
--                                horizontalAlignment: Text.AlignLeft
--                                anchors.verticalCenter: parent.verticalCenter
--                                width: parent.column2Width
--                                text: title
--                                style: Text.Raised
--                                styleColor: "black"
--                                elide: Text.ElideRight
--
--                                UbuntuShape {
--                                    id: progressBarFill
--                                    objectName: "progressBarFill"
--                                    color: UbuntuColors.orange
--                                    anchors.left: progressBarImage.left
--                                    anchors.right: progressBarImage.right
--                                    anchors.verticalCenter: progressBarImage.verticalCenter
--                                    height: units.dp(2)
--                                    anchors.margins: units.dp(2)
--                                    anchors.rightMargin: maxWidth - (maxWidth * audioPlayer.progress) + units.dp(2)
--                                    visible: progressBarImage.visible
--                                    property int maxWidth: progressBarImage.width - units.dp(4)
--                                }
--
--                                Image {
--                                    id: progressBarImage
--                                    anchors { left: parent.left; top: parent.bottom; right: parent.right }
--                                    height: units.dp(6)
--                                    visible: audioPlayer.playbackState != Audio.StoppedState && trackItem.isPlayingItem && model.length.length > 0
--                                    source: "graphics/music_progress_bg.png"
--                                }
--                            }
--
--                            Label {
--                                id: valueLabel
--                                objectName: "timeLabel"
--                                fontSize: "small"
--                                opacity: 0.9
--                                color: "white"
--                                anchors.verticalCenter: parent.verticalCenter
--                                horizontalAlignment: Text.AlignRight
--                                width: parent.column3Width
--                                text: length
--                                style: Text.Raised
--                                styleColor: "black"
--                            }
--                        }
--
--                        ThinDivider {
--                            anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
--                        }
--                    }
--                }
--            }
--        }
--    }
--}
 === removed file 'qml/Dash/Music/MusicTileStyle.qml'
 --- qml/Dash/Music/MusicTileStyle.qml	2013-10-14 10:23:18 +0000
 +++ qml/Dash/Music/MusicTileStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,102 +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
--
--Item {
--    id: tile
--
--    property alias artist: artistLabel.text
--
--    anchors.fill: parent
--
--    UbuntuShape {
--        id: icon
--        anchors {
--            top: parent.top
--            horizontalCenter: parent.horizontalCenter
--        }
--        radius: "medium"
--        width: styledItem.imageWidth
--        height: styledItem.imageHeight
--        image: Image {
--            id: image
--            objectName: "image"
--            sourceSize { width: icon.width; height: icon.height }
--            asynchronous: true
--            cache: false
--            source: styledItem.source
--            fillMode: styledItem.fillMode
--            horizontalAlignment: Image.AlignHCenter
--            verticalAlignment: Image.AlignVCenter
--        }
--    }
--
--    UbuntuShape {
--        id: borderPressed
--        objectName: "borderPressed"
--
--        anchors.fill: icon
--        radius: "medium"
--        borderSource: "radius_pressed.sci"
--        opacity: styledItem.pressed ? 1.0 : 0.0
--        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
--    }
--
--    Label {
--        id: label
--        objectName: "label"
--        anchors {
--            baseline: icon.bottom
--            baselineOffset: units.gu(2)
--            left: icon.left
--            right: parent.right
--            rightMargin: units.gu(1)
--            leftMargin: units.dp(2)
--        }
--
--        color: Theme.palette.selected.backgroundText
--        opacity: 0.9
--        style: Text.Raised
--        styleColor: "black"
--        fontSize: "small"
--        font.weight: Font.Bold
--        elide: Text.ElideRight
--        horizontalAlignment: styledItem.horizontalAlignment
--        text: styledItem.text
--        wrapMode: Text.Wrap
--        maximumLineCount: styledItem.maximumLineCount
--    }
--
--    Label {
--        id: artistLabel
--        anchors {
--            top: label.bottom
--            left: label.left
--            right: label.right
--            rightMargin: units.gu(1)
--        }
--
--        color: Theme.palette.selected.backgroundText
--        opacity: 0.9
--        style: Text.Raised
--        styleColor: "black"
--        fontSize: "x-small"
--        elide: Text.ElideMiddle
--        horizontalAlignment: styledItem.horizontalAlignment
--    }
--}
 === removed file 'qml/Dash/PreviewDelegateMapper.qml'
 --- qml/Dash/PreviewDelegateMapper.qml	2013-11-04 15:40:30 +0000
 +++ qml/Dash/PreviewDelegateMapper.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +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
--
--QtObject {
--    property var d: QtObject {
--        readonly property string genericPreview: "Generic/GenericPreview.qml"
--        readonly property string appPreview: "Apps/AppPreview.qml"
--        property var previewDelegateMapping: {"preview-generic": genericPreview,
--                                              "preview-application": appPreview,
--                                              "preview-movie": "Movie/MoviePreview.qml",
--                                              "preview-music": "Music/MusicPreview.qml",
--        }
--    }
--
--    function map(rendererName) {
--        var customPreview = d.previewDelegateMapping[rendererName]
--        if (customPreview != undefined) {
--            return customPreview
--        }
--        console.debug("Renderer "+rendererName+" not found, using preview-generic")
--        return d.genericPreview
--    }
--}
 === modified file 'qml/Dash/PreviewListView.qml'
 --- qml/Dash/PreviewListView.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/PreviewListView.qml	2014-03-18 10:57:24 +0000
@@ -34,6 +34,7 @@
      PageHeader {
          id: header
++        objectName: root.objectName + "_pageHeader"
          width: parent.width
          searchEntryEnabled: false
          scope: root.scope
@@ -60,7 +61,7 @@
      ListView  {
          id: previewListView
--        objectName: "previewListView"
++        objectName: root.objectName + "_listView"
          anchors {
              top: header.bottom
              bottom: parent.bottom
@@ -91,7 +92,7 @@
                  pageHeader.unfocus();
              } else {
                  // Cancel any pending preview requests or actions
--                if (previewListView.currentItem.previewData !== undefined) {
++                if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {
                      previewListView.currentItem.previewData.cancelAction();
+                 }
                  scope.cancelActivation();
@@ -100,6 +101,7 @@
+         }
          delegate: Item {
++            objectName: "previewItem" + index
              height: previewListView.height
              width: previewListView.width
 === removed file 'qml/Dash/Previews/Header.qml'
 --- qml/Dash/Previews/Header.qml	2013-10-01 17:49:48 +0000
 +++ qml/Dash/Previews/Header.qml	1970-01-01 00:00:00 +0000
@@ -1,109 +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 "../../Components"
--
--Row {
--    id: root
--    property alias icon: image.source
--    property alias title: titleLabel.text
--    property alias subtitle: subtitleLabel.text
--    property alias rating: ratingStars.rating
--    property int rated: 0
--    property int reviews: 0
--
--    spacing: units.gu(2)
--    height: imageShape.visible ? imageShape.height : contentColumn.height
--
--    UbuntuShape {
--        id: imageShape
--        width: height
--        height: Math.max(units.gu(6), contentColumn.height)
--        visible: image.source.toString().length > 0
--        image: Image {
--            id: image
--            sourceSize { width: imageShape.width; height: imageShape.height }
--            asynchronous: true
--            fillMode: Image.PreserveAspectFit
--        }
--    }
--
--    Column {
--        id: contentColumn
--        spacing: units.gu(1)
--        width: parent.width - x
--
--        Label {
--            id: titleLabel
--            objectName: "titleLabel"
--            fontSize: "large"
--            color: "white"
--            style: Text.Raised
--            styleColor: "black"
--            opacity: .9
--            width: parent.width
--            elide: Text.ElideRight
--        }
--
--        Label {
--            id: subtitleLabel
--            objectName: "subtitleLabel"
--            fontSize: "medium"
--            color: "white"
--            style: Text.Raised
--            styleColor: "black"
--            opacity: .6
--            visible: text.length > 0
--        }
--
--        Row {
--            visible: root.rating >= 0
--            spacing: units.gu(1)
--
--            RatingStars {
--                id: ratingStars
--                maximumRating: 10
--                rating: -1
--            }
--
--            Label {
--                id: ratedLabel
--                objectName: "ratedLabel"
--                fontSize: "medium"
--                color: "white"
--                style: Text.Raised
--                styleColor: "black"
--                opacity: .6
--                //TRANSLATORS: Number of persons who rated this app/video/whatever
--                text: i18n.tr("(%1)").arg(root.rated)
--            }
--
--            Label {
--                id: reviewsLabel
--                objectName: "reviewsLabel"
--                fontSize: "medium"
--                color: "white"
--                style: Text.Raised
--                styleColor: "black"
--                opacity: .6
--                //TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
--                text: i18n.tr("%1 review", "%1 reviews", root.reviews).arg(root.reviews)
--            }
--        }
--    }
--}
 === removed file 'qml/Dash/Previews/Reviews.qml'
 --- qml/Dash/Previews/Reviews.qml	2013-09-30 19:34:47 +0000
 +++ qml/Dash/Previews/Reviews.qml	1970-01-01 00:00:00 +0000
@@ -1,194 +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 Ubuntu.Components.ListItems 0.1 as ListItem
--import "../../Components"
--
--Column {
--    id: root
--
--    property var model
--    property alias textArea: reviewField
--
--    signal sendReview(string review)
--    signal editing
--
--    spacing: units.gu(2)
--    state: ""
--
--    states: [
--        State {
--            name: ""
--            PropertyChanges { target: reviewField; width: root.width }
--            PropertyChanges { target: sendButton; opacity: 0 }
--            PropertyChanges { target: inverseArea; enabled: false }
--        },
--        State {
--            name: "editing"
--            PropertyChanges { target: reviewField; width: (root.width - row.spacing - sendButton.width) }
--            PropertyChanges { target: sendButton; opacity: 1 }
--            PropertyChanges { target: inverseArea; enabled: true }
--        }
--     ]
--
--    transitions: [
--        Transition {
--            from: ""
--            to: "editing"
--            SequentialAnimation {
--                UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }
--                UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }
--            }
--        },
--        Transition {
--            from: "editing"
--            to: ""
--            SequentialAnimation {
--                UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }
--                UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }
--            }
--        }
--    ]
--
--    Label {
--        fontSize: "medium"
--        color: "white"
--        style: Text.Raised
--        styleColor: "black"
--        opacity: .9
--        text: i18n.tr("Add a review")
--    }
--
--    Row {
--        id: row
--        spacing: units.gu(1)
--        width: root.width
--
--        // FIXME: needs to react to Qt.inputMethod geometry
--        TextArea {
--            id: reviewField
--            objectName: "reviewField"
--            placeholderText: i18n.tr("Review")
--            width: parent.width
--            verticalAlignment: Text.AlignVCenter
--            autoSize: true
--            maximumLineCount: 5
--
--            Behavior on height { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
--
--            onFocusChanged: {
--                if(reviewField.focus){
--                    root.state = "editing";
--                    reviewField.selectAll();
--                    root.editing();
--                }
--            }
--
--            // FIXME: not active when in wide mode
--            InverseMouseArea {
--                id: inverseArea
--                anchors.fill: parent
--                enabled: false
--                onPressed: {
--                    reviewField.focus = false;
--                    root.state = "";
--                }
--            }
--        }
--
--        Button {
--            id: sendButton
--            objectName: "sendButton"
--            width: units.gu(10)
--            height: units.gu(4)
--            anchors.bottom: reviewField.bottom
--            color: Theme.palette.selected.foreground
--            text: i18n.tr("Send")
--            opacity: 0
--
--            onClicked: {
--                root.sendReview(reviewField.text);
--                reviewField.text = ""
--            }
--        }
--    }
--
--    ListItem.ThinDivider {}
--
--    Label {
--        fontSize: "medium"
--        color: "white"
--        style: Text.Raised
--        styleColor: "black"
--        opacity: .9
--        text: i18n.tr("Comments:")
--    }
--
--    Repeater {
--        objectName: "commentsArea"
--        model: root.model
--
--        Column {
--            anchors { left: parent.left; right: parent.right }
--
--            Column {
--                anchors { left: parent.left; right: parent.right }
--
--                Label {
--                    anchors { left: parent.left; right: parent.right }
--                    text: modelData[0]
--                    fontSize: "medium"
--                    color: "white"
--                    opacity: .8
--                    wrapMode: Text.WordWrap
--                    style: Text.Raised
--                    styleColor: "black"
--                }
--
--                Row {
--                    spacing: units.gu(1)
--
--                    RatingStars {
--                        maximumRating: 10
--                        rating: modelData[1]
--                    }
--
--                    Label {
--                        text: modelData[2]
--                        fontSize: "medium"
--                        color: Theme.palette.selected.backgroundText
--                        opacity: .6
--                        style: Text.Raised
--                        styleColor: "black"
--                    }
--                }
--            }
--
--            Label {
--                anchors { left: parent.left; right: parent.right }
--                text: modelData[3]
--                fontSize: "medium"
--                color: Theme.palette.selected.backgroundText
--                opacity: .6
--                wrapMode: Text.WordWrap
--                style: Text.Raised
--                styleColor: "black"
--            }
--        }
--    }
--}
 === modified file 'qml/Dash/ScopeDelegateMapper.qml'
 --- qml/Dash/ScopeDelegateMapper.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/ScopeDelegateMapper.qml	2014-03-18 10:57:24 +0000
@@ -17,9 +17,7 @@
  import QtQuick 2.0
  QtObject {
--    property var scopeDelegateMapping: {"clickscope": "DashApps.qml",
--                                       "home.scope": "DashHome.qml"
--                                      }
++    property var scopeDelegateMapping: {"clickscope": "DashApps.qml"}
      property string genericScope: "GenericScopeView.qml"
      function map(scopeId) {
 === removed file 'qml/Dash/SearchableResultModel.qml'
 --- qml/Dash/SearchableResultModel.qml	2014-03-18 10:57:24 +0000
 +++ qml/Dash/SearchableResultModel.qml	1970-01-01 00:00:00 +0000
@@ -1,44 +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 Utils 0.1
--import Unity 0.2
--
--SortFilterProxyModel {
--    id: root
--
--    property string searchQuery: ""
--    property bool hideOnSearch: false
--
--    filterRole: CategoryResults.RoleTitle
--
--    function get(index) {
--        return model.get(mapToSource(index))
--    }
--
--    onSearchQueryChanged: {
--        if (searchQuery.length == 0) {
--            filterRegExp = RegExp("");
--            filterCaseSensitivity = Qt.CaseInsensitive;
--        } else if (!hideOnSearch) {
--            setFilterWildcard(searchQuery);
--            filterCaseSensitivity = Qt.CaseInsensitive;
--        } else {
--            filterRegExp = /^$/;
--            filterCaseSensitivity = Qt.CaseInsensitive;
--        }
--    }
--}
 === removed directory 'qml/Dash/Video'
 === removed file 'qml/Dash/Video/CarouselDelegateVideo.qml'
 --- qml/Dash/Video/CarouselDelegateVideo.qml	2013-07-09 09:06:29 +0000
 +++ qml/Dash/Video/CarouselDelegateVideo.qml	1970-01-01 00:00:00 +0000
@@ -1,42 +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 "../../Components"
--
--BaseCarouselDelegate {
--    id: item
--
--    UbuntuShape {
--        anchors.fill: parent
--        radius: "medium"
--        borderSource: ""
--        image: Image {
--            asynchronous: true
--            sourceSize { width: item.width; height: item.height }
--            source: model ? model.icon : ""
--        }
--    }
--
--    BorderImage {
--        anchors.centerIn: parent
--        opacity: 0.6
--        source: "../../Components/graphics/non-selected.sci"
--        width: parent.width + units.gu(1.5)
--        height: parent.height + units.gu(1.5)
--    }
--}
 === removed file 'qml/Dash/Video/VideoCarousel.qml'
 --- qml/Dash/Video/VideoCarousel.qml	2013-11-20 00:10:01 +0000
 +++ qml/Dash/Video/VideoCarousel.qml	1970-01-01 00:00:00 +0000
@@ -1,34 +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 "../../Components"
--import ".."
--
--DashCarousel {
--    id: videosCarousel
--    tileAspectRatio: 198 / 288
--    minimumTileWidth: units.gu(13)
--    itemComponent: carouselDelegateVideo
--    selectedItemScaleFactor: 1.14
--    cacheBuffer: 1404 // 18px * 13gu * 6
--
--    Component {
--        id: carouselDelegateVideo
--        CarouselDelegateVideo {
--        }
--    }
--}
 === removed file 'qml/Dash/Video/VideoFilterGrid.qml'
 --- qml/Dash/Video/VideoFilterGrid.qml	2013-11-22 13:53:00 +0000
 +++ qml/Dash/Video/VideoFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +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 "../../Components"
--import "../Generic"
--
--GenericFilterGrid {
--    id: videoFilterGrid
--
--    delegateWidth: units.gu(11)
--    delegateHeight: units.gu(15)
--    iconWidth: units.gu(11)
--    iconHeight: units.gu(11)
--
--    delegate: Tile {
--        id: tile
--        objectName: "delegate" + index
--        width: videoFilterGrid.cellWidth
--        height: videoFilterGrid.cellHeight
--        text: model.title
--        imageWidth: videoFilterGrid.iconWidth
--        imageHeight: videoFilterGrid.iconHeight
--        source: model.icon
--        maximumLineCount: 2
--        horizontalAlignment: Text.AlignLeft
--
--        style: VideoTileStyle {}
--
--        onClicked: videoFilterGrid.clicked(index, tile.y)
--        onPressAndHold: videoFilterGrid.pressAndHold(index, tile.y)
--    }
--}
 === removed file 'qml/Dash/Video/VideoTileStyle.qml'
 --- qml/Dash/Video/VideoTileStyle.qml	2013-10-14 10:23:18 +0000
 +++ qml/Dash/Video/VideoTileStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,87 +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
--
--Item {
--    id: tile
--
--    anchors.fill: parent
--
--    Image {
--        id: icon
--        anchors {
--            top: parent.top
--            horizontalCenter: parent.horizontalCenter
--        }
--        width: styledItem.imageWidth
--        height: styledItem.imageHeight
--        source: "graphics/movie_icon_holder.png"
--
--        Image {
--            id: image
--            objectName: "image"
--            anchors {
--                fill: parent;
--                topMargin: units.gu(2);
--                bottomMargin: units.gu(2)
--            }
--            sourceSize { width: icon.width; height: icon.height }
--            asynchronous: true
--            cache: false
--            source: styledItem.source
--            fillMode: styledItem.fillMode
--            horizontalAlignment: Image.AlignHCenter
--            verticalAlignment: Image.AlignVCenter
--        }
--    }
--
--    UbuntuShape {
--        id: borderPressed
--        objectName: "borderPressed"
--
--        anchors.fill: icon
--        radius: "medium"
--        borderSource: "radius_pressed.sci"
--        opacity: styledItem.pressed ? 1.0 : 0.0
--        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
--    }
--
--    Label {
--        id: label
--        objectName: "label"
--        anchors {
--            baseline: icon.bottom
--            baselineOffset: units.gu(2)
--            left: icon.left
--            right: parent.right
--            rightMargin: units.gu(1)
--            leftMargin: units.dp(2)
--        }
--
--        color: Theme.palette.selected.backgroundText
--        opacity: 0.9
--        style: Text.Raised
--        styleColor: "black"
--        fontSize: "small"
--        elide: Text.ElideRight
--        horizontalAlignment: styledItem.horizontalAlignment
--        text: styledItem.text
--        wrapMode: Text.Wrap
--        maximumLineCount: styledItem.maximumLineCount
--    }
--}
 === removed directory 'qml/Dash/Video/graphics'
 === removed file 'qml/Dash/Video/graphics/icon_button_amazon@20.png'
 Binary files qml/Dash/Video/graphics/icon_button_amazon@20.png	2013-06-05 22:03:08 +0000 and qml/Dash/Video/graphics/icon_button_amazon@20.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Dash/Video/graphics/icon_button_u1@20.png'
 Binary files qml/Dash/Video/graphics/icon_button_u1@20.png	2013-06-05 22:03:08 +0000 and qml/Dash/Video/graphics/icon_button_u1@20.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Dash/Video/graphics/movie_icon_holder@27.png'
 Binary files qml/Dash/Video/graphics/movie_icon_holder@27.png	2013-10-09 17:06:13 +0000 and qml/Dash/Video/graphics/movie_icon_holder@27.png	1970-01-01 00:00:00 +0000 differ
 === modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
 --- tests/autopilot/unity8/shell/emulators/dash.py	2014-02-07 17:03:14 +0000
 +++ tests/autopilot/unity8/shell/emulators/dash.py	2014-03-18 10:57:24 +0000
@@ -36,11 +36,9 @@
          self.dash_content_list = self.wait_select_single(
              'QQuickListView', objectName='dashContentList')
--    def get_home_applications_grid(self):
--        get_grid = self.get_scope('home').wait_select_single(
--            "GenericFilterGrid",
--            objectName="applications.scope"
--        )
++    def get_applications_grid(self):
++        get_grid = self.get_scope('clickscope').wait_select_single(
++            'CardFilterGrid', objectName='local')
          return get_grid
      def get_application_icon(self, text):
@@ -50,24 +48,22 @@
          :param text: String containing the text of the icon to search for.
          """
--        app_grid = self.get_home_applications_grid()
++        app_grid = self.get_applications_grid()
          resp_grid = app_grid.wait_select_single('ResponsiveGridView')
          return resp_grid.select_single('Tile', text=text)
--    def get_scope(self, scope_name='home'):
--        scope_id = "%s.scope" % scope_name
++    def get_scope(self, scope_name='clickscope'):
          return self.dash_content_list.select_single(
--            'QQuickLoader', scopeId=scope_id)
++            'QQuickLoader', scopeId=scope_name)
      @autopilot_logging.log_action(logger.info)
--    def open_scope(self, scope_name):
++    def open_scope(self, scope_id):
          """Open a dash scope.
--        :parameter scope_name: The name of the scope.
++        :parameter scope_id: The id of the scope.
          :return: The scope.
          """
--        scope_id = "%s.scope" % scope_name
          scope_loader = self._get_scope_loader(scope_id)
          if scope_loader.isCurrent:
              logger.info('The scope is already open.')
@@ -84,7 +80,7 @@
                  'No scope found with id {0}'.format(scope_id))
      def _get_scope_from_loader(self, loader):
--        if loader.scopeId == 'applications.scope':
++        if loader.scopeId == 'clickscope':
              return loader.select_single(DashApps)
          else:
              return loader.select_single(GenericScopeView)
@@ -115,7 +111,7 @@
          original_index = self.dash_content_list.currentIndex
          # Scroll on the border of the page header, because some scopes have
          # contents that can be scrolled horizontally.
--        page_header = self.select_single('PageHeader')
++        page_header = self._get_page_header()
          border = page_header.select_single('QQuickBorderImage')
          start_x = border.width / 3
          stop_x = border.width / 3 * 2
@@ -123,12 +119,15 @@
          self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
          self.dash_content_list.currentIndex.wait_for(original_index - 1)
++    def _get_page_header(self):
++        return self.select_single('PageHeader', objectName='pageHeader')
++
      @autopilot_logging.log_action(logger.info)
      def _scroll_to_right_scope(self):
          original_index = self.dash_content_list.currentIndex
          # Scroll on the border of the page header, because some scopes have
          # contents that can be scrolled horizontally.
--        page_header = self.select_single('PageHeader')
++        page_header = self._get_page_header()
          border = page_header.select_single('QQuickBorderImage')
          start_x = border.width / 3 * 2
          stop_x = border.width / 3
@@ -137,24 +136,9 @@
          self.dash_content_list.currentIndex.wait_for(original_index + 1)
--class DashPreview(emulators.UnityEmulatorBase):
--    """Autopilot emulator for the generic preview."""
--
--    def get_details(self):
--        """Return the details of the open preview."""
--        title = self.select_single('Label', objectName='titleLabel').text
--        subtitle = self.select_single(
--            'Label', objectName='subtitleLabel').text
--        description = self.select_single(
--            'Label', objectName='descriptionLabel').text
--        return dict(title=title, subtitle=subtitle, description=description)
--
--
  class GenericScopeView(emulators.UnityEmulatorBase):
      """Autopilot emulator for generic scopes."""
--    preview_class = DashPreview
--
      @autopilot_logging.log_action(logger.info)
      def open_preview(self, category, app_name):
          """Open the preview of an application.
@@ -164,15 +148,13 @@
          """
          category_element = self._get_category_element(category)
--        icon = category_element.select_single('Tile', text=app_name)
++        icon = category_element.select_single('Card', title=app_name)
          # FIXME some categories need a long press in order to see the preview.
          # Some categories do not show previews, like recent apps.
          # --elopio - 2014-1-14
          self.pointing_device.click_object(icon)
--        preview = self.get_root_instance().wait_select_single(
--            self.preview_class, isCurrent=True)
--        preview.showProcessingAction.wait_for(False)
--        return preview
++        return self.get_root_instance().wait_select_single(
++            'PreviewListView', objectName='dashContentPreviewList')
      def _get_category_element(self, category):
          try:
@@ -183,24 +165,9 @@
                  'No category found with name {}'.format(category))
--class AppPreview(DashPreview):
--    """Autopilot emulator for the application preview."""
--
--    def get_details(self):
--        """Return the details of the application showed in its preview."""
--        details = super(AppPreview, self).get_details()
--        # TODO return screenshots, icon, rating and reviews.
--        # --elopio - 2014-1-15
--        return dict(
--            title=details.get('title'), publisher=details.get('subtitle'),
--            description=details.get('description'))
--
--
  class DashApps(GenericScopeView):
      """Autopilot emulator for the applications scope."""
--    preview_class = AppPreview
--
      def get_applications(self, category):
          """Return the list of applications on a category.
@@ -208,7 +175,11 @@
          """
          category_element = self._get_category_element(category)
--        application_tiles = category_element.select_many('Tile')
++        application_tiles = category_element.select_many('Card')
          # TODO return them on the same order they are displayed.
          # --elopio - 2014-1-15
--        return [tile.text for tile in application_tiles]
++        result = []
++        for card in application_tiles:
++            if card.objectName != 'cardToolCard':
++                result.append(card)
++        return result
 === modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
 --- tests/autopilot/unity8/shell/emulators/main_window.py	2014-02-12 06:11:16 +0000
 +++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-03-18 10:57:24 +0000
@@ -42,10 +42,6 @@
              objectName="greeterContentLoader"
+         )
--    def get_greeter_background(self):
--        return self.select_single(
--            "CrossFadeImage", objectName="greeterBackground")
--
      def get_login_loader(self):
          return self.select_single("QQuickLoader", objectName="loginLoader")
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2014-02-22 00:12:49 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2014-03-18 10:57:24 +0000
@@ -376,7 +376,7 @@
      def assertUnityReady(self):
          dash = self.get_dash()
--        home_scope = dash.get_scope('home')
++        home_scope = dash.get_scope('clickscope')
          # FIXME! There is a huge timeout here for when we're doing CI on
          # VMs. See lp:1203715
 === modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
 --- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-02-22 00:12:49 +0000
 +++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-03-18 10:57:24 +0000
@@ -60,14 +60,13 @@
                  self.dash.open_scope, scope_name)
          self.assertEqual(
--            'No scope found with id unexisting.scope', str(exception))
++            'No scope found with id unexisting', str(exception))
          self.assertFalse(mock_pointer.called)
      def test_open_already_opened_scope(self):
          scope_id = self._get_current_scope_id()
          with mock.patch.object(self.dash, 'pointing_device') as mock_pointer:
--            scope = self.dash.open_scope(self._get_scope_name_from_id(
--                scope_id))
++            scope = self.dash.open_scope(scope_id)
          self.assertFalse(mock_pointer.called)
          self._assert_scope_is_opened(scope, scope_id)
@@ -83,12 +82,11 @@
          return scope.scopeId
      def test_open_scope_to_the_right(self):
--        leftmost_scope = self._get_scope_name_from_id(
--            self._get_leftmost_scope_id())
++        leftmost_scope = self._get_leftmost_scope_id()
          self.dash.open_scope(leftmost_scope)
          scope_id = self._get_rightmost_scope_id()
--        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
++        scope = self.dash.open_scope(scope_id)
          self._assert_scope_is_opened(scope, scope_id)
      def _get_leftmost_scope_id(self):
@@ -104,10 +102,6 @@
              'QQuickItem')[0]
          return item.get_children_by_type('QQuickLoader')
--    def _get_scope_name_from_id(self, scope_id):
--        if scope_id.endswith('.scope'):
--            return scope_id[:-6]
--
      def _get_rightmost_scope_id(self):
          scope_loaders = self._get_scope_loaders()
          rightmost_scope_loader = scope_loaders[0]
@@ -117,23 +111,22 @@
          return rightmost_scope_loader.scopeId
      def test_open_scope_to_the_left(self):
--        rightmost_scope = self._get_scope_name_from_id(
--            self._get_rightmost_scope_id())
++        rightmost_scope = self._get_rightmost_scope_id()
          self.dash.open_scope(rightmost_scope)
          scope_id = self._get_leftmost_scope_id()
--        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
++        scope = self.dash.open_scope(scope_id)
          self._assert_scope_is_opened(scope, scope_id)
      def test_open_generic_scope(self):
--        scope_id = 'home.scope'
--        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
++        scope_id = 'scopes'
++        scope = self.dash.open_scope(scope_id)
          self._assert_scope_is_opened(scope, scope_id)
          self.assertIsInstance(scope, dash_emulators.GenericScopeView)
      def test_open_applications_scope(self):
--        scope_id = 'applications.scope'
--        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
++        scope_id = 'clickscope'
++        scope = self.dash.open_scope(scope_id)
          self._assert_scope_is_opened(scope, scope_id)
          self.assertIsInstance(scope, dash_emulators.DashApps)
@@ -144,36 +137,24 @@
          # Set up the fake scopes before launching unity.
          self.useFixture(fixture_setup.FakeScopes())
          super(GenericScopeViewEmulatorTestCase, self).setUp()
--        self.home_scope = self.dash.open_scope('home')
++        self.generic_scope = self.dash.open_scope('MockScope1')
      def test_open_preview(self):
--        preview = self.home_scope.open_preview('0', 'Title.0')
--        self.assertIsInstance(preview, dash_emulators.DashPreview)
--        self.assertTrue(preview.isCurrent)
--        self.assertFalse(preview.showProcessingAction)
--
--    def test_get_details(self):
--        expected_details = dict(
--            title='Title', subtitle='Subtitle', description='Description')
--
--        preview = self.home_scope.open_preview('0', 'Title.0')
--        details = preview.get_details()
--
--        self.assertEqual(expected_details, details)
--
++        preview = self.generic_scope.open_preview('0', 'Title.0.0')
++        preview.x.wait_for(0)
  class DashAppsEmulatorTestCase(DashBaseTestCase):
      available_applications = [
--        'Title.1', 'Title.21', 'Title.41',  'Title.61', 'Title.81',
--        'Title.101', 'Title.121', 'Title.141', 'Title.161', 'Title.181',
--        'Title.201', 'Title.221', 'Title.241', 'Title.261', 'Title.281']
++        'Title.2.0', 'Title.2.1', 'Title.2.2',  'Title.2.3', 'Title.2.4',
++        'Title.2.5', 'Title.2.6', 'Title.2.7',  'Title.2.8', 'Title.2.9',
++        'Title.2.9', 'Title.2.10', 'Title.2.11']
      def setUp(self):
          # Set up the fake scopes before launching unity.
          self.useFixture(fixture_setup.FakeScopes())
          super(DashAppsEmulatorTestCase, self).setUp()
--        self.applications_scope = self.dash.open_scope('applications')
++        self.applications_scope = self.dash.open_scope('clickscope')
      def test_get_applications_with_unexisting_category(self):
          exception = self.assertRaises(
@@ -185,34 +166,27 @@
              'No category found with name unexisting category', str(exception))
      def test_get_applications_should_return_list_with_names(self):
--        category = 'installed'
++        category = '2'
          expected_apps_count = self._get_number_of_application_slots(category)
          expected_applications = self.available_applications[
              :expected_apps_count]
          applications = self.applications_scope.get_applications(category)
++        applications_titles = []
++        for application in applications:
++            cardHeader = application.select_single('CardHeader')
++            applications_titles.append(cardHeader.title)
          self.assertThat(applications, HasLength(expected_apps_count))
          for expected in expected_applications:
--            self.assertThat(applications, Contains(expected))
++            self.assertThat(applications_titles, Contains(expected))
      def _get_number_of_application_slots(self, category):
          category_element = self.applications_scope._get_category_element(
              category)
--        grid = category_element.select_single('GenericFilterGrid')
++        grid = category_element.select_single('CardFilterGrid')
          return grid.columns * grid.rows
      def test_open_preview(self):
--        preview = self.applications_scope.open_preview('installed', 'Title.1')
--        self.assertIsInstance(preview, dash_emulators.AppPreview)
--        self.assertTrue(preview.isCurrent)
--        self.assertFalse(preview.showProcessingAction)
--
--    def test_get_details(self):
--        expected_details = dict(
--            title='Title', publisher='', description='Description')
--
--        preview = self.applications_scope.open_preview('installed', 'Title.1')
--        details = preview.get_details()
--
--        self.assertEqual(expected_details, details)
++        preview = self.applications_scope.open_preview('2', 'Title.2.1')
++        preview.x.wait_for(0)
 === removed file 'tests/autopilot/unity8/shell/tests/test_greeter.py'
 --- tests/autopilot/unity8/shell/tests/test_greeter.py	2013-10-22 15:59:23 +0000
 +++ tests/autopilot/unity8/shell/tests/test_greeter.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
--# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--#
--# Unity Autopilot Test Suite
--# Copyright (C) 2012-2013 Canonical
--#
--# 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, either version 3 of the License, or
--# (at your option) any later version.
--#
--# 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/>.
--#
--
--from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
--
--from testtools.matchers import Equals
--
--class TestGreeter(UnityTestCase):
--
--    """Tests the Shell Greeter."""
--
--    scenarios = _get_device_emulation_scenarios()
--
--    def test_greeter_background(self):
--        """Test that the background of the greeter and the background of the shell are placed correctly
--
--        """
--        self.launch_unity()
--        self.main_window.get_greeter()
--        greeter_background = self.main_window.get_greeter_background()
--        shell_background = self.main_window.get_shell_background()
--        self.assertThat(greeter_background.globalRect, Equals(shell_background.globalRect))
 === modified file 'tests/mocks/Unity/CMakeLists.txt'
 --- tests/mocks/Unity/CMakeLists.txt	2014-02-07 09:55:56 +0000
 +++ tests/mocks/Unity/CMakeLists.txt	2014-03-18 10:57:24 +0000
@@ -18,14 +18,14 @@
  add_definitions(-DQT_NO_KEYWORDS)
  set(UnityQML_SOURCES
--  categoryresults.cpp
    iconutils.cpp
--  fake_applications_scope.cpp
--  fake_preview.cpp
    fake_scope.cpp
    fake_scopes.cpp
    fake_categories.cpp
--  scopes-ng/fake_preview_model.cpp
++  fake_resultsmodel.cpp
++  fake_previewmodel.cpp
++  fake_previewstack.cpp
++  fake_previewwidgetmodel.cpp
    fake_unity_plugin.cpp
+ )
 === removed file 'tests/mocks/Unity/categoryresults.cpp'
 --- tests/mocks/Unity/categoryresults.cpp	2013-11-12 18:21:40 +0000
 +++ tests/mocks/Unity/categoryresults.cpp	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * Authors:
-- *  Michal Hruby <michal.hruby@canonical.com>
-- *
-- * 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/>.
-- */
--
--// self
--#include "categoryresults.h"
--#include "iconutils.h"
--
--// TODO: use something from libunity once it's public
--enum ResultsColumn {
--    URI,
--    ICON_HINT,
--    CATEGORY,
--    RESULT_TYPE,
--    MIMETYPE,
--    TITLE,
--    COMMENT,
--    DND_URI,
--    METADATA
--};
--
--CategoryResults::CategoryResults(QObject* parent)
--    : DeeListModel(parent)
--    , m_categoryIndex(-1)
--{
--    m_roles[CategoryResults::RoleUri] = "uri";
--    m_roles[CategoryResults::RoleIconHint] = "icon";
--    m_roles[CategoryResults::RoleCategory] = "category";
--    m_roles[CategoryResults::RoleMimetype] = "mimetype";
--    m_roles[CategoryResults::RoleTitle] = "title";
--    m_roles[CategoryResults::RoleComment] = "comment";
--    m_roles[CategoryResults::RoleDndUri] = "dndUri";
--    m_roles[CategoryResults::RoleMetadata] = "metadata";
--    m_roles[CategoryResults::RoleRendererHints] = "rendererHints";
--}
--
--int CategoryResults::categoryIndex() const
--{
--    return m_categoryIndex;
--}
--
--void CategoryResults::setCategoryIndex(int index)
--{
--    if (m_categoryIndex != index) {
--        m_categoryIndex = index;
--        Q_EMIT categoryIndexChanged(m_categoryIndex);
--    }
--}
--
--QHash<int, QByteArray>
--CategoryResults::roleNames() const
--{
--    return m_roles;
--}
--
--QVariant
--CategoryResults::data(const QModelIndex& index, int role) const
--{
--    if (!index.isValid()) {
--        return QVariant();
--    }
--
--    switch (role) {
--        case RoleUri:
--            return DeeListModel::data(index, ResultsColumn::URI);
--        case RoleIconHint: {
--            QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());
--            if (giconString.isEmpty()) {
--                QString mimetype(DeeListModel::data(index, ResultsColumn::MIMETYPE).toString());
--                QString uri(DeeListModel::data(index, ResultsColumn::URI).toString());
--                QString thumbnailerUri(uriToThumbnailerProviderString(uri, mimetype, DeeListModel::data(index, ResultsColumn::METADATA).toHash()));
--                if (!thumbnailerUri.isNull()) {
--                    return QVariant::fromValue(thumbnailerUri);
--                }
--            }
--            return QVariant::fromValue(gIconToDeclarativeImageProviderString(giconString));
--        }
--        case RoleCategory:
--            return DeeListModel::data(index, ResultsColumn::CATEGORY);
--        case RoleMimetype:
--            return DeeListModel::data(index, ResultsColumn::MIMETYPE);
--        case RoleTitle:
--            return DeeListModel::data(index, ResultsColumn::TITLE);
--        case RoleComment:
--            return DeeListModel::data(index, ResultsColumn::COMMENT);
--        case RoleDndUri:
--            return DeeListModel::data(index, ResultsColumn::DND_URI);
--        case RoleMetadata:
--            return DeeListModel::data(index, ResultsColumn::METADATA);
--        case RoleRendererHints:
--        {
--            QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());
--            if (hash.contains("content")) {
--                QVariantMap hints;
--                QVariantHash innerHash(hash["content"].toHash());
--                if (innerHash.contains("scope_disabled")) {
--                    hints["scope_disabled"] = innerHash["scope_disabled"];
--                }
--                return hints.empty() ? QVariant() : QVariant::fromValue(hints);
--            }
--            return QVariant();
--        }
--        default:
--            return QVariant();
--    }
--}
 === removed file 'tests/mocks/Unity/categoryresults.h'
 --- tests/mocks/Unity/categoryresults.h	2013-11-12 18:21:40 +0000
 +++ tests/mocks/Unity/categoryresults.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * Authors:
-- *  Michal Hruby <michal.hruby@canonical.com>
-- *
-- * 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/>.
-- */
--
--
--#ifndef CATEGORY_RESULTS_H
--#define CATEGORY_RESULTS_H
--
--// dee-qt
--#include "deelistmodel.h"
--
--class Q_DECL_EXPORT CategoryResults : public DeeListModel
--{
--    Q_OBJECT
--
--    Q_ENUMS(Roles)
--
--    Q_PROPERTY(int categoryIndex READ categoryIndex WRITE setCategoryIndex NOTIFY categoryIndexChanged)
--
--public:
--    explicit CategoryResults(QObject* parent = 0);
--
--    enum Roles {
--        RoleUri,
--        RoleIconHint,
--        RoleCategory,
--        RoleMimetype,
--        RoleTitle,
--        RoleComment,
--        RoleDndUri,
--        RoleMetadata,
--        RoleRendererHints
--    };
--
--    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
--
--    QHash<int, QByteArray> roleNames() const;
--
--    /* getters */
--    int categoryIndex() const;
--
--    /* setters */
--    void setCategoryIndex(int index);
--
--Q_SIGNALS:
--    void categoryIndexChanged(int index);
--
--private:
--    QHash<int, QByteArray> m_roles;
--    int m_categoryIndex;
--};
--
--#endif // CATEGORY_RESULTS_H
 === removed file 'tests/mocks/Unity/fake_applications_scope.cpp'
 --- tests/mocks/Unity/fake_applications_scope.cpp	2014-01-16 17:39:35 +0000
 +++ tests/mocks/Unity/fake_applications_scope.cpp	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
--/*
-- * Copyright (C) 2013, 2014 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/>.
-- */
--
--#include "fake_applications_scope.h"
--
--static const gchar * categories_model_schema[] = {
--    "s", //ID
--    "s", // DISPLAY_NAME
--    "s", // ICON_HINT
--    "s", // RENDERER_NAME
--    "a{sv}" // HINTS
--};
--
--ApplicationsScope::ApplicationsScope(bool visible, QObject* parent)
--    : Scope(parent)
--{
--    m_id = "applications.scope";
--    m_name = "Applications";
--    m_visible = visible;
--    m_previewRendererName = "preview-application";
--    m_categories->setModel(createCategoriesModel());
--}
--
--DeeModel* ApplicationsScope::createCategoriesModel()
--{
--    DeeModel* category_model = dee_sequence_model_new();
--    dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));
--    GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);
--
--    GVariant* children[1];
--    children[0] = g_variant_new_dict_entry(g_variant_new_string("content-type"),
--                                           g_variant_new_variant(g_variant_new_string("apps")));
--    GVariant* recentHints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), children, 1);
--    dee_model_append(category_model,
--                     "recent",
--                     "Recent",
--                     "gtk-apply",
--                     "special",
--                     recentHints);
--
--    dee_model_append(category_model,
--                     "installed",
--                     "Installed",
--                     "gtk-apply",
--                     "grid",
--                     hints);
--
--    dee_model_append(category_model,
--                     "suggested",
--                     "Suggested",
--                     "gtk-apply",
--                     "grid",
--                     hints);
--
--    dee_model_append(category_model,
--                     "outdated",
--                     "Outdaded",
--                     "gtk-apply",
--                     "grid",
--                     hints);
--
--    return category_model;
--}
 === removed file 'tests/mocks/Unity/fake_applications_scope.h'
 --- tests/mocks/Unity/fake_applications_scope.h	2013-09-02 20:34:05 +0000
 +++ tests/mocks/Unity/fake_applications_scope.h	1970-01-01 00:00:00 +0000
@@ -1,33 +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/>.
-- */
--
--#ifndef FAKE_APPLICATIONS_SCOPE_H
--#define FAKE_APPLICATIONS_SCOPE_H
--
--#include "fake_scope.h"
--
--class ApplicationsScope : public Scope
--{
--    Q_OBJECT
--
--public:
--    ApplicationsScope(bool visible, QObject* parent = 0);
--
--private:
--    DeeModel* createCategoriesModel();
--};
--
--#endif // FAKE_APPLICATIONS_SCOPE_H
 === modified file 'tests/mocks/Unity/fake_categories.cpp'
 --- tests/mocks/Unity/fake_categories.cpp	2013-10-02 13:02:16 +0000
 +++ tests/mocks/Unity/fake_categories.cpp	2014-03-18 10:57:24 +0000
@@ -19,100 +19,21 @@
  // self
  #include "fake_categories.h"
--// local
--#include "categoryresults.h"
--
--#define CATEGORY_COLUMN 2
--
--// TODO: use something from libunity once it's public
--enum CategoryColumn {
--    ID,
--    DISPLAY_NAME,
--    ICON_HINT,
--    RENDERER_NAME,
--    HINTS
--};
--
--Categories::Categories(QObject* parent)
--    : DeeListModel(parent)
++#include "fake_resultsmodel.h"
++
++Categories::Categories(int category_count, QObject* parent)
++    : QAbstractListModel(parent)
++    , m_category_count(category_count)
+ {
--    // FIXME: need to clean up unused filters on countChanged
      m_roles[Categories::RoleCategoryId] = "categoryId";
      m_roles[Categories::RoleName] = "name";
      m_roles[Categories::RoleIcon] = "icon";
++    m_roles[Categories::RoleRawRendererTemplate] = "rawRendererTemplate";
      m_roles[Categories::RoleRenderer] = "renderer";
--    m_roles[Categories::RoleContentType] = "contentType";
--    m_roles[Categories::RoleRendererHint] = "rendererHint";
--    m_roles[Categories::RoleHints] = "hints";
++    m_roles[Categories::RoleComponents] = "components";
++    m_roles[Categories::RoleProgressSource] = "progressSource";
      m_roles[Categories::RoleResults] = "results";
      m_roles[Categories::RoleCount] = "count";
--
--    // TODO This should not be needed but accumulatting the count changes
--    // makes the visualization more stable and also makes crashes on fast
--    // change of the search term harder to reproduce
--    m_timer.setSingleShot(true);
--    m_timer.setInterval(50);
--    connect(&m_timer, SIGNAL(timeout()), this, SLOT(onEmitCountChanged()));
--}
--
--DeeListModel*
--Categories::getFilter(int index) const
--{
--    if (!m_filters.contains(index)) {
--        auto results = new CategoryResults ();
--        results->setCategoryIndex(index);
--        connect(results, SIGNAL(countChanged()), this, SLOT(onCountChanged()));
--
--        unsigned cat_index = static_cast<unsigned>(index);
--        auto model = getResultsForCategory(cat_index);
--        results->setModel(model);
--
--        m_filters.insert(index, results);
--    }
--
--    return m_filters[index];
--}
--
--void
--Categories::onCountChanged()
--{
--    DeeListModel* filter = qobject_cast<DeeListModel*>(sender());
--    if (filter) {
--        m_timerFilters << filter;
--        m_timer.start();
--    }
--}
--
--void Categories::onRowCountChanged()
--{
--    QAbstractItemModel* model = qobject_cast<QAbstractItemModel*>(sender());
--    // find the corresponding category index
--    for (auto iter = m_overriddenCategories.begin(); iter != m_overriddenCategories.end(); ++iter) {
--        if (iter.value() == model) {
--            for (int i = 0; i < rowCount(); i++) {
--                auto id = data(index(i), RoleCategoryId).toString();
--                if (id != iter.key()) continue;
--                QVector<int> roles;
--                roles.append(RoleCount);
--                QModelIndex changedIndex = index(i);
--                Q_EMIT dataChanged(changedIndex, changedIndex, roles);
--                break;
--            }
--        }
--    }
--}
--
--void
--Categories::onEmitCountChanged()
--{
--    QVector<int> roles;
--    roles.append(Categories::RoleCount);
--    Q_FOREACH(DeeListModel* results, m_timerFilters) {
--        auto cat_results = qobject_cast<CategoryResults*>(results);
--        QModelIndex changedIndex = index(cat_results->categoryIndex());
--        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
--    }
--    m_timerFilters.clear();
+ }
  QHash<int, QByteArray>
@@ -121,92 +42,44 @@
      return m_roles;
+ }
--void Categories::onOverrideModelDestroyed()
--{
--    QObject* model = sender();
--    auto iter = m_overriddenCategories.begin();
--    while (iter != m_overriddenCategories.end()) {
--        if (iter.value() == model) {
--            iter = m_overriddenCategories.erase(iter);
--            continue;
--        }
--        ++iter;
--    }
--}
--
--void Categories::overrideResults(const QString& categoryId, QAbstractItemModel* model)
--{
--    m_overriddenCategories[categoryId] = model;
--    // watch the model
--    connect(model, &QObject::destroyed, this, &Categories::onOverrideModelDestroyed);
--    connect(model, &QAbstractItemModel::rowsInserted, this, &Categories::onRowCountChanged);
--    connect(model, &QAbstractItemModel::rowsRemoved, this, &Categories::onRowCountChanged);
--    connect(model, &QAbstractItemModel::modelReset, this, &Categories::onRowCountChanged);
--
--    // emit the dataChanged signal if the category is already in the model
--    for (int i = 0; i < rowCount(); i++) {
--        auto id = data(index(i), RoleCategoryId).toString();
--        if (id != categoryId) continue;
--        QVector<int> roles;
--        roles.append(RoleCount);
--        roles.append(RoleResults);
--        QModelIndex changedIndex = index(i);
--        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
--        break;
--    }
--}
--
--void Categories::setResultModel(DeeModel* model)
--{
--  // FIXME: should ref it
--  m_dee_results = model;
--}
--
--
--static void category_filter_map_func (DeeModel* orig_model,
--                                      DeeFilterModel* filter_model,
--                                      gpointer user_data)
--{
--    DeeModelIter* iter;
--    DeeModelIter* end;
--    unsigned index = GPOINTER_TO_UINT(user_data);
--
--    iter = dee_model_get_first_iter(orig_model);
--    end = dee_model_get_last_iter(orig_model);
--    while (iter != end) {
--        unsigned category_index = dee_model_get_uint32(orig_model, iter, CATEGORY_COLUMN);
--        if (index == category_index) {
--            dee_filter_model_append_iter(filter_model, iter);
--        }
--        iter = dee_model_next(orig_model, iter);
--    }
--}
--
--static gboolean category_filter_notify_func (DeeModel* orig_model,
--                                             DeeModelIter* orig_iter,
--                                             DeeFilterModel* filter_model,
--                                             gpointer user_data)
--{
--    unsigned index = GPOINTER_TO_UINT(user_data);
--    unsigned category_index = dee_model_get_uint32(orig_model, orig_iter, CATEGORY_COLUMN);
--
--    if (index != category_index)
--        return FALSE;
--
--    dee_filter_model_insert_iter_with_original_order(filter_model, orig_iter);
--    return TRUE;
--}
--
--DeeModel* Categories::getResultsForCategory(unsigned cat_index) const
--{
--    DeeFilter filter;
--    filter.map_func = category_filter_map_func;
--    filter.map_notify = category_filter_notify_func;
--    filter.destroy = nullptr;
--    filter.userdata = GUINT_TO_POINTER(cat_index);
--
--    DeeModel* filtered_model = dee_filter_model_new(m_dee_results, &filter);
--    return filtered_model;
++int Categories::rowCount(const QModelIndex& /*parent*/) const
++{
++    return m_category_count + m_specialCategories.count();
++}
++
++void Categories::addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject)
++{
++    CategoryData catData;
++    catData.categoryId = categoryId;
++    catData.name = name;
++    catData.icon = icon;
++    catData.rawTemplate = rawTemplate;
++    catData.countObject = countObject;
++
++    beginInsertRows(QModelIndex(), 0, 0);
++    m_specialCategories.prepend(catData);
++    endInsertRows();
++
++    if (countObject) {
++        connect(countObject, SIGNAL(countChanged()), this, SLOT(countChanged()));
++    }
++}
++
++void Categories::countChanged()
++{
++    QObject* countObject = sender();
++
++    for (int i = 0; i < m_specialCategories.count(); ++i) {
++        const CategoryData &catData = m_specialCategories.at(i);
++        if (catData.countObject == countObject) {
++            QVector<int> roles;
++            roles.append(RoleCount);
++
++            QModelIndex changedIndex(index(i));
++            dataChanged(changedIndex, changedIndex, roles);
++            break;
++        }
++    }
+ }
  QVariant
@@ -216,44 +89,86 @@
          return QVariant();
+     }
--    switch (role) {
--        case RoleCategoryId:
--            return DeeListModel::data(index, CategoryColumn::ID);
--        case RoleName:
--            return DeeListModel::data(index, CategoryColumn::DISPLAY_NAME);
--        case RoleIcon:
--            return DeeListModel::data(index, CategoryColumn::ICON_HINT);
--        case RoleRenderer:
--            return DeeListModel::data(index, CategoryColumn::RENDERER_NAME);
--        case RoleContentType:
--        {
--            auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
--            return  hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));
--        }
--        case RoleRendererHint:
--        {
--            auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
--            return  hints.contains("renderer-hint") ? hints["renderer-hint"] : QVariant(QString());
--        }
--        case RoleHints:
--            return DeeListModel::data(index, CategoryColumn::HINTS);
--        case RoleResults:
--            if (m_overriddenCategories.size() > 0)
--            {
--                auto id = DeeListModel::data(index, CategoryColumn::ID).toString();
--                if (m_overriddenCategories.find(id) != m_overriddenCategories.end())
--                    return QVariant::fromValue(m_overriddenCategories[id]);
--            }
--            return QVariant::fromValue(getFilter(index.row()));
--        case RoleCount:
--            if (m_overriddenCategories.size() > 0)
--            {
--                auto id = DeeListModel::data(index, CategoryColumn::ID).toString();
--                if (m_overriddenCategories.find(id) != m_overriddenCategories.end())
--                    return QVariant::fromValue(m_overriddenCategories[id]->rowCount());
--            }
--            return QVariant::fromValue(getFilter(index.row())->rowCount());
--        default:
--            return QVariant();
++    ResultsModel *resultsModel = m_resultsModels[index.row()];
++    if (!resultsModel) {
++        resultsModel = new ResultsModel(15, index.row());
++        m_resultsModels[index.row()] = resultsModel;
++    }
++    if (index.row() < m_specialCategories.count()) {
++        const CategoryData &catData = m_specialCategories.at(index.row());
++        switch (role) {
++            case RoleCategoryId:
++                return catData.categoryId;
++            case RoleName:
++                return catData.name;
++            case RoleIcon:
++                return catData.icon;
++            case RoleRawRendererTemplate:
++                return catData.rawTemplate;
++            case RoleRenderer:
++            {
++                QVariantMap map;
++                map["category-layout"] = index.row() % 2 == 0 ? "grid" : "carousel";
++                map["card-size"] = "small";
++                return map;
++            }
++            case RoleComponents:
++            {
++                QVariantMap map, artMap;
++                artMap["aspect-ratio"] = "1.0";
++                artMap["field"] = "art";
++                map["art"] = artMap;
++                map["title"] = "HOLA";
++                return map;
++            }
++            case RoleProgressSource:
++                qFatal("Using un-implemented RoleProgressSource Categories role");
++                return QVariant();
++            case RoleResults:
++                return QVariant();
++            case RoleCount:
++                return catData.countObject->property("count");
++            default:
++                qFatal("Using un-implemented Categories role");
++                return QVariant();
++        }
++    } else {
++        switch (role) {
++            case RoleCategoryId:
++                return QString("%1").arg(index.row());
++            case RoleName:
++                return QString("Category %1").arg(index.row());
++            case RoleIcon:
++                return "gtk-apply";
++            case RoleRawRendererTemplate:
++                qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
++                return QVariant();
++            case RoleRenderer:
++            {
++                QVariantMap map;
++                map["category-layout"] = index.row() % 2 == 0 ? "grid" : "carousel";
++                map["card-size"] = "small";
++                return map;
++            }
++            case RoleComponents:
++            {
++                QVariantMap map, artMap;
++                artMap["aspect-ratio"] = "1.0";
++                artMap["field"] = "art";
++                map["art"] = artMap;
++                map["title"] = "HOLA";
++                return map;
++            }
++            case RoleProgressSource:
++                qFatal("Using un-implemented RoleProgressSource Categories role");
++                return QVariant();
++            case RoleResults:
++                return QVariant::fromValue(resultsModel);
++            case RoleCount:
++                return resultsModel->rowCount();
++            default:
++                qFatal("Using un-implemented Categories role");
++                return QVariant();
++        }
+     }
+ }
 === modified file 'tests/mocks/Unity/fake_categories.h'
 --- tests/mocks/Unity/fake_categories.h	2013-10-02 13:02:16 +0000
 +++ tests/mocks/Unity/fake_categories.h	2014-03-18 10:57:24 +0000
@@ -18,58 +18,54 @@
  #define FAKE_CATEGORIES_H
  // Qt
--#include <QObject>
--#include <QSet>
--#include <QTimer>
--
--#include <dee.h>
--#include <deelistmodel.h>
--
--class Categories : public DeeListModel
++#include <QAbstractListModel>
++#include <QList>
++
++class ResultsModel;
++
++class Categories : public QAbstractListModel
+ {
      Q_OBJECT
      Q_ENUMS(Roles)
  public:
--    Categories(QObject* parent = 0);
++    Categories(int category_count, QObject* parent = 0);
      enum Roles {
          RoleCategoryId,
          RoleName,
          RoleIcon,
++        RoleRawRendererTemplate,
          RoleRenderer,
--        RoleContentType,
--        RoleRendererHint,
--        RoleHints,
++        RoleComponents,
++        RoleProgressSource, // maybe
          RoleResults,
          RoleCount
      };
--    Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);
--
--    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
--
--    QHash<int, QByteArray> roleNames() const;
--
--    /* setters */
--    void setResultModel(DeeModel* model);
++    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
++    QHash<int, QByteArray> roleNames() const override;
++    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
++
++    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject);
  private Q_SLOTS:
--    void onCountChanged();
--    void onRowCountChanged();
--    void onEmitCountChanged();
--    void onOverrideModelDestroyed();
++    void countChanged();
  private:
--    DeeModel* getResultsForCategory(unsigned index) const;
--    DeeListModel* getFilter(int index) const;
--
--    DeeModel* m_dee_results;
--    QTimer m_timer;
--    QSet<DeeListModel*> m_timerFilters;
++    mutable QHash<int, ResultsModel*> m_resultsModels;
      QHash<int, QByteArray> m_roles;
--    QMap<QString, QAbstractItemModel*> m_overriddenCategories;
--    mutable QMap<int, DeeListModel*> m_filters;
++    int m_category_count;
++
++    struct CategoryData {
++        QString categoryId;
++        QString name;
++        QString icon;
++        QString rawTemplate;
++        QObject* countObject;
++    };
++
++    QList<CategoryData> m_specialCategories;
  };
  #endif // FAKE_CATEGORIES_H
 === removed file 'tests/mocks/Unity/fake_preview.cpp'
 --- tests/mocks/Unity/fake_preview.cpp	2014-01-16 17:39:35 +0000
 +++ tests/mocks/Unity/fake_preview.cpp	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
--/*
-- * Copyright (C) 2013, 2014 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/>.
-- */
--
--#include "fake_preview.h"
--
--Preview::Preview(const QString &rendererName, QObject *parent):
--    QObject(parent),
--    m_rendererName(rendererName)
--{
--}
--
--QString Preview::rendererName() const
--{
--    return m_rendererName;
--}
--
--QString Preview::title() const
--{
--    return "Title";
--}
--
--QString Preview::subtitle() const
--{
--    return "Subtitle";
--}
--
--QString Preview::description() const
--{
--    return "Description";
--}
--
--QVariant Preview::actions()
--{
--    return QVariant();
--}
--
--QVariant Preview::infoHints()
--{
--    return QVariant();
--}
--
--QVariantMap Preview::infoHintsHash() const
--{
--    return QVariantMap();
--}
--
--QString Preview::image() const
--{
--    return "";
--}
--
--void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)
--{
--    Q_UNUSED(actionId);
--    Q_UNUSED(hints);
--}
--
--void Preview::cancelAction()
--{
--}
 === removed file 'tests/mocks/Unity/fake_preview.h'
 --- tests/mocks/Unity/fake_preview.h	2014-01-16 17:39:35 +0000
 +++ tests/mocks/Unity/fake_preview.h	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
--/*
-- * Copyright (C) 2013, 2014 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/>.
-- */
--
--#ifndef FAKE_PREVIEW_H
--#define FAKE_PREVIEW_H
--
--// Qt
--#include <QObject>
--#include <QString>
--#include <QMetaType>
--#include <QList>
--#include <QVariantMap>
--
--class Q_DECL_EXPORT Preview : public QObject
--{
--    Q_OBJECT
--
--    Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)
--    Q_PROPERTY(QString title READ title NOTIFY previewChanged)
--    Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)
--    Q_PROPERTY(QString description READ description NOTIFY previewChanged)
--    Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)
--    Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)
--    Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)
--    Q_PROPERTY(QString image READ image NOTIFY previewChanged)
--
--public:
--    explicit Preview(const QString &rendererName, QObject *parent = 0);
--
--    QString rendererName() const;
--    QString title() const;
--    QString subtitle() const;
--    QString description() const;
--    QVariant actions();
--    QVariant infoHints();
--    QVariantMap infoHintsHash() const;
--    QString image() const;
--
--    Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);
--
--    Q_INVOKABLE void cancelAction();
--
--Q_SIGNALS:
--    void previewChanged();
--
--private:
--    QString m_rendererName;
--};
--
--Q_DECLARE_METATYPE(Preview *)
--
--#endif // FAKE_PREVIEW_H
 === renamed file 'tests/mocks/Unity/scopes-ng/fake_preview_model.cpp' => 'tests/mocks/Unity/fake_previewmodel.cpp'
 --- tests/mocks/Unity/scopes-ng/fake_preview_model.cpp	2014-02-07 09:57:30 +0000
 +++ tests/mocks/Unity/fake_previewmodel.cpp	2014-03-18 10:57:24 +0000
@@ -19,78 +19,68 @@
   */
  // self
--#include "fake_preview_model.h"
++#include "fake_previewmodel.h"
++
++// local
++#include "fake_previewwidgetmodel.h"
  // Qt
--#include <QVariantMap>
--
--namespace scopes_ng
--{
--
--struct PreviewData
--{
--    QString id;
--    QString type;
--    QVariantMap data;
--
--    PreviewData(QString const& id_, QString const& type_, QVariantMap const& data_): id(id_), type(type_), data(data_)
--    {
--    }
--};
++#include <QDebug>
  PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)
+ {
--    m_roles[Roles::RoleWidgetId] = "widgetId";
--    m_roles[Roles::RoleType] = "type";
--    m_roles[Roles::RoleProperties] = "properties";
--
--    populateWidgets();
--}
--
--void PreviewModel::populateWidgets()
--{
--    beginResetModel();
--    m_previewWidgets.clear();
--    for (int i = 0; i <= 20; i++) {
--        // FIXME: the API will expose nicer getters soon, use those!
--        QVariantMap attributes;
--        attributes["text"] = QVariant::fromValue(QString("Widget %1").arg(i));
--        attributes["title"] = QVariant::fromValue(QString("Title %1").arg(i));
--        PreviewData* preview_data = new PreviewData(QString("widget-%1").arg(i), QString("text"), attributes);
--        m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
--    }
--    endResetModel();
--
--}
--
--void PreviewModel::triggered(QString widgetId, QString actionId, QVariantMap data)
--{
--    Q_EMIT actionTriggered(widgetId, actionId, data);
++    // we have one column by default
++    PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
++    m_previewWidgetModels.append(columnModel);
+ }
  QHash<int, QByteArray> PreviewModel::roleNames() const
+ {
--    return m_roles;
++    QHash<int, QByteArray> roles;
++
++    roles[Roles::RoleColumnModel] = "columnModel";
++
++    return roles;
++}
++
++void PreviewModel::setWidgetColumnCount(int count)
++{
++    if (count != 1) {
++        qWarning("PreviewModel::setWidgetColumnCount != 1 not implemented");
++    }
++}
++
++int PreviewModel::widgetColumnCount() const
++{
++    return 1;
++}
++
++bool PreviewModel::loaded() const
++{
++    return true;
++}
++
++bool PreviewModel::processingAction() const
++{
++    return false;
++}
++
++void PreviewModel::setProcessingAction(bool /*processing*/)
++{
++    qFatal("PreviewModel::setProcessingAction not implemented");
+ }
  int PreviewModel::rowCount(const QModelIndex&) const
+ {
--    return m_previewWidgets.size();
++    return m_previewWidgetModels.size();
+ }
  QVariant PreviewModel::data(const QModelIndex& index, int role) const
+ {
--    auto widget_data = m_previewWidgets.at(index.row());
      switch (role) {
--        case RoleWidgetId:
--            return widget_data->id;
--        case RoleType:
--            return widget_data->type;
--        case RoleProperties:
--            return widget_data->data;
++        case RoleColumnModel:
++            return QVariant::fromValue(m_previewWidgetModels.at(index.row()));
          default:
              return QVariant();
+     }
+ }
--
--} // namespace scopes_ng
 === renamed file 'tests/mocks/Unity/scopes-ng/fake_preview_model.h' => 'tests/mocks/Unity/fake_previewmodel.h'
 --- tests/mocks/Unity/scopes-ng/fake_preview_model.h	2014-02-07 09:55:56 +0000
 +++ tests/mocks/Unity/fake_previewmodel.h	2014-03-18 10:57:24 +0000
@@ -15,54 +15,53 @@
   */
--#ifndef NG_FAKE_PREVIEW_H
--#define NG_FAKE_PREVIEW_H
++#ifndef FAKE_PREVIEWMODEL_H
++#define FAKE_PREVIEWMODEL_H
  #include <QAbstractListModel>
  #include <QSharedPointer>
  #include <QVariantMap>
--namespace scopes_ng
--{
--
--class PreviewData;
--
--class Q_DECL_EXPORT PreviewModel : public QAbstractListModel
++class PreviewWidgetModel;
++
++class PreviewModel : public QAbstractListModel
+ {
      Q_OBJECT
      Q_ENUMS(Roles)
++    Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)
++    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
++    Q_PROPERTY(bool processingAction READ processingAction NOTIFY processingActionChanged)
++
  public:
      explicit PreviewModel(QObject* parent = 0);
      enum Roles {
--        RoleWidgetId,
--        RoleType,
--        RoleProperties
++        RoleColumnModel
      };
      QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
      QHash<int, QByteArray> roleNames() const override;
      int rowCount(const QModelIndex& parent = QModelIndex()) const override;
++    void setWidgetColumnCount(int count);
++    int widgetColumnCount() const;
++    bool loaded() const;
++    bool processingAction() const;
++    void setProcessingAction(bool processing);
++
  Q_SIGNALS:
--    void actionTriggered(QString widgetId, QString actionId, QVariantMap data);
--
--public Q_SLOTS:
--    void triggered(QString widgetId, QString actionId, QVariantMap data);
++    void widgetColumnCountChanged();
++    void loadedChanged();
++    void processingActionChanged();
++    void triggered(QString const&, QString const&, QVariantMap const&);
  private:
      QHash<int, QByteArray> m_roles;
--    QList<QSharedPointer<PreviewData>> m_previewWidgets;
--
--    void populateWidgets();
--
++    QList<PreviewWidgetModel*> m_previewWidgetModels;
  };
--} // namespace scopes_ng
--
--
--Q_DECLARE_METATYPE(scopes_ng::PreviewModel*)
--
--#endif // NG_FAKE_PREVIW_H
++Q_DECLARE_METATYPE(PreviewModel*)
++
++#endif // FAKE_PREVIEWMODEL_H
 === added file 'tests/mocks/Unity/fake_previewstack.cpp'
 --- tests/mocks/Unity/fake_previewstack.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_previewstack.cpp	2014-03-18 10:57:24 +0000
@@ -0,0 +1,76 @@
++/*
++ * Copyright (C) 2014 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/>.
++ */
++
++// self
++#include "fake_previewstack.h"
++
++// local
++#include "fake_previewmodel.h"
++#include "fake_scope.h"
++
++PreviewStack::PreviewStack(QObject* parent) : QAbstractListModel(parent)
++{
++    m_previews << new PreviewModel(this);
++}
++
++PreviewStack::~PreviewStack()
++{
++}
++
++QHash<int, QByteArray> PreviewStack::roleNames() const
++{
++    QHash<int, QByteArray> roles;
++
++    roles[Roles::RolePreviewModel] = "previewModel";
++
++    return roles;
++}
++
++void PreviewStack::setWidgetColumnCount(int columnCount)
++{
++    if (columnCount != 1) {
++        qFatal("PreviewStack::setWidgetColumnCount != 1 not implemented");
++    }
++}
++
++int PreviewStack::widgetColumnCount() const
++{
++    return 1;
++}
++
++int PreviewStack::rowCount(const QModelIndex&) const
++{
++    return m_previews.size();
++}
++
++PreviewModel* PreviewStack::get(int index) const
++{
++    if (index >= m_previews.size()) {
++        return nullptr;
++    }
++
++    return m_previews.at(index);
++}
++
++QVariant PreviewStack::data(const QModelIndex& index, int role) const
++{
++    switch (role) {
++        case RolePreviewModel:
++            return QVariant::fromValue(m_previews.at(index.row()));
++        default:
++            return QVariant();
++    }
++}
 === added file 'tests/mocks/Unity/fake_previewstack.h'
 --- tests/mocks/Unity/fake_previewstack.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_previewstack.h	2014-03-18 10:57:24 +0000
@@ -0,0 +1,61 @@
++/*
++ * Copyright (C) 2014 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/>.
++ */
++
++
++#ifndef FAKE_PREVIEWSTACK_H
++#define FAKE_PREVIEWSTACK_H
++
++#include <QAbstractListModel>
++#include <QSharedPointer>
++#include <QVariantMap>
++
++class PreviewModel;
++
++class PreviewStack : public QAbstractListModel
++{
++    Q_OBJECT
++
++    Q_ENUMS(Roles)
++
++    Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)
++
++public:
++    explicit PreviewStack(QObject* parent = 0);
++    virtual ~PreviewStack();
++
++    enum Roles {
++        RolePreviewModel
++    };
++
++    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
++    QHash<int, QByteArray> roleNames() const override;
++    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
++
++    Q_INVOKABLE PreviewModel* get(int index) const;
++
++    void setWidgetColumnCount(int columnCount);
++    int widgetColumnCount() const;
++
++Q_SIGNALS:
++    void widgetColumnCountChanged();
++
++private:
++    QList<PreviewModel*> m_previews;
++};
++
++Q_DECLARE_METATYPE(PreviewStack*)
++
++#endif // FAKE_PREVIEWSTACK_H
 === added file 'tests/mocks/Unity/fake_previewwidgetmodel.cpp'
 --- tests/mocks/Unity/fake_previewwidgetmodel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_previewwidgetmodel.cpp	2014-03-18 10:57:24 +0000
@@ -0,0 +1,86 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * Authors:
++ *  Michał Sawicz <michal.sawicz@canonical.com>
++ *  Michal Hruby <michal.hruby@canonical.com>
++ *
++ * 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/>.
++ */
++
++// self
++#include "fake_previewwidgetmodel.h"
++
++// Qt
++#include <QVariantMap>
++
++struct PreviewData
++{
++    QString id;
++    QString type;
++    QVariantMap data;
++
++    PreviewData(QString const& id_, QString const& type_, QVariantMap const& data_): id(id_), type(type_), data(data_)
++    {
++    }
++};
++
++PreviewWidgetModel::PreviewWidgetModel(QObject* parent) : QAbstractListModel(parent)
++{
++    m_roles[Roles::RoleWidgetId] = "widgetId";
++    m_roles[Roles::RoleType] = "type";
++    m_roles[Roles::RoleProperties] = "properties";
++
++    populateWidgets();
++}
++
++void PreviewWidgetModel::populateWidgets()
++{
++    beginResetModel();
++    m_previewWidgets.clear();
++    for (int i = 0; i <= 20; i++) {
++        // FIXME: the API will expose nicer getters soon, use those!
++        QVariantMap attributes;
++        attributes["text"] = QVariant::fromValue(QString("Widget %1").arg(i));
++        attributes["title"] = QVariant::fromValue(QString("Title %1").arg(i));
++        PreviewData* preview_data = new PreviewData(QString("widget-%1").arg(i), QString("text"), attributes);
++        m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
++    }
++    endResetModel();
++
++}
++
++QHash<int, QByteArray> PreviewWidgetModel::roleNames() const
++{
++    return m_roles;
++}
++
++int PreviewWidgetModel::rowCount(const QModelIndex&) const
++{
++    return m_previewWidgets.size();
++}
++
++QVariant PreviewWidgetModel::data(const QModelIndex& index, int role) const
++{
++    auto widget_data = m_previewWidgets.at(index.row());
++    switch (role) {
++        case RoleWidgetId:
++            return widget_data->id;
++        case RoleType:
++            return widget_data->type;
++        case RoleProperties:
++            return widget_data->data;
++        default:
++            return QVariant();
++    }
++}
 === added file 'tests/mocks/Unity/fake_previewwidgetmodel.h'
 --- tests/mocks/Unity/fake_previewwidgetmodel.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_previewwidgetmodel.h	2014-03-18 10:57:24 +0000
@@ -0,0 +1,56 @@
++/*
++ * Copyright (C) 2014 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/>.
++ */
++
++
++#ifndef FAKE_PREVIEWWIDGETMODEL_H
++#define FAKE_PREVIEWWIDGETMODEL_H
++
++#include <QAbstractListModel>
++#include <QSharedPointer>