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

[Michał Sawicz]

[lp:~unity-team/unity8/new-scopes]

563. By Michal Hruby on 2013-12-11

Merged trunk

564. By Michał Sawicz on 2013-12-12

merge trunk

565. By Michal Hruby on 2013-12-19

Merge trunk

566. By Michał Sawicz on 2014-01-02

Merge trunk.

567. By Michal Hruby on 2014-01-06

Merged trunk

568. By Michal Hruby on 2014-01-06

Bump module import version in scope tool

569. By Michał Sawicz on 2014-01-08

Get layout from category template.

570. By Michał Sawicz on 2014-01-08

Get components from the scope.

571. By Michał Sawicz on 2014-01-08

Initial Carousel integration.

572. By Michał Sawicz on 2014-01-08

Fix indentation, add name to the Card test suite.

573. By Michał Sawicz on 2014-01-09

Add copyright headers.

574. By Michał Sawicz on 2014-01-09

Merge trunk

575. By Michał Sawicz on 2014-01-09

Add name to tst_CardHeader.qml.

576. By Michał Karnicki on 2014-01-10

Horizontal Card layout.

577. By Michał Sawicz on 2014-01-10

Merge trunk.

578. By Michał Sawicz on 2014-01-10

Merge trunk.

579. By Michał Sawicz on 2014-01-16

Merge trunk.

580. By Michal Hruby on 2014-01-20

Update Unity plugin version req in PreviewListView.qml

581. By Michał Sawicz on 2014-01-27

Merge trunk.

582. By Michal Hruby on 2014-01-28

Merged trunk

583. By Michał Sawicz on 2014-01-29

Merge trunk.

584. By Michał Karnicki on 2014-01-29

Minimum number of items in the carousel is 5.

585. By Michał Sawicz on 2014-01-29

Merge trunk.

586. By Michal Hruby on 2014-01-31

Enable taps, pass correct params to preview and activate

587. By Michał Sawicz on 2014-01-31

Merge trunk.

588. By Michał Sawicz on 2014-02-04

Merge trunk.

589. By Michał Sawicz on 2014-02-04

Use CardTool in CardFilterGrid and CardCarousel.

590. By Michał Sawicz on 2014-02-04

Disable Card in CardCarousel to not eat any input.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:589
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/+merge/198359/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/2228/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2889
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2633/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/752
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/750
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2891
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2891/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2634
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2634/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5059/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3615

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/new-scopes]

591. By Michał Sawicz on 2014-02-07

lp:~saviq/unity8/fix-indicator-tests

592. By Michał Sawicz on 2014-02-07

lp:~saviq/unity8/card-tool

593. By Michał Sawicz on 2014-02-07

lp:~mterry/unity8/demo-users

594. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/unity8.previews_audioPlayer

595. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/unity8.previews_textSummary

596. By Michał Sawicz on 2014-02-07

lp:~aacid/unity8/image_gallery_preview_widget

597. By Michał Sawicz on 2014-02-07

lp:~ted/unity8/on-the-screen

598. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/action_preview_widget

599. By Michał Sawicz on 2014-02-07

lp:~saviq/unity8/new-preview

600. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/unity8-card-overlay

601. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/header-alignment

602. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/new-scopes-title-alignment

603. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/newscopes-card-overlay

604. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/newscopes-preview

605. By Albert Astals Cid on 2014-02-10

lp:~aacid/unity8/no_readonly_headerheight

606. By Albert Astals Cid on 2014-02-10

Merge lp:~unity-team/unity8/unity8-card-overlay again

607. By Michal Hruby on 2014-02-10

Display only top-level scopes when running on the device

608. By Michal Hruby on 2014-02-10

Pipe through stdout and stderr of the scopes

609. By Michał Karnicki on 2014-02-11

Merge newscopes-new-dash-look.

610. By Michal Hruby on 2014-02-11

Merge lp:~unity-team/unity8/unity8.preview_image

611. By Michal Hruby on 2014-02-11

Merge trunk

612. By Albert Astals Cid on 2014-02-12

Merge lp:~aacid/unity8/new-scopes-preview-fixes

613. By Michal Hruby on 2014-02-12

Merge trunk

614. By Michal Hruby on 2014-02-12

Re-merge lp:~unity-team/unity8/unity8.preview_image

615. By Michal Hruby on 2014-02-12

Merge lp:~aacid/unity8/apps-special-category

616. By Michal Hruby on 2014-02-12

Merge lp:~aacid/unity8/preview_header

617. By Michal Hruby on 2014-02-12

Merge lp:~unity-team/unity8/unity8.preview_video

618. By Michal Hruby on 2014-02-12

Re-merge lp:~unity-team/unity8/unity8.preview_video

619. By kevin gunn on 2014-02-12

merge in lp:~gerboland/unity8/sidestage-unlock-sidestage-appears

620. By kevin gunn on 2014-02-12

merge in lp:~gerboland/unity8/sidestage-unlock-sidestage-appears

621. By kevin gunn on 2014-02-12

merge in lp:~gerboland/unity8/sidestage-handle-input-area

622. By kevin gunn on 2014-02-12

whitespace update

623. By kevin gunn on 2014-02-12

update from trunk

624. By Albert Astals Cid on 2014-02-12

Merge lp:unity8

625. By Albert Astals Cid on 2014-02-12

Merge lp:~aacid/unity8/preview_progress

626. By Albert Astals Cid on 2014-02-13

Merge lp:~unity-team/unity8/new-scopes-fix-header-font

627. By Albert Astals Cid on 2014-02-13

Merge lp:~aacid/unity8/new-scopes-carousel-as-grid

628. By Albert Astals Cid on 2014-02-13

Merge lp:~aacid/unity8/fix-new-scopes-tab-name-missing

629. By Michal Hruby on 2014-02-13

Use PreviewStack and per-column widget models

630. By Albert Astals Cid on 2014-02-13

Merge lp:~aacid/unity8/new-scopes-header-fix

631. By Albert Astals Cid on 2014-02-13

Merge lp:~aacid/unity8/lvwph_resize_item_bug

632. By Albert Astals Cid on 2014-02-13

Merge lp:~aacid/unity8/new-scopes-preview-sometimes-disappears

633. By Michal Hruby on 2014-02-13

Remove blending rectangle, so previews aren't grey

634. By Michal Hruby on 2014-02-13

Merge lp:~unity-team/unity8/unity8-preview-summary-color

635. By Michal Hruby on 2014-02-13

Don't override scope list if already specified

636. By Michal Hruby on 2014-02-13

Fix the condition

637. By kevin gunn on 2014-02-14

merge in lp:~unity-team/unity8/rotate-n7 which is not to productized

638. By Michal Hruby on 2014-02-14

Merge lp:~aacid/unity8/misc_previewlist_fixes

639. By Michal Hruby on 2014-02-14

Re-merge lp:~unity-team/unity8/unity8-preview-summary-color

640. By Albert Astals Cid on 2014-02-14

Remerge lp:~unity-team/unity8/rotate-n7

641. By Albert Astals Cid on 2014-02-14

Merge lp:~aacid/unity8/new-scopes-dash-background-opacity

642. By Albert Astals Cid on 2014-02-14

Merge lp:~aacid/unity8/show_video_playback_screenshot_loading_indicator

643. By Michał Sawicz on 2014-02-17

Tweak recommended scopes.

644. By Albert Astals Cid on 2014-02-18

Merge lp:~unity-team/unity8/unity8-mascot-res-workaround

645. By Michał Sawicz on 2014-02-18

Make Click scope the default.

646. By Scott Sweeny on 2014-02-18

temporary fix for 'See more' and 'See less' text color in previews

647. By Michał Sawicz on 2014-02-18

Merge trunk.

648. By Michał Sawicz on 2014-02-18

Merge lp:~saviq/unity8/card-background

649. By Michał Sawicz on 2014-02-18

Fix running apps font.

650. By Michał Sawicz on 2014-02-18

Merge lp:~unity-team/unity8/new-scopes-scope-activation

651. By Michał Sawicz on 2014-02-18

Depend instead of Recommend the scopes, to make the image build work.

652. By Albert Astals Cid on 2014-02-19

Add back the workaround for not being able scroll the image gallery

Taken from AppPreview.qml

653. By Michał Karnicki on 2014-02-19

Update category label font color.

654. By Albert Astals Cid on 2014-02-19

Back button improvements

Move the back button to the header itself so it will be shown when the search is out too.
Make the back "button" bigger than the image

655. By Michał Karnicki on 2014-02-19

Change 'Running Apps' to 'Recent'.

656. By Michał Sawicz on 2014-02-19

Fix header colours and chevrons.

657. By Michał Sawicz on 2014-02-19

Directly activate scopes, too.

658. By Albert Astals Cid on 2014-02-19

Hotfix Dash header positioning

Make sure that after calling positionAtBeginning (what we do when swiping from an app back to the dash) the header is correctly in place
Also make sure the pageHeader position is not controlled by non curret scopes

659. By Michał Sawicz on 2014-02-19

Implement collapsed-rows support.

660. By Michał Sawicz on 2014-02-20

Clip dash when temporary visible.

661. By Michał Sawicz on 2014-02-20

Cache images in cards.

662. By Michał Sawicz on 2014-02-20

Resync.

663. By Michał Sawicz on 2014-02-20

Make sure SEARCH goes away when in previews.

664. By Michał Sawicz on 2014-02-20

Add preview columns support, fix spacing, clipping and cacheBuffer in previews.

665. By Albert Astals Cid on 2014-02-20

MouseArea -> AbstractButton to get haptics

666. By Jussi Pakkanen on 2014-02-20

Move downloads to their own threads so they don't muck about with the parent thread's event loop.

667. By Michał Sawicz on 2014-02-20

Merge trunk

668. By Michał Sawicz on 2014-02-20

Merge lp:~unity-team/unity8/themeing-font-and-mascot.

669. By Daniel d'Andrada on 2014-02-20

When focus is requested by the app manager, only call the correct stage.

Instead of activating both stages and letting the correct one work it out.

670. By Gerry Boland on 2014-02-20

[sidestage] hide side stage if all side stage apps are closed

671. By Michał Sawicz on 2014-02-20

Fix default background.

672. By Gerry Boland on 2014-02-20

[tablet] enable launcher in greeter when allowed

673. By Michał Sawicz on 2014-02-20

Add preview activity indicator and fix subsequent preview input.

674. By Michael Terry on 2014-02-20

Merge lp:~mterry/unity8/ensure-selected-greeter.

Ensure that the selected() signal is emitted by the greeter on startup, fixing the background on startup for the first user in tablet mode.

675. By Michał Sawicz on 2014-02-21

Make sure activity indicator is only on screen when preview available, and make image widget fit on screen.

676. By Michał Sawicz on 2014-02-21

Improve visuals and close preview on home button press.

677. By Michał Karnicki on 2014-02-21

Fix CardHeader title font weight.

678. By Michał Sawicz on 2014-02-21

Merge lp:~aacid/unity8/new-scopes-show-dash-app-running

679. By Gerry Boland on 2014-02-21

Prevent sidestage from popping out incorrectly when app launched indirectly

680. By Michał Sawicz on 2014-02-21

Update category chevrons.

681. By Michał Sawicz on 2014-02-21

Fix PageHeader centering.

682. By Albert Astals Cid on 2014-02-21

Merge lp:~aacid/unity8/new-scopes-dash-preview-fullscreen.

683. By Michał Sawicz on 2014-02-21

Merge lp:~mhr3/unity8/design-tweaks .

684. By Michał Karnicki on 2014-02-21

Add top/bottom gradients.

685. By Michał Sawicz on 2014-02-21

Merge trunk.

686. By Michał Karnicki on 2014-02-21

Don't show gradient in last category.

687. By Michał Sawicz on 2014-02-21

Revert r695, 'cause LazyImage gets confused with some images.

688. By Michał Sawicz on 2014-02-21

Fix whitespace.

689. By Michał Sawicz on 2014-02-21

Fix broken mereg.

690. By Michael Zanetti on 2014-02-21

Keep aspect ratio of app screenshots and crop them square.

691. By Michał Sawicz on 2014-02-21

Fix activity indicator.

692. By Michał Sawicz on 2014-02-22

Revert r690, 'cause it's racy.

693. By Michał Sawicz on 2014-02-22

Fix edge demos.

694. By Michał Sawicz on 2014-02-22

Merge fix in lp:~unity-team/unity8/unity8-category-gradients.

695. By Michał Sawicz on 2014-02-22

Add gradient to RunningApplicationsGrid, too, as it's not a DashRenderer...

696. By Michał Sawicz on 2014-02-22

Spurious logs...

697. By Michal Hruby on 2014-03-03

Merge trunk

698. By Michal Hruby on 2014-03-03

Fix missing line

699. By Michał Sawicz on 2014-03-05

Merge trunk.

700. By Michał Sawicz on 2014-03-05

Bring gradients back into DashRenderer, where they belong.

701. By Michał Sawicz on 2014-03-06

Merge lp:~aacid/unity8/new-scopes_do_not_request_previews_on_activate

702. By Albert Astals Cid on 2014-03-07

Merge lp:unity8

703. By Albert Astals Cid on 2014-03-07

Merge lp:~aacid/unity8/vjog_compiz_workaround

[Michał Sawicz (saviq)]

This is cleaned up to merge into trunk in: lp:~unity-team/unity8/new-scopes-clean-to-trunk

Unmerged revisions

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2014-02-27 21:56:42 +0000
+++ data/unity8.conf	2014-03-07 12:41:18 +0000
@@ -29,6 +29,11 @@
         gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
     fi
 
+    if [ -z "$UNITY_SCOPES_LIST" ]; then
+        # FIXME: remove once we have this in dconf
+        initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
+    fi
+
     # Remove the socket if still there
     if [ -S "$MIR_SERVER_FILE" ]; then
         rm "$MIR_SERVER_FILE"
 
=== modified file 'debian/control'
--- debian/control	2014-02-25 01:07:08 +0000
+++ debian/control	2014-03-07 12:41:18 +0000
@@ -96,7 +96,10 @@
          libcap2-bin,
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: ${unity-default-masterscopes},
+         unity-scope-scopes,
+         unity-scope-onlinemusic,
+         unity-scope-mediascanner2,
+         unity-scope-click,
 Breaks: indicator-network (<< 0.5.1)
 Replaces: ubuntu-touch-session (<< 0.82~)
 Description: Unity 8 shell
 
=== modified file 'debian/unity8.install'
--- debian/unity8.install	2013-11-29 08:32:05 +0000
+++ debian/unity8.install	2014-03-07 12:41:18 +0000
@@ -10,6 +10,7 @@
 usr/share/unity8/Notifications
 usr/share/unity8/Panel
 usr/share/unity8/Shell.qml
+usr/share/unity8/ShellOrientator.qml
 usr/share/unity8/SideStage
 usr/share/unity8/graphics
 data/unity8.conf usr/share/upstart/sessions/
 
=== modified file 'plugins/DashViews/listviewwithpageheader.cpp'
--- plugins/DashViews/listviewwithpageheader.cpp	2014-02-13 10:29:10 +0000
+++ plugins/DashViews/listviewwithpageheader.cpp	2014-03-07 12:41:18 +0000
@@ -366,6 +366,13 @@
         m_previousContentY = m_visibleItems.first()->y() - headerHeight;
     }
     setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);
+    if (m_headerItem) {
+        // TODO This should not be needed and the code that adjust the m_headerItem position
+        // in viewportMoved() should be enough but in some cases we have not found a way to reproduce
+        // yet the code of viewportMoved() fails so here we make sure that at least if we are calling
+        // positionAtBeginning the header item will be correctly positioned
+        m_headerItem->setY(-m_minYExtent);
+    }
 }
 
 void ListViewWithPageHeader::showHeader()
 
=== modified file 'po/ug.po'
--- po/ug.po	2014-02-19 05:44:29 +0000
+++ po/ug.po	2014-03-07 12:41:18 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-13 18:37+0000\n"
 "PO-Revision-Date: 2014-02-15 12:09+0000\n"
 "Last-Translator: Gheyret T.Kenji <Unknown>\n"
 "Language-Team: Uyghur <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'qml/Components/ApplicationManagerWrapper.qml'
--- qml/Components/ApplicationManagerWrapper.qml	2013-10-11 11:43:11 +0000
+++ qml/Components/ApplicationManagerWrapper.qml	2014-03-07 12:41:18 +0000
@@ -166,4 +166,12 @@
         }
         return desktopFile.substring(left+1, right);
     }
+
+    function setMainStageAppRect(item) {
+        ApplicationManager.setMainStageAppRect(item);
+    }
+
+    function setSideStageAppRect(item) {
+        ApplicationManager.setSideStageAppRect(item);
+    }
 }
 
=== modified file 'qml/Components/ApplicationScreenshot.qml'
--- qml/Components/ApplicationScreenshot.qml	2013-09-04 23:50:13 +0000
+++ qml/Components/ApplicationScreenshot.qml	2014-03-07 12:41:18 +0000
@@ -53,8 +53,7 @@
     ApplicationImage {
         id: applicationImage
         objectName: "screenshot image"
-        width: applicationScreenshot.application ? parent.width : 0
-        height: applicationScreenshot.application ? parent.height : 0
+        anchors.fill: parent
         visible: applicationScreenshot.application != null && ready
         source: ApplicationManager.findApplication((application) ? application.appId : "")
     }
 
=== modified file 'qml/Components/ListItems/Header.qml'
--- qml/Components/ListItems/Header.qml	2013-10-11 11:43:45 +0000
+++ qml/Components/ListItems/Header.qml	2014-03-07 12:41:18 +0000
@@ -36,7 +36,7 @@
             right: parent.right
             rightMargin: units.gu(0.5)
             top: parent.top
-            bottom: bottomBorder.top
+            bottom: parent.bottom
         }
 
         Label {
@@ -47,14 +47,11 @@
                 verticalCenter: parent.verticalCenter
             }
 
-            color: Theme.palette.selected.backgroundText //at 60%
-            opacity: 0.6
+            color: "grey" // TODO karni: Update Ubuntu.Compoonents.Themes.Palette.
             font.family: "Ubuntu"
             fontSize: "medium"
             elide: Text.ElideRight
             textFormat: Text.PlainText
-            style: Text.Raised
-            styleColor: "black"
             width: parent.width - image.width - image.leftMargin - anchors.leftMargin
         }
 
@@ -68,15 +65,6 @@
         }
     }
 
-    ThinDivider {
-        id: bottomBorder
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-    }
-
     MouseArea {
         anchors.fill: parent
         onClicked: parent.clicked(mouse)
 
=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-01-27 18:12:05 +0000
+++ qml/Components/PageHeader.qml	2014-03-07 12:41:18 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Unity 0.1
+import Unity 0.2
 
 Item {
     id: root
@@ -27,6 +27,9 @@
     property ListModel searchHistory
     property Scope scope
     property alias childItem: itemContainer.children
+    property alias showBackButton: backButton.visible
+
+    signal backClicked
 
     height: units.gu(8.5)
     implicitHeight: units.gu(8.5)
@@ -69,11 +72,32 @@
 
         Behavior on contentY { NumberAnimation { duration: 200; easing.type: Easing.OutQuad } }
 
+        AbstractButton {
+            id: backButton
+            visible: false
+            height: header.height
+            y: header.contentY
+            anchors {
+                left: parent.left
+                leftMargin: visible ? units.gu(2) : 0
+            }
+            width: visible ? image.width + units.gu(2) : 0
+            onClicked: root.backClicked();
+            Image {
+                id: image
+                anchors.centerIn: parent
+                source: "graphics/headerback.png"
+            }
+        }
+
         // FIXME this could potentially be simplified to avoid all the containers
         Item {
             id: headerContainer
 
-            width: parent.width
+            anchors {
+                left: backButton.right
+                right: parent.right
+            }
             height: childrenRect.height
 
             Item {
 
=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-01-27 18:03:45 +0000
+++ qml/Components/ResponsiveGridView.qml	2014-03-07 12:41:18 +0000
@@ -56,7 +56,6 @@
             fill: parent
             leftMargin: margin/2
             rightMargin: margin/2
-            topMargin: verticalSpacing
         }
         clip: parent.height != totalContentHeight
 
 
=== modified file 'qml/Components/SeeMore.qml'
--- qml/Components/SeeMore.qml	2014-02-05 17:35:52 +0000
+++ qml/Components/SeeMore.qml	2014-03-07 12:41:18 +0000
@@ -34,7 +34,8 @@
             objectName: "seeMoreLabel"
             text: i18n.tr("See more")
             opacity: !more ? 0.8 : 0.4
-            color: Theme.palette.selected.backgroundText
+            // TODO: Fix requiring Palette update
+            color: "grey" //Theme.palette.selected.backgroundText
             font.weight: Font.Bold
 
             MouseArea {
@@ -56,7 +57,8 @@
             objectName: "seeLessLabel"
             text: i18n.tr("See less")
             opacity: more ? 0.8 : 0.4
-            color: Theme.palette.selected.backgroundText
+            // TODO: Fix requiring Palette update
+            color: "grey" //Theme.palette.selected.backgroundText
             font.weight: Font.Bold
 
             MouseArea {
 
=== modified file 'qml/Components/Showable.qml'
--- qml/Components/Showable.qml	2013-10-01 18:18:52 +0000
+++ qml/Components/Showable.qml	2014-03-07 12:41:18 +0000
@@ -107,6 +107,9 @@
             if (!hideAnimation.running) {
                 hideAnimation.restart()
             }
+            if (__skipShowAnimation) {
+                hideAnimation.complete();
+            }
         } else {
             visible = false
             required = false
@@ -115,6 +118,11 @@
         shown = false
     }
 
+    function hideNow() {
+        __skipShowAnimation = true;
+        hide();
+    }
+
     Connections {
         target: hideAnimation ? hideAnimation: null
         onRunningChanged: {
 
=== modified file 'qml/Components/Stage.qml'
--- qml/Components/Stage.qml	2013-10-22 15:56:37 +0000
+++ qml/Components/Stage.qml	2014-03-07 12:41:18 +0000
@@ -65,7 +65,9 @@
 
     function activateApplication(desktopFile, addDelay) {
         var application = applicationManager.getApplicationFromDesktopFile(desktopFile, stage.type);
-        if (application != null && application == stage.focusedApplication) {
+        if (application == null) {
+            return;
+        } else if (application == stage.focusedApplication) {
             stage.show();
             return;
         }
@@ -84,11 +86,6 @@
         }
     }
 
-    Connections {
-        target: applicationManager
-        onFocusRequested: activateApplication(appId)
-    }
-
     /* Keep a reference to the focused application so that we can safely
        unfocus it when the stage is not fully shown and refocus it when the stage
        is fully shown again.
@@ -142,6 +139,14 @@
         }
     }
 
+    Timer {
+        id: hideScreenshotsAfterBriefDelay
+        // Since Mir & Qt have independent event loops, Mir often applies a focus request a frame later than when Qt
+        // asks for it. To work around, delay removing the screenshots a touch so Mir has definitely shown the app.
+        interval: 10
+        onTriggered: stage.__hideScreenshots();
+    }
+
     function __hideScreenshots() {
         newApplicationScreenshot.clearApplication();
         oldApplicationScreenshot.clearApplication();
@@ -177,7 +182,7 @@
                 applicationManager.focusApplication(application);
             }
             if (!delayedHideScreenshots.running) {
-                stage.__hideScreenshots();
+                hideScreenshotsAfterBriefDelay.start();
             }
         } else {
             /* FIXME: calling ApplicationManager::focusApplication does not focus
@@ -252,7 +257,7 @@
                     delayedHideScreenshots.start();
                 } else {
                     stage.focusedApplicationWhenUsingScreenshots = null;
-                    stage.__hideScreenshots();
+                    hideScreenshotsAfterBriefDelay.start();
                 }
             }
         }
 
=== added file 'qml/Components/graphics/[e-mail]'
 Binary files qml/Components/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Components/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== modified file 'qml/Dash/Apps/RunningApplicationTile.qml'
--- qml/Dash/Apps/RunningApplicationTile.qml	2013-10-28 14:12:24 +0000
+++ qml/Dash/Apps/RunningApplicationTile.qml	2014-03-07 12:41:18 +0000
@@ -108,10 +108,9 @@
             }
             text: (application) ? application.name : ""
 
-            color: Theme.palette.selected.backgroundText
+            // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
+            color: "grey"
             opacity: 0.9
-            style: Text.Raised
-            styleColor: "black"
             fontSize: "small"
             elide: Text.ElideMiddle
             horizontalAlignment: Text.AlignHCenter
 
=== modified file 'qml/Dash/Card.qml'
--- qml/Dash/Card.qml	2014-02-28 10:45:19 +0000
+++ qml/Dash/Card.qml	2014-03-07 12:41:18 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-Item {
+AbstractButton {
     id: root
     property var template
     property var components
@@ -25,7 +25,7 @@
 
     property alias fontScale: header.fontScale
     property alias headerAlignment: header.headerAlignment
-    readonly property alias headerHeight: header.height
+    property alias headerHeight: header.height
 
     property bool showHeader: true
 
@@ -87,6 +87,7 @@
             height: template && template["card-layout"] === "horizontal" ? header.height : width / artShape.aspect
             objectName: "artImage"
             source: cardData && cardData["art"] || ""
+            cache: true
             // FIXME uncomment when having investigated / fixed the crash
             //sourceSize.width: width > height ? width : 0
             //sourceSize.height: height > width ? height : 0
@@ -163,6 +164,9 @@
         titleWeight: components && components["subtitle"] ? Font.DemiBold : Font.Normal
 
         opacity: showHeader ? 1 : 0
+        inOverlay: root.template && root.template["overlay"] === true
+        fontColor: inOverlay ? "white" : summary.color
+        useMascotShape: !background.visible && !inOverlay
 
         Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
     }
@@ -183,5 +187,17 @@
         text: cardData && cardData["summary"] || ""
         height: text ? implicitHeight : 0
         fontSize: "small"
+        color: getFontColor(background.color)
+
+        function getLuminance(color) {
+            return 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;
+        }
+
+        // TODO karni: Change "grey" to Ubuntu.Components.Palette color once updated.
+        function getFontColor(backgroundColor) {
+            if (backgroundColor === undefined) return "grey";
+            var luminance = getLuminance(backgroundColor);
+            return luminance < 0.7 ? "white" : "grey"
+        }
     }
 }
 
=== added file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/CardCarousel.qml	2014-03-07 12:41:18 +0000
@@ -0,0 +1,78 @@
+/*
+ * 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: cardCarousel
+
+    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)
+
+    CardTool {
+        id: cardTool
+
+        template: cardCarousel.template
+        components: cardCarousel.components
+        viewWidth: cardCarousel.width
+    }
+
+    Carousel {
+        id: carousel
+        anchors.fill: parent
+        tileAspectRatio: cardCarousel.components && cardCarousel.components["art"]["aspect-ratio"] || 1.0
+        // FIXME we need to "reverse" the carousel to make the selected item the size
+        // and push others back.
+        minimumTileWidth: cardTool.cardWidth / selectedItemScaleFactor
+        selectedItemScaleFactor: 1.38
+        cacheBuffer: 1404 // 18px * 13gu * 6
+        model: cardCarousel.model
+        highlightIndex: cardCarousel.highlightIndex
+
+        onClicked: cardCarousel.clicked(index, itemY)
+        onPressAndHold: cardCarousel.pressAndHold(index, itemY)
+
+        property real fontScale: 1 / selectedItemScaleFactor
+        property real headerHeight: cardTool.headerHeight / selectedItemScaleFactor
+
+        itemComponent: Card {
+            id: card
+            objectName: "delegate" + index
+            headerHeight: carousel.headerHeight
+            cardData: model
+            template: cardCarousel.template
+            components: cardCarousel.components
+
+            property bool explicitlyScaled
+            property var model
+
+            enabled: false
+            showHeader: explicitlyScaled
+
+            fontScale: carousel.fontScale
+        }
+    }
+}
 
=== added file 'qml/Dash/CardFilterGrid.qml'
--- qml/Dash/CardFilterGrid.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/CardFilterGrid.qml	2014-03-07 12:41:18 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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
+
+DashFilterGrid {
+    id: genericFilterGrid
+
+    minimumHorizontalSpacing: units.gu(1)
+    delegateWidth: cardTool.cardWidth
+    delegateHeight: cardTool.cardHeight
+    verticalSpacing: units.gu(1)
+    collapsedRowCount: Math.min(2, template && template["collapsed-rows"] || 2)
+
+    CardTool {
+        id: cardTool
+
+        template: genericFilterGrid.template
+        // We can't trust the template since it may happen it is carousel
+        // that is being should as a grid because of the lack of elements
+        categoryLayout: "grid"
+        components: genericFilterGrid.components
+    }
+
+    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: genericFilterGrid.template
+            components: genericFilterGrid.components
+
+            headerAlignment: cardTool.headerAlignment
+
+            onClicked: genericFilterGrid.clicked(index, card.y)
+            onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
+        }
+    }
+}
 
=== modified file 'qml/Dash/CardHeader.qml'
--- qml/Dash/CardHeader.qml	2014-02-21 10:50:36 +0000
+++ qml/Dash/CardHeader.qml	2014-03-07 12:41:18 +0000
@@ -27,12 +27,17 @@
     property alias altPrice: altPriceLabel.text
 
     property alias titleWeight: titleLabel.font.weight
+    property alias titleSize: titleLabel.fontSize
 
     // FIXME: Saviq, used to scale fonts down in Carousel
     property real fontScale: 1.0
 
     property alias headerAlignment: titleLabel.horizontalAlignment
 
+    property bool inOverlay: false
+    property bool useMascotShape: true
+    property color fontColor: "grey"
+
     visible: mascotImage.status === Image.Ready || title || price
     height: row.height > 0 ? row.height + row.margins * 2 : 0
 
@@ -42,13 +47,13 @@
 
         property real margins: units.gu(1)
 
+        spacing: mascotShape.visible || mascotImage.visible || inOverlay ? margins : 0
         anchors {
             top: parent.top; left: parent.left; right: parent.right
             margins: margins
             leftMargin: spacing
             rightMargin: spacing
         }
-        spacing: mascotShape.visible || (template && template["overlay"]) ? margins : 0
 
         UbuntuShape {
             id: mascotShape
@@ -57,35 +62,44 @@
             // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
             width: units.gu(6)
             height: units.gu(5.625)
-            visible: image.status === Image.Ready
-            readonly property int maxSize: Math.max(width, height)
-
-            image: Image {
-                id: mascotImage
-
-                sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
-                fillMode: Image.PreserveAspectCrop
-                horizontalAlignment: Image.AlignHCenter
-                verticalAlignment: Image.AlignVCenter
-            }
+            anchors.verticalCenter: parent.verticalCenter
+            visible: useMascotShape && image && image.status === Image.Ready
+            readonly property int maxSize: Math.max(width, height) * 4
+
+            image: useMascotShape ? mascotImage : null
+        }
+
+        Image {
+            id: mascotImage
+
+            width: source ? mascotShape.width : 0
+            height: mascotShape.height
+            anchors.verticalCenter: parent.verticalCenter
+            visible: !useMascotShape && status === Image.Ready
+
+            sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
+            fillMode: Image.PreserveAspectCrop
+            horizontalAlignment: Image.AlignHCenter
+            verticalAlignment: Image.AlignVCenter
         }
 
         Column {
             objectName: "column"
             width: parent.width - x
-            spacing: units.gu(0.5)
+            spacing: units.gu(0.25)
+            anchors.verticalCenter: parent.verticalCenter
 
             Label {
                 id: titleLabel
                 objectName: "titleLabel"
                 anchors { left: parent.left; right: parent.right }
                 elide: Text.ElideRight
-                font.weight: Font.DemiBold
+                font.weight: Font.Normal
+                fontSize: "small"
                 wrapMode: Text.Wrap
                 maximumLineCount: 2
-                fontSize: "small"
                 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
-                color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
+                color: fontColor
             }
 
             Label {
@@ -93,11 +107,11 @@
                 objectName: "subtitleLabel"
                 anchors { left: parent.left; right: parent.right }
                 elide: Text.ElideRight
+                fontSize: "small"
                 font.weight: Font.Light
                 visible: titleLabel.text && text
-                fontSize: "x-small"
                 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
-                color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
+                color: fontColor
             }
 
             Row {
@@ -118,7 +132,7 @@
                     width: parent.labelWidth
                     elide: Text.ElideRight
                     font.weight: Font.DemiBold
-                    color: Theme.palette.selected.foreground
+                    color: "#ff990000"
                     visible: text
                 }
 
@@ -128,6 +142,8 @@
                     width: parent.labelWidth
                     elide: Text.ElideRight
                     horizontalAlignment: parent.labels === 3 ? Text.AlignHCenter : Text.AlignRight
+                    font.strikeout: true
+                    color: "black"
                     visible: text
                 }
 
@@ -136,6 +152,7 @@
                     width: parent.labelWidth
                     elide: Text.ElideRight
                     horizontalAlignment: Text.AlignRight
+                    color: fontColor
                     visible: text
                 }
             }
 
=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2014-02-07 14:45:19 +0000
+++ qml/Dash/CardTool.qml	2014-03-07 12:41:18 +0000
@@ -43,6 +43,11 @@
      */
     property var viewWidth
 
+    /*!
+     \brief The category layout for this card tool
+     */
+    property string categoryLayout: template ? template["category-layout"] : ""
+
     // FIXME: Saviq
     // Only way for the card below to actually be laid out completely.
     // If invisible or in "data" array, some components are not taken into account.
@@ -56,7 +61,7 @@
      If undefined, should use implicit width of the actual card.
      */
     readonly property var cardWidth: {
-        switch (template !== undefined && template["category-layout"]) {
+        switch (categoryLayout) {
             case "grid":
             case "vertical-journal":
                 if (template["card-layout"] === "horizontal") return units.gu(38);
@@ -84,7 +89,7 @@
      If undefined, should use implicit height of the actual card.
      */
     readonly property var cardHeight: {
-        switch (template !== undefined && template["category-layout"]) {
+        switch (categoryLayout) {
             case "journal":
                 if (template["card-size"] >= 12 && template["card-size"] <= 38) return units.gu(template["card-size"]);
                 return units.gu(18.5);
 
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-02-18 11:54:25 +0000
+++ qml/Dash/Dash.qml	2014-03-07 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Unity 0.1
+import Unity 0.2
 import Utils 0.1
 import "../Components"
 
@@ -27,8 +27,9 @@
     visible: shown
 
     property ListModel searchHistory: SearchHistoryModel {}
+    property bool searchable: !dashContent.previewOpen && !scopeItem.previewOpen
 
-    property string showScopeOnLoaded: "home.scope"
+    property string showScopeOnLoaded: "clickscope"
     property real contentScale: 1.0
 
     function setCurrentScope(scopeId, animate, reset) {
@@ -39,6 +40,8 @@
             return
         }
 
+        dashContent.closePreview();
+
         if (scopeIndex == dashContent.currentIndex && !reset) {
             // the scope is already the current one
             return
@@ -61,10 +64,19 @@
     DashContent {
         id: dashContent
         objectName: "dashContent"
-        anchors.fill: parent
+        width: parent.width
+        height: parent.height
         model: filteredScopes
         scopes: scopes
         searchHistory: dash.searchHistory
+        visible: x != -width
+        onGotoScope: {
+            dash.setCurrentScope(scopeId, true, false);
+        }
+        onOpenScope: {
+            scopeItem.scope = scope;
+            x = -width;
+        }
         onScopeLoaded: {
             if (scopeId == dash.showScopeOnLoaded) {
                 dash.setCurrentScope(scopeId, false, false)
@@ -72,6 +84,39 @@
             }
         }
         scale: dash.contentScale
+        clip: scale != 1.0 || scopeItem.visible
+        Behavior on x {
+            UbuntuNumberAnimation {
+                onRunningChanged: {
+                    if (!running && dashContent.x == 0) {
+                        dashContent.closeScope(scopeItem.scope);
+                        scopeItem.scope = null;
+                    }
+                }
+            }
+        }
+    }
+
+    ScopeItem {
+        id: scopeItem
+        anchors.left: dashContent.right
+        width: parent.width
+        height: parent.height
+        searchHistory: dash.searchHistory
+        scale: dash.contentScale
         clip: scale != 1.0
+        visible: scope != null
+        onBack: {
+            dashContent.x = 0;
+        }
+        onGotoScope: {
+            // TODO
+            console.log("gotoScope from an openScope scope is not implemented");
+        }
+        onOpenScope: {
+            // TODO
+            console.log("openScope from an openScope scope is not implemented");
+        }
+
     }
 }
 
=== modified file 'qml/Dash/DashApps.qml'
--- qml/Dash/DashApps.qml	2013-12-02 13:23:28 +0000
+++ qml/Dash/DashApps.qml	2014-03-07 12:41:18 +0000
@@ -29,28 +29,13 @@
     property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
     property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
 
-    ListModel {
-        id: dummyVisibilityModifier
-
-        ListElement { name: "running-apps" }
-    }
-
-    SortFilterProxyModel {
-        id: runningApplicationsModel
-
-        property var firstModel: mainStageApplicationsModel
-        property var secondModel: sideStageApplicationModel
-        property bool canEnableTerminationMode: scopeView.isCurrent
-
-        model: dummyVisibilityModifier
-        filterRole: 0
-        filterRegExp: invertMatch ? ((mainStageApplicationsModel.count === 0 &&
-                                      sideStageApplicationModel.count === 0) ? RegExp("running-apps") : RegExp("")) : RegExp("disabled")
-        invertMatch: scopeView.scope.searchQuery.length == 0
+    QtObject {
+        id: countObject
+        property int count: scopeView.scope.searchQuery.length == 0 ? (mainStageApplicationsModel.count + sideStageApplicationModel.count) : 0
     }
 
     onScopeChanged: {
-        scopeView.scope.categories.overrideResults("recent", runningApplicationsModel);
+        scopeView.scope.categories.addSpecialCategory("running.apps.category", "Recent", "", "{ \"template\": { \"category-layout\": \"running-apps\" } }", countObject);
         enableHeightBehaviorOnNextCreation = (mainStageApplicationsModel.count + sideStageApplicationModel.count == 0)
     }
 }
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-02-18 11:54:25 +0000
+++ qml/Dash/DashContent.qml	2014-03-07 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Unity 0.1
+import Unity 0.2
 import "../Components"
 
 Item {
@@ -25,6 +25,7 @@
     property var model: null
     property var scopes: null
     property alias currentIndex: dashContentList.currentIndex
+    property alias previewOpen: previewListView.open
 
     property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
     property ListModel searchHistory
@@ -33,6 +34,8 @@
     signal movementEnded()
     signal scopeLoaded(string scopeId)
     signal positionedAtBeginning()
+    signal gotoScope(string scopeId)
+    signal openScope(var scope)
 
     // If we set the current scope index before the scopes have been added,
     // then we need to wait until the loaded signals gets emitted from the scopes
@@ -77,15 +80,27 @@
         }
     }
 
+    function closeScope(scope) {
+        dashContentList.currentItem.theScope.closeScope(scope)
+    }
+
+    function closePreview() {
+        previewListView.open = false;
+    }
+
     Item {
         id: dashContentListHolder
-        anchors.fill: parent
+
+        x: previewListView.open ? -width : 0
+        Behavior on x { UbuntuNumberAnimation { } }
+        width: parent.width
+        height: parent.height
 
         ListView {
             id: dashContentList
             objectName: "dashContentList"
 
-            interactive: dashContent.scopes.loaded && !previewListView.onScreen && !currentItem.moving
+            interactive: dashContent.scopes.loaded && !previewListView.open && !currentItem.moving
 
             anchors.fill: parent
             model: dashContent.model
@@ -100,6 +115,7 @@
             cacheBuffer: 1073741823
             onMovementStarted: dashContent.movementStarted()
             onMovementEnded: dashContent.movementEnded()
+            clip: parent.x != 0
 
             // If the number of items is less than the current index, then need to reset to another item.
             onCountChanged: {
@@ -133,21 +149,30 @@
                     onLoaded: {
                         item.scope = Qt.binding(function() { return scope })
                         item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
-                        item.tabBarHeight = pageHeader.implicitHeight;
-                        item.pageHeader = pageHeader;
-                        item.openEffect = openEffect;
+                        item.tabBarHeight = dashPageHeader.implicitHeight;
+                        item.pageHeader = dashPageHeader;
                         item.previewListView = previewListView;
                         dashContentList.movementStarted.connect(item.movementStarted)
                         dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
                         dashContent.scopeLoaded(item.scope.id)
                     }
+                    Connections {
+                        target: isCurrent ? scope : null
+                        onGotoScope: {
+                            // Note here scopeId is the signal parameter and not the loader property
+                            dashContent.gotoScope(scopeId);
+                        }
+                        onOpenScope: {
+                            dashContent.openScope(scope);
+                        }
+                    }
 
                     Component.onDestruction: active = false
                 }
         }
 
         PageHeader {
-            id: pageHeader
+            id: dashPageHeader
             objectName: "pageHeader"
             width: parent.width
             searchEntryEnabled: true
@@ -157,12 +182,16 @@
             childItem: TabBar {
                 id: tabBar
                 objectName: "tabbar"
-                height: units.gu(7)
+                height: units.gu(6.5)
                 width: parent.width
                 selectionMode: false
                 style: DashContentTabBarStyle {}
 
-                model: dashContentList.model
+                // 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
 
                 onSelectedIndexChanged: {
                     dashContentList.currentIndex = selectedIndex;
@@ -176,36 +205,23 @@
                 }
 
                 Connections {
-                    target: model
-                    onCountChanged: {
-                        if (tabBar.selectedIndex < 0 && model.count > 0)
-                            tabBar.selectedIndex = 0;
+                    target: __styleInstance
+                    onModelChanged: {
+                        tabBar.selectedIndex = -1;
+                        tabBar.selectedIndex = 0;
                     }
                 }
-
-                Component.onCompleted: {
-                    __styleInstance.headerTextStyle = Text.Raised
-                    __styleInstance.headerTextStyleColor = "black"
-                }
             }
         }
     }
 
-    DashContentOpenEffect {
-        id: openEffect
-        anchors {
-            fill: parent
-            bottomMargin: -bottomOverflow
-        }
-        sourceItem: dashContentListHolder
-        previewListView: previewListView
-    }
-
     PreviewListView {
         id: previewListView
-        openEffect: openEffect
-        categoryView: dashContentList.currentItem ? dashContentList.currentItem.categoryView : null
+        visible: x != width
         scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
-        anchors.fill: parent
+        pageHeader: dashPageHeader
+        width: parent.width
+        height: parent.height
+        anchors.left: dashContentListHolder.right
     }
 }
 
=== removed file 'qml/Dash/DashContentOpenEffect.qml'
--- qml/Dash/DashContentOpenEffect.qml	2013-11-05 16:06:09 +0000
+++ qml/Dash/DashContentOpenEffect.qml	1970-01-01 00:00:00 +0000
@@ -1,57 +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"
-
-OpenEffect {
-    property PreviewListView previewListView: null
-
-    objectName: "openEffect"
-    anchors {
-        fill: parent
-        bottomMargin: -bottomOverflow
-    }
-
-    enabled: gap > 0.0
-
-    topGapPx: (1 - gap) * positionPx
-    topOpacity: (1 - gap * 1.2)
-    bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
-    bottomOverflow: units.gu(20)
-    live: !expansionAnimation.running
-
-    property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
-    property real gap: previewListView.open ? 1.0 : 0.0
-
-    Behavior on gap {
-        NumberAnimation {
-            id: expansionAnimation
-            duration: 200
-            easing.type: Easing.InOutQuad
-            onRunningChanged: {
-                if (!previewListView.open && !running) {
-                    previewListView.onScreen = false
-                }
-            }
-        }
-    }
-    Behavior on positionPx {
-        enabled: previewListView.open
-        UbuntuNumberAnimation {}
-    }
-}
 
=== modified file 'qml/Dash/DashContentTabBarStyle.qml'
--- qml/Dash/DashContentTabBarStyle.qml	2013-12-02 15:58:26 +0000
+++ qml/Dash/DashContentTabBarStyle.qml	2014-03-07 12:41:18 +0000
@@ -18,4 +18,7 @@
 
 TabBarStyle {
     indicatorImageSource: "graphics/tabbarchevron.png"
+    // TODO karni: These should come from updated Ubuntu Palette.
+    headerTextColor: "#88888888"
+    headerTextSelectedColor: "#888888"
 }
 
=== modified file 'qml/Dash/DashFilterGrid.qml'
--- qml/Dash/DashFilterGrid.qml	2013-12-10 15:39:51 +0000
+++ qml/Dash/DashFilterGrid.qml	2014-03-07 12:41:18 +0000
@@ -26,11 +26,14 @@
     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
+
+    property FilterGrid grid: filterGrid
 
     collapsedHeight: filterGrid.collapsedHeight
-    collapsedRowCount: filterGrid.collapsedRowCount
     columns: filterGrid.columns
     rows: filter ? filterGrid.collapsedRowCount : filterGrid.uncollapsedRowCount
     currentItem: filterGrid.currentItem
@@ -38,7 +41,6 @@
     height: filterGrid.height
     margins: filterGrid.margins
     uncollapsedHeight: filterGrid.uncollapsedHeight
-    verticalSpacing: filterGrid.verticalSpacing
 
     function startFilterAnimation(filter) {
         filterGrid.startFilterAnimation(filter)
 
=== modified file 'qml/Dash/DashPreviewPlaceholder.qml'
--- qml/Dash/DashPreviewPlaceholder.qml	2013-09-30 12:17:20 +0000
+++ qml/Dash/DashPreviewPlaceholder.qml	2014-03-07 12:41:18 +0000
@@ -20,6 +20,6 @@
 DashPreview {
     ActivityIndicator {
         anchors.centerIn: parent
-        running: true
+        running: visible
     }
 }
 
=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2013-12-10 15:39:51 +0000
+++ qml/Dash/DashRenderer.qml	2014-03-07 12:41:18 +0000
@@ -62,4 +62,10 @@
 
     function startFilterAnimation(filter) {
     }
+
+    /// Category template definition from the scope
+    property var template
+
+    /// Component mapping and configuration from the scope
+    property var components
 }
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-02-28 10:46:49 +0000
+++ qml/Dash/GenericScopeView.qml	2014-03-07 12:41:18 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Utils 0.1
-import Unity 0.1
+import Unity 0.2
 import "../Components"
 import "../Components/ListItems" as ListItems
 
@@ -30,7 +30,6 @@
     property alias moving: categoryView.moving
     property int tabBarHeight: 0
     property PageHeader pageHeader: null
-    property OpenEffect openEffect: null
     property Item previewListView: null
 
     signal movementStarted
@@ -55,7 +54,7 @@
     Binding {
         target: scope
         property: "isActive"
-        value: isCurrent && !previewListView.onScreen
+        value: isCurrent && !previewListView.open
     }
 
     Timer {
@@ -115,10 +114,9 @@
         objectName: "categoryListView"
         anchors.fill: parent
         model: scopeView.categories
-        forceNoClip: previewListView.onScreen
+        forceNoClip: previewListView.open
 
         property string expandedCategoryId: ""
-        signal correctExpandedCategory();
 
         onContentYChanged: pageHeader.positionRealHeader();
         onOriginYChanged: pageHeader.positionRealHeader();
@@ -133,6 +131,7 @@
             id: baseItem
             objectName: "dashCategory" + category
             highlightWhenPressed: false
+            showDivider: false
 
             readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false
             readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true
@@ -147,7 +146,7 @@
                     right: parent.right
                 }
 
-                source: getRenderer(model.renderer, model.contentType, model.rendererHint, results)
+                source: getRenderer(model.renderer, results)
 
                 onLoaded: {
                     if (item.enableHeightBehavior !== undefined && item.enableHeightBehaviorOnNextCreation !== undefined) {
@@ -155,9 +154,10 @@
                         scopeView.enableHeightBehaviorOnNextCreation = false;
                     }
                     if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {
-                        // TODO: the running apps grid doesn't support standard scope results model yet
-                        item.firstModel = Qt.binding(function() { return results.firstModel })
-                        item.secondModel = Qt.binding(function() { return results.secondModel })
+                        // TODO: this is still a kludge :D Ideally add some kind of hook so that we
+                        // can do this from DashApps.qml or think a better way that needs no special casing
+                        item.firstModel = Qt.binding(function() { return mainStageApplicationsModel })
+                        item.secondModel = Qt.binding(function() { return sideStageApplicationModel })
                         item.canEnableTerminationMode = Qt.binding(function() { return scopeView.isCurrent })
                     } else {
                         item.model = Qt.binding(function() { return results })
@@ -170,6 +170,9 @@
                         }
                     }
                     updateDelegateCreationRange();
+                    // FIXME: should be "template", not "renderer"
+                    item.template = Qt.binding(function() { return model.renderer });
+                    item.components = Qt.binding(function() { return model.components });
                 }
 
                 Component.onDestruction: {
@@ -181,39 +184,24 @@
                 Connections {
                     target: rendererLoader.item
                     onClicked: {
-                        // Prepare the preview in case activate() triggers a preview only
-                        openEffect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + categoryView.stickyHeaderHeight);
-                        previewListView.categoryId = categoryId
-                        previewListView.categoryDelegate = rendererLoader.item
-                        previewListView.model = target.model;
-                        previewListView.init = true;
-                        previewListView.currentIndex = index;
-
-                        var item = target.model.get(index);
-
-                        if ((scopeView.scope.id == "applications.scope" && categoryId == "installed")
-                                || (scopeView.scope.id == "home.scope" && categoryId == "applications.scope")) {
-                            scopeView.scope.activate(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
-                                                     item.comment, item.dndUri, item.metadata)
+                        if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && categoryId == "local")) {
+                            // TODO Technically it is possible that calling activate() will make the scope emit
+                            // previewRequested so that we show a preview but there's no scope that does that yet
+                            // so it's not implemented
+                            var item = target.model.get(index);
+                            scopeView.scope.activate(item.result)
                         } else {
+                            previewListView.model = target.model;
+                            previewListView.currentIndex = -1
+                            previewListView.currentIndex = index;
                             previewListView.open = true
-
-                            scopeView.scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
-                                                    item.comment, item.dndUri, item.metadata)
                         }
                     }
                     onPressAndHold: {
-                        openEffect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + categoryView.stickyHeaderHeight);
-                        previewListView.categoryId = categoryId
-                        previewListView.categoryDelegate = rendererLoader.item
                         previewListView.model = target.model;
-                        previewListView.init = true;
+                        previewListView.currentIndex = -1
                         previewListView.currentIndex = index;
                         previewListView.open = true
-
-                        var item = target.model.get(index)
-                        scopeView.scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
-                                                item.comment, item.dndUri, item.metadata)
                     }
                 }
                 Connections {
@@ -221,9 +209,6 @@
                     onExpandedCategoryIdChanged: {
                         collapseAllButExpandedCategory();
                     }
-                    onCorrectExpandedCategory: {
-                        collapseAllButExpandedCategory();
-                    }
                     function collapseAllButExpandedCategory() {
                         var item = rendererLoader.item;
                         if (item.expandable) {
@@ -275,6 +260,31 @@
                         }
                     }
                 }
+
+                Image {
+                    visible: index != 0
+                    anchors {
+                        top: parent.top
+                        left: parent.left
+                        right: parent.right
+                    }
+                    fillMode: Image.Stretch
+                    source: "graphics/dash_divider_top_lightgrad.png"
+                    z: -1
+                }
+
+                Image {
+                    // FIXME Should not rely on count field of model, SortfilterProxyModel in this case.
+                    visible: index != categoryView.model.count - 1
+                    anchors {
+                        bottom: parent.bottom
+                        left: parent.left
+                        right: parent.right
+                    }
+                    fillMode: Image.Stretch
+                    source: "graphics/dash_divider_top_darkgrad.png"
+                    z: -1
+                }
             }
 
             onHeightChanged: rendererLoader.updateDelegateCreationRange();
@@ -302,95 +312,35 @@
         pageHeader: Item {
             implicitHeight: scopeView.tabBarHeight
             onHeightChanged: {
-                if (scopeView.pageHeader) {
+                if (scopeView.pageHeader && scopeView.isCurrent) {
                     scopeView.pageHeader.height = height;
                 }
             }
             onYChanged: positionRealHeader();
 
             function positionRealHeader() {
-                if (scopeView.pageHeader) {
+                if (scopeView.pageHeader && scopeView.isCurrent) {
                     scopeView.pageHeader.y = y + parent.y;
                 }
             }
         }
     }
 
-    function getDefaultRendererId(contentType) {
-        switch (contentType) {
-            default: return "grid";
-        }
-    }
-
-    function getRenderer(rendererId, contentType, rendererHint, results) {
-        if (rendererId == "default") {
-            rendererId = getDefaultRendererId(contentType);
-        }
-        if (rendererId == "carousel") {
-            // Selectively disable carousel, 6 is fixed for now, should change on the form factor
-            if (results.count <= 6)
-                rendererId = "grid"
-        }
-        switch (rendererId) {
-            case "carousel": {
-                switch (contentType) {
-                    case "music": return "Music/MusicCarousel.qml";
-                    case "video": return "Video/VideoCarousel.qml";
-                    default: return "Generic/GenericCarousel.qml";
-                }
-            }
-            case "grid": {
-                switch (contentType) {
-                    case "apps": {
-                        if (rendererHint == "toggled")
-                            return "Apps/DashPluginFilterGrid.qml";
-                        else
-                            return "Generic/GenericFilterGrid.qml";
-                    }
-                    case "music": return "Music/MusicFilterGrid.qml";
-                    case "video": return "Video/VideoFilterGrid.qml";
-                    case "weather": return "Generic/WeatherFilterGrid.qml";
-                    default: return "Generic/GenericFilterGrid.qml";
-                }
-            }
-            case "special": {
-                switch (contentType) {
-                    case "apps": return "Apps/RunningApplicationsGrid.qml";
-                    default: return "Generic/GenericFilterGrid.qml";
-                }
-            }
-            default: return "Generic/GenericFilterGrid.qml";
-        }
-    }
-
-    Connections {
-        target: scopeView.scope
-        onPreviewReady: {
-            if (previewListView.init) {
-                // Preview was triggered because of a click on the item. Need to expand now.
-                if (!previewListView.open) {
-                    previewListView.open = true
-                }
-
-                var index = previewListView.currentIndex
-                previewListView.currentIndex = -1
-                previewListView.currentIndex = index
-                previewListView.init = false
-            }
-            previewListView.currentItem.previewData = preview
-        }
-    }
-
-    // TODO: Move as InverseMouseArea to DashPreview
-    MouseArea {
-        objectName: "closePreviewMouseArea"
-        enabled: previewListView.onScreen
-        anchors {
-            fill: parent
-            topMargin: openEffect.bottomGapPx
-        }
-        onClicked: {
-            previewListView.open = false;
+    function getRenderer(template, results) {
+        var layout = template["category-layout"];
+
+        if (layout == "running-apps") {
+            return "Apps/RunningApplicationsGrid.qml";
+        }
+
+        if (layout === "carousel") {
+            // TODO: Selectively disable carousel, 4 is fixed for now, should change depending on form factor
+            if (results.count <= 4) layout = "grid";
+        }
+        switch (layout) {
+            case "carousel": return "CardCarousel.qml";
+            case "grid":
+            default: return "CardFilterGrid.qml";
         }
     }
 }
 
=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-01-28 15:57:51 +0000
+++ qml/Dash/PreviewListView.qml	2014-03-07 12:41:18 +0000
@@ -16,53 +16,53 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Unity 0.1
+import Unity 0.2
 import "../Components"
+import "Previews" as Previews
 
 Item {
-    property OpenEffect openEffect: null
-    property ScopeListView categoryView: null
+    id: root
+
     property Scope scope: null
+    property var pageHeader: null
 
     property alias open: previewListView.open
-    property alias onScreen: previewListView.onScreen
-    property alias categoryId: previewListView.categoryId
-    property alias categoryDelegate: previewListView.categoryDelegate
-    property alias init: previewListView.init
     property alias model: previewListView.model
     property alias currentIndex: previewListView.currentIndex
     property alias currentItem: previewListView.currentItem
     property alias count: previewListView.count
 
-    Image {
-        objectName: "pointerArrow"
-        anchors {
-            top: previewListView.bottom
-            left: parent.left
-            leftMargin: previewListView.categoryDelegate !== undefined && previewListView.categoryDelegate.currentItem ?
-                            previewListView.categoryDelegate.currentItem.center + (-width + margins) / 2 : 0
+    PageHeader {
+        id: header
+        width: parent.width
+        searchEntryEnabled: false
+        scope: root.scope
+        height: units.gu(8.5)
+        showBackButton: true
+        onBackClicked: root.open = false
 
-            Behavior on leftMargin {
-                SmoothedAnimation {
-                    duration: UbuntuAnimation.FastDuration
-                }
+        childItem: Label {
+            id: label
+            anchors {
+                left: parent.left
+                right: parent.right
+                verticalCenter: parent.verticalCenter
             }
+            text: scope ? i18n.tr("%1 Preview").arg(scope.name) : ""
+            color: "#888888"
+            font.family: "Ubuntu"
+            font.weight: Font.Light
+            fontSize: "x-large"
+            elide: Text.ElideRight
         }
-        height: units.gu(1)
-        width: units.gu(2)
-        property int margins: previewListView.categoryDelegate ? previewListView.categoryDelegate.margins : 0
-        opacity: previewListView.open ? .5 : 0
-
-        source: "graphics/tooltip_arrow.png"
     }
 
     ListView  {
         id: previewListView
         objectName: "previewListView"
-        height: openEffect.bottomGapPx - openEffect.topGapPx
         anchors {
-            top: parent.top
-            topMargin: openEffect.topGapPx
+            top: header.bottom
+            bottom: parent.bottom
             left: parent.left
             right: parent.right
         }
@@ -77,71 +77,17 @@
 
         // To be set before opening the preview
         property string categoryId: ""
-        property var categoryDelegate
 
         // because the ListView is built asynchronous, setting the
         // currentIndex directly won't work. We need to refresh it
         // when the first preview is ready to be displayed.
         property bool init: true
 
-        PreviewDelegateMapper {
-            id: previewDelegateMapper
-        }
-
-        onCurrentIndexChanged: positionListView();
-
-        function positionListView() {
-            if (!open) {
-                return;
-            }
-
-            var row = Math.floor(currentIndex / categoryDelegate.columns);
-            if (categoryDelegate.collapsedRowCount <= row) {
-                categoryView.expandedCategoryId = categoryId
-            }
-
-            categoryDelegate.highlightIndex = currentIndex
-
-            if (!init && model !== undefined) {
-                var item = model.get(currentIndex)
-                scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
-            }
-
-            // Adjust contentY in case we need to change to it to show the next row
-            if (categoryDelegate.rows > 1) {
-                var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
-
-                // Find new contentY and effect.postionPx
-                var newContentY = itemY - openEffect.positionPx - categoryDelegate.verticalSpacing;
-
-                // Make sure the item is not covered by a header. Move the effect split down if necessary
-                var headerHeight = pageHeader.height + categoryView.stickyHeaderHeight;
-                var effectAdjust = Math.max(openEffect.positionPx, headerHeight);
-
-                // Make sure we don't overscroll the listview. If yes, adjust effect position
-                if (newContentY < 0) {
-                    effectAdjust += newContentY;
-                    newContentY = 0;
-                }
-                if (newContentY > Math.max(0, categoryView.contentHeight - categoryView.height)) {
-                    effectAdjust += -(categoryView.contentHeight - categoryView.height) + newContentY
-                    newContentY = categoryView.contentHeight - categoryView.height;
-                }
-
-                openEffect.positionPx = effectAdjust;
-                categoryView.contentY = newContentY;
-            }
-        }
-
         property bool open: false
-        property bool onScreen: false
 
         onOpenChanged: {
             if (open) {
-                onScreen = true;
-                categoryDelegate.highlightIndex = currentIndex;
                 pageHeader.unfocus();
-                positionListView();
             } else {
                 // Cancel any pending preview requests or actions
                 if (previewListView.currentItem.previewData !== undefined) {
@@ -149,68 +95,43 @@
                 }
                 scope.cancelActivation();
                 model = undefined;
-                categoryView.correctExpandedCategory();
-                categoryDelegate.highlightIndex = -1;
             }
         }
 
-        Rectangle {
-            anchors.fill: parent
-            color: Qt.rgba(0, 0, 0, .3)
-            z: -1
-        }
-
-        delegate: Loader {
-            id: previewLoader
-            objectName: "previewLoader" + index
+        delegate: Item {
             height: previewListView.height
             width: previewListView.width
-            asynchronous: true
-            source: previewListView.onScreen ?
-                            (previewData !== undefined ? previewDelegateMapper.map(previewData.rendererName) : "DashPreviewPlaceholder.qml") : ""
-
-            onPreviewDataChanged: {
-                if (previewData !== undefined && source.toString().indexOf("DashPreviewPlaceholder.qml") != -1) {
-                    previewLoader.opacity = 0;
-                }
-            }
-
-            onSourceChanged: {
-                if (previewData !== undefined) {
-                    fadeIn.start()
-                }
-            }
-
-            PropertyAnimation {
-                id: fadeIn
-                target: previewLoader
-                property: "opacity"
-                from: 0.0
-                to: 1.0
-                duration: UbuntuAnimation.BriskDuration
-            }
-
-            property var previewData
-            property bool valid: item !== null
-
-            onLoaded: {
-                if (previewListView.onScreen && previewData !== undefined) {
-                    item.previewData = Qt.binding(function() { return previewData })
-                    item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
-                }
-            }
-
-            Connections {
-                ignoreUnknownSignals: true
-                target: item
-                onClose: {
-                    previewListView.open = false
-                }
-            }
-
-            function closePreviewSpinner() {
-                if (item) {
-                    item.showProcessingAction = false;
+
+            readonly property bool ready: preview.previewModel.loaded
+
+            Previews.Preview {
+                id: preview
+                objectName: "preview" + index
+                anchors.fill: parent
+
+                isCurrent: parent.ListView.isCurrentItem
+
+                previewModel: {
+                    var previewStack = root.scope.preview(result);
+                    return previewStack.get(0);
+                }
+
+    //            onClose: {
+    //                previewListView.open = false
+    //            }
+
+            }
+
+            MouseArea {
+                id: processingMouseArea
+                objectName: "processingMouseArea"
+                anchors.fill: parent
+                enabled: !preview.previewModel.loaded || preview.previewModel.processingAction
+
+                ActivityIndicator {
+                    anchors.centerIn: parent
+                    visible: root.open && parent.enabled
+                    running: visible
                 }
             }
         }
 
=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2014-02-12 09:36:33 +0000
+++ qml/Dash/Previews/Preview.qml	2014-03-07 12:41:18 +0000
@@ -39,7 +39,8 @@
     clip: true
 
     Connections {
-        target: shell.applicationManager
+        target: shell.applicationManager || null
+        ignoreUnknownSignals: true
         onMainStageFocusedApplicationChanged: {
             root.close();
         }
@@ -48,7 +49,11 @@
         }
     }
 
-    onPreviewModelChanged: processingMouseArea.enabled = false
+    Binding {
+        target: previewModel
+        property: "widgetColumnCount"
+        value: row.columns
+    }
 
     MouseArea {
         anchors.fill: parent
@@ -60,18 +65,21 @@
         spacing: units.gu(1)
         anchors { fill: parent; margins: spacing }
 
+        property int columns: width >= units.gu(80) ? 2 : 1
+        property real columnWidth: width / columns
+
         Repeater {
-            model: 1
+            model: previewModel
 
             delegate: ListView {
                 id: column
                 anchors { top: parent.top; bottom: parent.bottom }
-                width: row.width
+                width: row.columnWidth
                 spacing: row.spacing
                 bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
 
-                model: previewModel
-                cacheBuffer: units.gu(40)
+                model: columnModel
+                cacheBuffer: height
 
                 Behavior on contentY { UbuntuNumberAnimation { } }
 
@@ -80,10 +88,14 @@
                     widgetType: model.type
                     widgetData: model.properties
                     isCurrentPreview: root.isCurrent
-                    anchors { left: parent.left; right: parent.right }
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        leftMargin: units.gu(1)
+                        rightMargin: units.gu(1)
+                    }
 
                     onTriggered: {
-                        processingMouseArea.enabled = true;
                         previewModel.triggered(widgetId, actionId, data);
                     }
 
@@ -94,11 +106,4 @@
             }
         }
     }
-
-    MouseArea {
-        id: processingMouseArea
-        objectName: "processingMouseArea"
-        anchors.fill: parent
-        enabled: false
-    }
 }
 
=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2014-02-12 09:11:54 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2014-03-07 12:41:18 +0000
@@ -24,7 +24,7 @@
 PreviewWidget {
     id: root
 
-    height: row.height
+    height: row.height + units.gu(1)
 
     Row {
         id: row
 
=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2014-02-05 12:37:20 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2014-03-07 12:41:18 +0000
@@ -139,7 +139,7 @@
                             objectName: "trackTitleLabel"
                             anchors { top: parent.top; left: parent.left; right: parent.right }
                             opacity: 0.9
-                            color: Theme.palette.selected.backgroundText
+                            color: "grey"//Theme.palette.selected.backgroundText // TODO karni: Use updated Palette.
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
                             text: modelData["title"]
@@ -152,7 +152,7 @@
                             anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
                             visible: text !== ""
                             opacity: 0.9
-                            color: Theme.palette.selected.backgroundText
+                            color: "lightgrey"//Theme.palette.selected.backgroundText // TODO karni: Use updated Palette.
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
                             text: modelData["subtitle"] || ""
@@ -192,7 +192,7 @@
                         anchors.verticalCenter: parent.verticalCenter
                         width: parent.column3Width
                         opacity: 0.9
-                        color: Theme.palette.selected.backgroundText
+                        color: "grey"//Theme.palette.selected.backgroundText // TODO karni: Use updated Palette.
                         fontSize: "small"
                         horizontalAlignment: Text.AlignRight
                         text: audio.lengthToString(modelData["length"])
 
=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2014-02-07 14:08:40 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2014-03-07 12:41:18 +0000
@@ -34,5 +34,7 @@
         title: root.widgetData["title"] || ""
         subtitle: root.widgetData["subtitle"] || ""
         width: parent.width
+
+        titleSize: "large"
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
--- qml/Dash/Previews/PreviewImageGallery.qml	2014-02-05 12:08:18 +0000
+++ qml/Dash/Previews/PreviewImageGallery.qml	2014-03-07 12:41:18 +0000
@@ -32,6 +32,16 @@
         orientation: ListView.Horizontal
         cacheBuffer: width * 3
         model: root.widgetData["sources"]
+        clip: true
+
+        // 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"
 
=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
--- qml/Dash/Previews/PreviewTextSummary.qml	2014-02-06 10:23:05 +0000
+++ qml/Dash/Previews/PreviewTextSummary.qml	2014-03-07 12:41:18 +0000
@@ -38,7 +38,8 @@
             right: parent.right
         }
         fontSize: "large"
-        color: Theme.palette.selected.backgroundText
+        // TODO karni: Yet another fix requiring Palette update.
+        color: "grey" //Theme.palette.selected.backgroundText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -58,8 +59,10 @@
         }
         height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)
         clip: true
-        fontSize: "medium"
-        color: Theme.palette.selected.backgroundText
+        fontSize: "small"
+        lineHeight: 1.2
+        // TODO karni: Yet another fix requiring Palette update.
+        color: "grey" //Theme.palette.selected.backgroundText
         opacity: .8
         text: widgetData["text"]
         wrapMode: Text.Wrap
 
=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2014-02-21 11:24:12 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2014-03-07 12:41:18 +0000
@@ -46,7 +46,7 @@
             case "audio": return "PreviewAudioPlayback.qml";
             case "gallery": return "PreviewImageGallery.qml";
             case "header": return "PreviewHeader.qml";
-            case "image": return "PreviewZoomableImage.qml"
+            case "image": return "PreviewZoomableImage.qml";
             case "progress": return "PreviewProgress.qml";
             case "rating-input": return "PreviewRatingInput.qml";
             case "reviews": return "PreviewRatingDisplay.qml";
 
=== modified file 'qml/Dash/ScopeDelegateMapper.qml'
--- qml/Dash/ScopeDelegateMapper.qml	2013-10-11 10:12:35 +0000
+++ qml/Dash/ScopeDelegateMapper.qml	2014-03-07 12:41:18 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 
 QtObject {
-    property var scopeDelegateMapping: {"applications.scope": "DashApps.qml",
+    property var scopeDelegateMapping: {"clickscope": "DashApps.qml",
                                        "home.scope": "DashHome.qml"
                                       }
     property string genericScope: "GenericScopeView.qml"
 
=== added file 'qml/Dash/ScopeItem.qml'
--- qml/Dash/ScopeItem.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeItem.qml	2014-03-07 12:41:18 +0000
@@ -0,0 +1,94 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity 0.2
+import "../Components"
+
+Item {
+    id: root
+
+    property alias scope: scopeView.scope
+    property alias previewOpen: previewListView.open
+
+    property ListModel searchHistory
+
+    signal back
+    signal gotoScope(string scopeId)
+    signal openScope(var scope)
+
+    Item {
+        id: scopeViewHolder
+
+        x: previewListView.open ? -width : 0
+        Behavior on x { UbuntuNumberAnimation { } }
+        width: parent.width
+        height: parent.height
+
+        GenericScopeView {
+            id: scopeView
+            width: parent.width
+            height: parent.height
+            isCurrent: scope != null
+            tabBarHeight: scopeItemPageHeader.implicitHeight
+            pageHeader: scopeItemPageHeader
+            previewListView: previewListView
+
+            Connections {
+                target: scopeView.isCurrent ? scope : null
+                onGotoScope: root.gotoScope(scopeId);
+                onOpenScope: root.openScope(scope);
+            }
+        }
+
+        PageHeader {
+            id: scopeItemPageHeader
+            width: parent.width
+            searchEntryEnabled: true
+            searchHistory: root.searchHistory
+            scope: root.scope
+            height: units.gu(8.5)
+            showBackButton: true
+            onBackClicked: root.back();
+
+            childItem: Label {
+                id: label
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+                text: scope ? scope.name : ""
+                color: "#888888"
+                font.family: "Ubuntu"
+                font.weight: Font.Light
+                fontSize: "x-large"
+                elide: Text.ElideRight
+            }
+        }
+    }
+
+    PreviewListView {
+        id: previewListView
+        visible: x != width
+        pageHeader: scopeItemPageHeader
+        scope: root.scope
+        width: parent.width
+        height: parent.height
+        anchors.left: scopeViewHolder.right
+    }
+}
 
=== modified file 'qml/Dash/SearchableResultModel.qml'
--- qml/Dash/SearchableResultModel.qml	2013-09-30 12:17:20 +0000
+++ qml/Dash/SearchableResultModel.qml	2014-03-07 12:41:18 +0000
@@ -15,7 +15,7 @@
  */
 
 import Utils 0.1
-import Unity 0.1
+import Unity 0.2
 
 SortFilterProxyModel {
     id: root
 
=== added file 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== renamed file 'qml/Dash/graphics/[e-mail]' => 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	2013-08-08 14:34:00 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== renamed file 'qml/Dash/graphics/[e-mail]' => 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	2013-08-08 14:34:00 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== modified file 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	2013-12-02 15:58:26 +0000 and qml/Dash/graphics/[e-mail]	2014-03-07 12:41:18 +0000 differ
=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2013-12-04 13:41:51 +0000
+++ qml/Launcher/Launcher.qml	2014-03-07 12:41:18 +0000
@@ -18,7 +18,6 @@
 import "../Components"
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
-import Unity 0.1
 import Unity.Launcher 0.1
 
 Item {
 
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2013-12-04 13:41:51 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-03-07 12:41:18 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItems
-import Unity 0.1
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 0.1
 import "../Components/ListItems"
 
=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-01-14 16:44:35 +0000
+++ qml/Panel/MenuContent.qml	2014-03-07 12:41:18 +0000
@@ -26,6 +26,7 @@
 MainView {
     id: content
 
+    nativeOrientationAngle: 0 // stop contents being re-rotated when shell in landscape
     property QtObject indicatorsModel: null
     property bool __contentActive: false
     readonly property int currentMenuIndex: tabs.selectedTabIndex
 
=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2014-01-10 10:42:44 +0000
+++ qml/ScopeTool.qml	2014-03-07 12:41:18 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Utils 0.1
-import Unity 0.1
+import Unity 0.2
 import "Components"
 import "Dash"
 
@@ -61,6 +61,14 @@
         color: "#FCFCFC"
     }
 
+    Image {
+        anchors.fill: dashContent
+        source: root.width > root.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
+        fillMode: Image.PreserveAspectCrop
+        horizontalAlignment: Image.AlignRight
+        verticalAlignment: Image.AlignTop
+    }
+
     DashContent {
         id: dashContent
 
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-03-04 11:42:38 +0000
+++ qml/Shell.qml	2014-03-07 12:41:18 +0000
@@ -37,6 +37,7 @@
 
 FocusScope {
     id: shell
+    objectName: "shell"
 
     // this is only here to select the width / height of the window if not running fullscreen
     property bool tablet: false
@@ -77,10 +78,11 @@
         // FIXME: if application focused before shell starts, shell draws on top of it only.
         // We should detect already running applications on shell start and bring them to the front.
         applicationManager.unfocusCurrentApplication();
+
+        applicationManager.setMainStageAppRect(mainStageAppRect);
+        applicationManager.setSideStageAppRect(sideStageAppRect);
     }
 
-    readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication
-                                               || !!applicationManager.sideStageFocusedApplication
     // Used for autopilot testing.
     readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId
 
@@ -116,6 +118,11 @@
         }
     }
 
+    Connections {
+        target: applicationManager
+        onFocusRequested: activateApplication(appId)
+    }
+
     GSettings {
         id: backgroundSettings
         schema.id: "org.gnome.desktop.background"
@@ -125,27 +132,6 @@
         shell.background = gSettingsPicture
     }
 
-    // This is a dummy image that is needed to determine if the picture url
-    // in backgroundSettings points to a valid picture file.
-    // We can't do this with the real background image because setting a
-    // new source in onStatusChanged triggers a binding loop detection
-    // inside Image, which causes it not to render even though a valid source
-    // would be set. We don't mind about this image staying black and just
-    // use it for verification to populate the source for the real
-    // background image.
-    Image {
-        source: shell.background
-        height: 0
-        width: 0
-        sourceSize.height: 0
-        sourceSize.width: 0
-        onStatusChanged: {
-            if (status == Image.Error && source != shell.defaultBackground) {
-                shell.background = defaultBackground
-            }
-        }
-    }
-
     VolumeControl {
         id: volumeControl
     }
@@ -161,67 +147,94 @@
         // Whether the underlay is fully covered by opaque UI elements.
         property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
 
-        readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)
-                                           || (sideStage.applications && sideStage.applications.count > 0))
+        readonly property bool mainStageApplicationRunning: mainStage.applications && mainStage.applications.count > 0
+        readonly property bool sideStageApplicationRunning: sideStage.applications && sideStage.applications.count > 0
 
         // Whether the user should see the topmost application surface (if there's one at all).
-        readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden
+        readonly property bool mainStageApplicationShown: mainStageApplicationRunning && !stages.fullyHidden
                                            && !mainStage.usingScreenshots // but want sideStage animating over app surface
 
 
 
         // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user
         // through the translucent parts of the shell surface.
-        visible: !fullyCovered && !applicationSurfaceShouldBeSeen
-
-        CrossFadeImage {
-            id: backgroundImage
-            objectName: "backgroundImage"
-
-            anchors.fill: parent
-            source: shell.background
-            fillMode: Image.PreserveAspectCrop
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            color: "black"
-            opacity: dash.disappearingAnimationProgress
-        }
-
-        Dash {
-            id: dash
-            objectName: "dash"
-
-            available: !greeter.shown && !lockscreen.shown
-            hides: [stages, launcher, panel.indicators]
-            shown: disappearingAnimationProgress !== 1.0
-            enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
-            // FIXME: unfocus all applications when going back to the dash
-            onEnabledChanged: {
-                if (enabled) {
-                    shell.applicationManager.unfocusCurrentApplication()
-                }
-            }
-
-            anchors {
-                fill: parent
-                topMargin: panel.panelHeight
-            }
-
-            contentScale: 1.0 - 0.2 * disappearingAnimationProgress
-            opacity: 1.0 - disappearingAnimationProgress
-            property real disappearingAnimationProgress: {
-                if (greeter.shown) {
-                    return greeter.showProgress;
+        visible: !fullyCovered && !mainStageApplicationShown
+
+        Item {
+            id: underlayClipper
+            clip: !parent.mainStageApplicationShown && parent.sideStageApplicationRunning && stagesOuterContainer.showProgress > 0
+            width: {
+                if (clip) {
+                    var w = parent.width - sideStage.width
+                    w += stagesOuterContainer.x + stages.x + (sideStage.x - sideStageRevealer.openedValue)
+                    return Math.min(w, parent.width);
                 } else {
-                    return stagesOuterContainer.showProgress;
-                }
-            }
-
-            // FIXME: only necessary because stagesOuterContainer.showProgress and
-            // greeterRevealer.animatedProgress are not animated
-            Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
+                    return parent.width;
+                }
+            }
+            height: parent.height
+
+            Image {
+                anchors.fill: dash
+                source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
+                fillMode: Image.PreserveAspectCrop
+                horizontalAlignment: Image.AlignRight
+                verticalAlignment: Image.AlignTop
+            }
+
+            Dash {
+                id: dash
+                objectName: "dash"
+
+                available: !greeter.shown && !lockscreen.shown
+                hides: [stages, launcher, panel.indicators]
+                shown: disappearingAnimationProgress !== 1.0
+                enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
+                // FIXME: unfocus all applications when going back to the dash
+                onEnabledChanged: {
+                    if (enabled) {
+                        shell.applicationManager.unfocusCurrentApplication()
+                    }
+                }
+
+                width: underlay.width
+                height: underlay.height - y
+                y: panel.panelHeight
+
+                contentScale: 1.0 - 0.2 * disappearingAnimationProgress
+                opacity: 1.0 - disappearingAnimationProgress
+                property real disappearingAnimationProgress: {
+                    if (greeter.shown) {
+                        return greeter.showProgress;
+                    } else {
+                        if (underlayClipper.clip)
+                            return 0;
+                        else
+                            return stagesOuterContainer.showProgress;
+                    }
+                }
+
+                // FIXME: only necessary because stagesOuterContainer.showProgress and
+                // greeterRevealer.animatedProgress are not animated
+                Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
+            }
+
+            Rectangle {
+                width: underlay.width
+                height: underlay.height
+                color: "black"
+                opacity: 0.5 * ((sideStage.x - sideStageRevealer.closedValue) / (sideStageRevealer.openedValue - sideStageRevealer.closedValue))
+                visible: sideStageHideButton.enabled
+            }
+
+            AbstractButton {
+                id: sideStageHideButton
+                enabled: mainStage.applications.count == 0 && sideStage.shown
+                anchors.fill: parent
+                onClicked: {
+                    sideStage.hide();
+                }
+            }
         }
     }
 
@@ -230,7 +243,7 @@
 
         width: parent.width
         height: parent.height
-        x: launcher.progress
+        x: mainStage.applications.count > 0 ? launcher.progress : 0
         Behavior on x {SmoothedAnimation{velocity: 600}}
 
         property real showProgress:
@@ -242,6 +255,16 @@
 
             x: width
 
+            function doLauncherHide() {
+                if (mainStage.applications.count > 0) {
+                    hide();
+                } else {
+                    if (sideStage.shown) {
+                        sideStage.hide();
+                    }
+                }
+            }
+
             property bool fullyShown: shown && x == 0 && parent.x == 0
             property bool fullyHidden: !shown && x == width
             available: !greeter.shown
@@ -326,11 +349,6 @@
                 rightEdgeDraggingAreaWidth: shell.edgeSize
                 normalApplicationY: shell.panelHeight
 
-                onShownChanged: {
-                    if (!shown && mainStage.applications.count == 0) {
-                        stages.hide();
-                    }
-                }
                 // FIXME: when hiding the side stage, refocus the main stage
                 // application so that it goes in front of the side stage
                 // application and hides it
@@ -355,12 +373,29 @@
                 width: units.gu(40)
                 height: stages.height
                 handleExpanded: sideStageRevealer.pressed
+
+                Connections {
+                    target: sideStage.applications
+                    onCountChanged: {
+                        if (sideStage.applications.count == 0) {
+                            if (sideStage.shown) { // if all SS app closed, hide side stage
+                                sideStage.hide();
+                            } else {
+                                // Sidestage is hidden and there is no main app, make sure the
+                                // stages is totally hidden too
+                                if (mainStage.applications.count == 0) {
+                                    stages.hideNow();
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
             Revealer {
                 id: sideStageRevealer
 
-                enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0
+                enabled: sideStage.applications.count > 0
                          && sideStage.available
                 direction: Qt.RightToLeft
                 openedValue: parent.width - sideStage.width
@@ -378,6 +413,26 @@
                 orientation: Qt.Horizontal
             }
 
+            // Defines the rectangle occupied by an application on the main or side stage.
+            // Used only to inform the ApplicationManager. Can be removed when the proper
+            // architecture is in place (unity8 as mir compositor).
+            Item {
+                id: mainStageAppRect
+                x: mainStage.x
+                y: mainStage.y + mainStage.normalApplicationY
+                width: mainStage.width
+                height: mainStage.height
+                visible: false; enabled: false
+            }
+            Item {
+                id: sideStageAppRect
+                x: sideStageRevealer.openedValue
+                y: sideStage.y + sideStage.normalApplicationY
+                width: sideStage.width
+                height: sideStage.height
+                visible: false; enabled: false
+            }
+
             DragHandle {
                 id: stagesDragHandle
 
@@ -461,7 +516,7 @@
         hides: [launcher, panel.indicators, hud]
         shown: true
 
-        defaultBackground: shell.background
+        defaultBackground: shell.defaultBackground
 
         y: panel.panelHeight
         width: parent.width
@@ -474,7 +529,9 @@
 
         function removeApplicationFocus() {
             greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
-            greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
+            if (sideStage.fullyShown) { // if side stage hidden, don't focus it on restore
+                greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
+            }
             applicationManager.unfocusCurrentApplication();
         }
 
@@ -543,8 +600,14 @@
     }
 
     InputFilterArea {
-        anchors.fill: parent
-        blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
+        width: {
+            if (applicationManager.sideStageFocusedApplication && sideStage.shown)
+                return parent.width - sideStage.width;
+            else
+                return parent.width;
+        }
+        height: parent.height
+        blockInput: !applicationManager.mainStageFocusedApplication || greeter.shown || lockscreen.shown || launcher.shown
                     || panel.indicators.shown || hud.shown
     }
 
@@ -571,7 +634,7 @@
     function showHome() {
         var animate = !greeter.shown && !stages.shown
         greeter.hide()
-        dash.setCurrentScope("home.scope", animate, false)
+        dash.setCurrentScope("clickscope", animate, false)
         stages.hide()
     }
 
@@ -594,7 +657,7 @@
                 contentEnabled: edgeDemo.panelContentEnabled
             }
             fullscreenMode: shell.fullscreenMode
-            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
+            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
 
             InputFilterArea {
                 anchors {
@@ -646,7 +709,7 @@
             theHud: hud
             anchors.fill: parent
             enabled: hud.available
-            applicationIsOnForeground: applicationFocused
+            applicationIsOnForeground: (stages.shown && mainStage.applications.count > 0) || (stages.shown && sideStage.shown)
         }
 
         InputFilterArea {
@@ -668,7 +731,7 @@
             anchors.bottom: parent.bottom
             width: parent.width
             dragAreaWidth: shell.edgeSize
-            available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
+            available: !greeter.locked && edgeDemo.launcherEnabled
 
             onShowDashHome: {
                 if (edgeDemo.running)
@@ -678,11 +741,11 @@
             }
             onDash: {
                 if (stages.shown) {
-                    stages.hide();
+                    stages.doLauncherHide();
                     launcher.hide();
                 }
             }
-            onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("applications.scope", false, true)
+            onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
             onLauncherApplicationSelected:{
                 if (edgeDemo.running)
                     return;
@@ -762,21 +825,6 @@
         value: "unity8"
     }
 
-    OSKController {
-        anchors.topMargin: panel.panelHeight
-        anchors.fill: parent // as needs to know the geometry of the shell
-    }
-
-    //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
-    MouseArea {
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: shell.applicationManager ? shell.applicationManager.keyboardHeight : 0
-
-        enabled: shell.applicationManager && shell.applicationManager.keyboardVisible
-    }
-
     Label {
         anchors.centerIn: parent
         visible: applicationManager.fake
@@ -797,7 +845,7 @@
         launcher: launcher
         dash: dash
         indicators: panel.indicators
-        underlay: underlay
+        underlay: underlayClipper
     }
 
     Connections {
 
=== added file 'qml/ShellOrientator.qml'
--- qml/ShellOrientator.qml	1970-01-01 00:00:00 +0000
+++ qml/ShellOrientator.qml	2014-03-07 12:41:18 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import Unity.Application 0.1
+
+Item {
+    id: orientator
+
+    // this is only here to select the width / height of the window if not running fullscreen
+    property bool tablet: false
+    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
+    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
+
+    Item {
+        anchors.fill: parent
+        rotation: Screen.angleBetween(nativeOrientation, Screen.primaryOrientation)
+        Shell {
+            x: (parent.rotation == 0) ? 0 : (parent.width - parent.height) / 2
+            y: (parent.rotation == 0) ? 0 : -(parent.width - parent.height) / 2
+            width: (parent.rotation == 0) ? parent.width : parent.height
+            height: (parent.rotation == 0) ? parent.height : parent.width
+        }
+    }
+
+    OSKController {
+        anchors.fill: parent // as needs to know the geometry of the shell
+    }
+}
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2014-02-27 11:54:16 +0000
+++ src/main.cpp	2014-03-07 12:41:18 +0000
@@ -98,6 +98,16 @@
         view->setFlags(Qt::FramelessWindowHint);
     }
 
+    const QByteArray orientation = qgetenv("NATIVE_ORIENTATION");
+    Qt::ScreenOrientation orientationAngle = Qt::PrimaryOrientation;
+    if (orientation == "landscape") {
+        orientationAngle = Qt::LandscapeOrientation;
+    } else if (!orientation.isEmpty() && orientation != "portrait") {
+        qDebug() << "Unknown NATIVE_ORIENTATION setting, ignoring";
+    }
+
+    view->rootContext()->setContextProperty("nativeOrientation", orientationAngle);
+
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;
@@ -115,7 +125,7 @@
     nativeInterface->setProperty("ubuntuSessionType", 1);
     view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
 
-    QUrl source(::qmlDirectory()+"Shell.qml");
+    QUrl source(::qmlDirectory()+"ShellOrientator.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());
     appendImportPaths(view->engine(), ::fallbackImportPaths());
 
 
=== modified file 'tests/mocks/Unity/fake_unity_plugin.cpp'
--- tests/mocks/Unity/fake_unity_plugin.cpp	2014-02-07 09:55:56 +0000
+++ tests/mocks/Unity/fake_unity_plugin.cpp	2014-03-07 12:41:18 +0000
@@ -48,5 +48,12 @@
     qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create");
     qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
 
-    qmlRegisterType<scopes_ng::PreviewModel>(uri, 0, 1, "FakePreviewModel");
+    // same for version 0.2
+    qmlRegisterUncreatableType<Preview>(uri, 0, 2, "Preview", "Can't create Preview object in QML.");
+    qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");
+    qmlRegisterType<Scope>(uri, 0, 2, "Scope");
+    qmlRegisterType<Categories>(uri, 0, 2, "Categories");
+    qmlRegisterUncreatableType<CategoryResults>(uri, 0, 2, "CategoryResults", "Can't create");
+    qmlRegisterType<DeeListModel>(uri, 0, 2, "DeeListModel");
+    qmlRegisterType<scopes_ng::PreviewModel>(uri, 0, 2, "FakePreviewModel");
 }
 
=== modified file 'tests/plugins/DashViews/organicgridtest.cpp'
--- tests/plugins/DashViews/organicgridtest.cpp	2014-01-14 12:25:52 +0000
+++ tests/plugins/DashViews/organicgridtest.cpp	2014-03-07 12:41:18 +0000
@@ -134,11 +134,12 @@
         view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/organicgridtest.qml"));
 
         view->show();
+        QTest::qWaitForWindowExposed(view);
         view->resize(470, 400);
-        QTest::qWaitForWindowExposed(view);
 
         grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
         grid->setModel(model);
+        QTRY_COMPARE(grid->width(), 470.);
 
         checkInitialPositions();
     }
 
=== modified file 'tests/plugins/DashViews/verticaljournaltest.cpp'
--- tests/plugins/DashViews/verticaljournaltest.cpp	2014-01-17 10:08:23 +0000
+++ tests/plugins/DashViews/verticaljournaltest.cpp	2014-03-07 12:41:18 +0000
@@ -135,11 +135,12 @@
         view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));
 
         view->show();
-        view->resize(470, 400);
         QTest::qWaitForWindowExposed(view);
+        view->resize(470, 400);
 
         vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
         vj->setModel(model);
+        QTRY_COMPARE(vj->width(), 470.);
 
         checkInitialPositions();
     }
 
=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2014-02-24 16:05:07 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2014-03-07 12:41:18 +0000
@@ -103,6 +103,14 @@
 {
     GestureTest::init();
 
+    // We shouldn't need the three lines below, but a compiz/unity7
+    // regression means we don't pass the test without them because
+    // the window doesn't have the proper size. Can be removed in the
+    // future if the regression is fixed and tests pass again
+    m_view->resize(m_view->rootObject()->width(), m_view->rootObject()->height());
+    QTRY_COMPARE(m_view->width(), (int)m_view->rootObject()->width());
+    QTRY_COMPARE(m_view->height(), (int)m_view->rootObject()->height());
+
     fakeTimeSource.reset(new FakeTimeSource);
     fakeTimer = new FakeTimer(fakeTimeSource);
 }
 
=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2014-02-12 08:22:16 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2014-03-07 12:41:18 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Unity 0.1 as Unity
+import Unity 0.2 as Unity
 
 Rectangle {
     id: root
 
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-02-05 08:20:25 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-03-07 12:41:18 +0000
@@ -301,18 +301,18 @@
             }
 
             function test_getRendererCarouselGridFallback() {
-                var rendererId = "carousel"
-                var contentType = ""
-                var rendererHint = ""
+                var template = new Object()
+                template["category-layout"] = "carousel"
                 var results = new Object()
-
-                results.count = 7
-                var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
-                compare(renderer, "Generic/GenericCarousel.qml")
-
-                results.count = 6
-                renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
-                compare(renderer, "Generic/GenericFilterGrid.qml")
+                var renderer
+
+                results.count = 5
+                renderer = genericScopeView.getRenderer(template, results)
+                compare(renderer, "CardCarousel.qml")
+
+                results.count = 4
+                renderer = genericScopeView.getRenderer(template, results)
+                compare(renderer, "CardFilterGrid.qml")
             }
 
             function test_showPreviewCarousel() {
 
=== modified file 'tools/registry-tracker.cpp'
--- tools/registry-tracker.cpp	2013-12-20 15:27:59 +0000
+++ tools/registry-tracker.cpp	2014-03-07 12:41:18 +0000
@@ -112,5 +112,6 @@
     QStringList arguments;
     arguments << m_runtime_config.fileName();
 
+    m_registry.setProcessChannelMode(QProcess::ForwardedChannels);
     m_registry.start(registryBin, arguments);
 }