Merge lp:~cimi/unity8/card_emblems_2 into lp:unity8

[Andrea Cimitan]

Add emblems

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * Did you make sure that your branch does not contain spurious tags?
Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[lp:~cimi/unity8/card_emblems_2]

1094. By Andrea Cimitan on 2014-07-31

Fixed tests

1095. By Andrea Cimitan on 2014-07-31

Fixed test

1096. By Andrea Cimitan on 2014-07-31

Added test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1093
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/~cimi/unity8/card_emblems_2/+merge/229046/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/3707/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/801
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4076
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4076/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10782

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1096
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/~cimi/unity8/card_emblems_2/+merge/229046/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/3714/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2858
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/808
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4101
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10800

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * Did you make sure that your branch does not contain spurious tags?
Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[Ying-Chun Liu (paulliu)]

https://lh4.googleusercontent.com/-ojBSF1KXbFw/U9tocwn1Q7I/AAAAAAAAAH8/kVju9EpvY34/w455-h391-no/Screenshot%2Bfrom%2B2014-08-01%2B18%3A11%3A06.png

[Ying-Chun Liu (paulliu)]

cardTool?

[lp:~cimi/unity8/card_emblems_2]

1097. By Andrea Cimitan on 2014-08-01

More fixes

[Ying-Chun Liu (paulliu)]

In the diff there's conflict. Seems we need a re-merge trunk here?

[lp:~cimi/unity8/card_emblems_2]

1098. By Andrea Cimitan on 2014-08-01

[ Gerry Boland ]
* Fix the run.sh script - pretend to be running with qtmir and emit
  SIGSTOP at the right time
[ Ying-Chun Liu ]
* Implement Attribute UI. (LP: #1282460)
[ Albert Astals ]
* Hide search history popup as soon as you start typing As discussed
  with Mike and Saviq
* Compile with for scopes-v3 unity-api
* PageHeader: Unfocus search field when search entry is selected
* Show search field if the search query changes
* Test: Add a condition for art.height being > 0 means stuff has
  already been layouted a bit without it it can happen that we get 0
  for everything at startup and tests still pass
* Remove leftover in test of an old headerless implementation
[ Michael Zanetti ]
* Drop Recent apps category from Dash (LP: #1281092)
* update launcher count emblems to match new spec (LP: #1338984)
[ Bill Filler ]
* disable predictive text for dash search field (LP: #1340409)
[ CI bot ]
* Resync trunk
[ Antti Kaijanmäki ]
* DefaultIndicatorPage: use Loader status to determine the visible
  property. (LP: #1350555)

1099. By Andrea Cimitan on 2014-08-01

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/unity8-ci/3734/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2899
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/828
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/828/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/828
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10843

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/unity8-ci/3740/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2929
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/834
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/834
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4172
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10874

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/unity8-ci/3775/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3070
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/869
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/869
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11042

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

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity8/card_emblems_2]

1100. By Andrea Cimitan on 2014-08-08

merged trunk

1101. By Andrea Cimitan on 2014-08-08

Fix categories with attributes

1102. By Andrea Cimitan on 2014-08-08

Moar fixes

1103. By Andrea Cimitan on 2014-08-08

Fixed whitespaces

1104. By Andrea Cimitan on 2014-08-08

merged overview

[Michał Sawicz (saviq)]

When emblem is declared, but invalid, there's no right text margin.

You should use StatusIcon (like attributes do) for the emblem, and colourize it with the foreground color.

review: Needs Fixing

[lp:~cimi/unity8/card_emblems_2]

1105. By Andrea Cimitan on 2014-08-08

Fixed right padding

1106. By Andrea Cimitan on 2014-08-08

Fixed issue of spacing when the touchdown is on the art only

1107. By Andrea Cimitan on 2014-08-08

Fixed another review erequest

1108. By Andrea Cimitan on 2014-08-08

Add colorisation

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1100
http://jenkins.qa.ubuntu.com/job/unity8-ci/3829/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3235
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/831/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/923
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/923/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4480
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11190

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

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity8/card_emblems_2]

1109. By Andrea Cimitan on 2014-08-11

Fix issue in reviewy

Unmerged revisions

=== modified file 'data/unity8-dash.conf'
--- data/unity8-dash.conf	2014-07-29 11:35:10 +0000
+++ data/unity8-dash.conf	2014-08-08 14:57:17 +0000
@@ -13,7 +13,7 @@
 pre-start script
     if [ -z "$UNITY_SCOPES_LIST" ]; then
         # FIXME: remove once we have this in dconf
-        initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
+        initctl set-env UNITY_SCOPES_LIST="clickscope;musicaggregator;videoaggregator"
     fi
 
     initctl emit scope-ui-starting

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-08-06 19:39:39 +0000
+++ plugins/Dash/CardCreator.js	2014-08-08 14:57:17 +0000
@@ -108,6 +108,7 @@
                             sourceComponent: ShaderEffect { \n\
                                 id: overlay; \n\
                                 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
+                                property real luminance: 0.2126 * overlayColor.r + 0.7152 * overlayColor.g + 0.0722 * overlayColor.b; \n\
                                 property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
                                 property var source: ShaderEffectSource { \n\
                                     id: shaderSource; \n\
@@ -137,69 +138,43 @@
                             } \n\
                         }\n';
 
-// %1 is used as anchors of row
-// %2 is used as first child of the row
-// %3 is used as second child of the row
-var kHeaderRow2Code = 'Row { \n\
-                        id: row; \n\
-                        objectName: "outerRow"; \n\
-                        property real margins: units.gu(1); \n\
-                        spacing: margins; \n\
-                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
-                        anchors { %1 } \n\
-                        anchors.right: parent.right; \n\
-                        anchors.margins: margins;\n\
-                        data: [ %2\n\
-                                ,\n\
-                                %3 \n\
-                                ] \n\
-                    }\n';
-
-// %1 is used as anchors of row
-// %2 is used as first child of the row
-// %3 is used as second child of the row
-// %4 is used as third child of the row
-var kHeaderRow3Code = 'Row { \n\
-                        id: row; \n\
-                        objectName: "outerRow"; \n\
-                        property real margins: units.gu(1); \n\
-                        spacing: margins; \n\
-                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
-                        anchors { %1 } \n\
-                        anchors.right: parent.right; \n\
-                        anchors.margins: margins;\n\
-                        data: [ %2\n\
-                                ,\n\
-                                %3 \n\
-                                ,\n\
-                                %4 \n\
-                                ] \n\
-                    }\n';
-
-// %1 is used as first child of the column
-// %2 is used as second child of the column
-var kHeaderColumnCode = 'Column { \n\
-                            anchors.verticalCenter: parent.verticalCenter; \n\
-                            spacing: units.dp(2); \n\
-                            width: parent.width - x;\n\
-                            data: [ %1\n\
-                                    ,\n\
-                                    %2 \n\
-                                  ] \n\
+// multiple row version of HeaderRowCode
+function kHeaderRowCodeGenerator() {
+var kHeaderRowCodeTemplate = 'Row { \n\
+                        id: row; \n\
+                        objectName: "outerRow"; \n\
+                        property real margins: units.gu(1); \n\
+                        spacing: margins; \n\
+                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
+                        anchors { %1 } \n\
+                        anchors.right: parent.right; \n\
+                        anchors.margins: margins; \n\
+                        anchors.rightMargin: 0; \n\
+                        data: [ \n\
+                                %2 \n\
+                                ] \n\
+                    }\n';
+    var args = Array.prototype.slice.call(arguments);
+    var HeaderRowAnchors = args.shift();
+    var code = kHeaderRowCodeTemplate.arg(HeaderRowAnchors).arg(args.join(',\n'));
+    return code;
+}
+
+// multiple item version of kHeaderContainerCode
+function kHeaderContainerCodeGenerator() {
+    var headerContainerCodeTemplate = 'Item { \n\
+                            id: headerTitleContainer; \n\
+                            anchors { %1 } \n\
+                            width: parent.width - x; \n\
+                            implicitHeight: %2; \n\
+                            data: [ \n\
+                                %3 \n\
+                            ]\n\
                         }\n';
-
-// multiple column version of kHeaderColumnCode.
-function kHeaderColumnCodeGenerator() {
-    var headerColumnCodeTemplate = 'Column { \n\
-                    anchors.verticalCenter: parent.verticalCenter; \n\
-                    spacing: units.dp(2); \n\
-                    width: parent.width - x;\n\
-                    data: [ \n\
-                        %1 \n\
-                    ]\n\
-                }\n';
     var args = Array.prototype.slice.call(arguments);
-    var code = headerColumnCodeTemplate.arg(args.join(',\n'));
+    var headerContainerAnchors = args.shift();
+    var headerContainerHeight = args.shift();
+    var code = headerContainerCodeTemplate.arg(headerContainerAnchors).arg(headerContainerHeight).arg(args.join(',\n'));
     return code;
 }
 
@@ -223,7 +198,7 @@
                             objectName: "mascotImage"; \n\
                             anchors { %1 } \n\
                             readonly property int maxSize: Math.max(width, height) * 4; \n\
-                            source: cardData && cardData["mascot"]; \n\
+                            source: cardData && cardData["mascot"] || ""; \n\
                             width: units.gu(6); \n\
                             height: units.gu(5.625); \n\
                             sourceSize { width: maxSize; height: maxSize } \n\
@@ -252,6 +227,20 @@
                         horizontalAlignment: root.headerAlignment; \n\
                     }\n';
 
+var kEmblemImageCode = 'Image { \n\
+                            id: emblemImage; \n\
+                            objectName: "emblemImage"; \n\
+                            anchors { \n\
+                            bottom: titleLabel.baseline; \n\
+                            right: parent.right; \n\
+                            rightMargin: status === Image.Ready ? units.gu(1) : 0; \n\
+                            } \n\
+                            source: cardData && cardData["emblem"] || ""; \n\
+                            width: height; \n\
+                            height: status === Image.Ready ? titleLabel.font.pixelSize : 0; \n\
+                            fillMode: Image.PreserveAspectFit; \n\
+                        }\n';
+
 // %1 is used as anchors of touchdown effect
 var kTouchdownCode = 'UbuntuShape { \n\
                         id: touchdown; \n\
@@ -268,6 +257,7 @@
                             id: subtitleLabel; \n\
                             objectName: "subtitleLabel"; \n\
                             anchors { %1 } \n\
+                            anchors.topMargin: units.dp(2); \n\
                             elide: Text.ElideRight; \n\
                             fontSize: "small"; \n\
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
@@ -284,7 +274,7 @@
                             objectName: "attributesRow"; \n\
                             anchors { %1 } \n\
                             color: %2; \n\
-                            model: cardData["attributes"]; \n\
+                            model: cardData && cardData["attributes"]; \n\
                           }\n';
 
 // %1 is used as top anchor of summary
@@ -334,10 +324,11 @@
     var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
     var hasTitle = components["title"] || false;
     var hasMascot = components["mascot"] || false;
+    var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
     var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
     var hasSubtitle = hasTitle && components["subtitle"] || false;
     var hasHeaderRow = hasMascot && hasTitle;
-    var hasAttributes = hasTitle && components["attributes"] || false;
+    var hasAttributes = hasTitle && components["attributes"]["field"] || false;
 
     if (hasBackground) {
         code += kBackgroundLoaderCode;
@@ -348,9 +339,9 @@
         code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
 
         var widthCode, heightCode;
-        var anchors;
+        var artAnchors;
         if (isHorizontal) {
-            anchors = 'left: parent.left';
+            artAnchors = 'left: parent.left';
             if (hasMascot || hasTitle) {
                 widthCode = 'height * artShape.aspect'
                 heightCode = 'headerHeight + 2 * units.gu(1)';
@@ -361,12 +352,12 @@
                 heightCode = 'units.gu(7.625)';
             }
         } else {
-            anchors = 'horizontalCenter: parent.horizontalCenter;';
+            artAnchors = 'horizontalCenter: parent.horizontalCenter;';
             widthCode = 'root.width'
             heightCode = 'width / artShape.aspect';
         }
 
-        code += kArtShapeHolderCode.arg(anchors).arg(widthCode).arg(heightCode);
+        code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode);
     } else {
         code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
     }
@@ -423,155 +414,194 @@
         code += 'readonly property int headerHeight: 0;\n'
     }
 
-    var mascotShapeCode = "";
-    var mascotCode = "";
+    var mascotShapeCode = '';
+    var mascotCode = '';
     if (hasMascot) {
         var useMascotShape = !hasBackground && !headerAsOverlay;
-        var anchors = "";
+        var mascotAnchors = '';
         if (!hasHeaderRow) {
-            anchors += headerLeftAnchor;
-            anchors += headerVerticalAnchors;
+            mascotAnchors += headerLeftAnchor;
+            mascotAnchors += headerVerticalAnchors;
             if (!headerLeftAnchorHasMargin) {
-                anchors += 'leftMargin: units.gu(1);\n'
+                mascotAnchors += 'leftMargin: units.gu(1);\n'
             }
         } else {
-            anchors = "verticalCenter: parent.verticalCenter;"
+            mascotAnchors = 'verticalCenter: parent.verticalCenter;'
         }
 
         if (useMascotShape) {
-            mascotShapeCode = kMascotShapeLoaderCode.arg(anchors);
+            mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
         }
 
         var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
-        mascotCode = kMascotImageCode.arg(anchors).arg(mascotImageVisible);
+        mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
     }
 
-    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey")';
+    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';
 
-    var titleSubtitleCode = "";
+    var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
+    var titleSubtitleCode = '';
     if (hasTitle) {
-        var color;
+        var titleColor;
         if (headerAsOverlay) {
-            color = '"white"';
+            titleColor = 'overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';
         } else if (hasSummary) {
-            color = 'summary.color';
+            titleColor = 'summary.color';
         } else if (hasBackground) {
-            color = summaryColorWithBackground;
+            titleColor = summaryColorWithBackground;
         } else {
-            color = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
+            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
         }
 
         var titleAnchors;
         var subtitleAnchors;
         var attributesAnchors;
-        if (hasMascot && (hasSubtitle || hasAttributes)) {
-            // Using row + column
-            titleAnchors = 'left: parent.left; right: parent.right';
-            subtitleAnchors = titleAnchors;
-            attributesAnchors = subtitleAnchors;
+        var titleContainerAnchors;
+        var titleRightAnchor;
+
+        if (hasMascot) {
+            titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';
+        } else {
+            titleContainerAnchors = 'right: parent.right; ';
+            titleContainerAnchors += headerLeftAnchor;
+            titleContainerAnchors += headerVerticalAnchors;
+            if (!headerLeftAnchorHasMargin) {
+                titleContainerAnchors += 'leftMargin: units.gu(1);\n';
+            }
+        }
+        if (hasEmblem) {
+            titleRightAnchor = 'right: emblemImage.left; \n\
+                                rightMargin: emblemImage.width > 0 ? units.gu(0.5) : 0; \n';
+        } else {
+            titleRightAnchor = 'right: parent.right; \n\
+                                rightMargin: units.gu(1); \n';
+        }
+
+        if (hasTitleContainer) {
+            // Using headerTitleContainer
+            titleAnchors = titleRightAnchor;
+            titleAnchors += 'left: parent.left; \n\
+                             top: parent.top;';
+            subtitleAnchors = 'right: parent.right; \n\
+                               left: parent.left; \n\
+                               rightMargin: units.gu(1); \n';
+            if (hasSubtitle) {
+                attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
+                subtitleAnchors += 'top: titleLabel.bottom;\n';
+            } else {
+                attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
+            }
         } else if (hasMascot) {
-            // Using row + label
-            titleAnchors = 'verticalCenter: parent.verticalCenter;\n'
+            // Using row + titleContainer
+            titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
         } else {
             if (headerAsOverlay) {
                 // Using anchors to the overlay
-                titleAnchors = 'left: parent.left; \n\
-                                leftMargin: units.gu(1); \n\
-                                right: parent.right; \n\
-                                rightMargin: units.gu(1); \n\
-                                top: overlayLoader.top; \n\
-                                topMargin: units.gu(1);\n';
+                titleAnchors = titleRightAnchor;
+                titleAnchors += 'left: parent.left; \n\
+                                 leftMargin: units.gu(1); \n\
+                                 top: overlayLoader.top; \n\
+                                 topMargin: units.gu(1);\n';
             } else {
                 // Using anchors to the mascot/parent
-                titleAnchors = "right: parent.right;\n";
-                titleAnchors += "rightMargin: units.gu(1);\n";
+                titleAnchors = titleRightAnchor;
                 titleAnchors += headerLeftAnchor;
                 titleAnchors += headerVerticalAnchors;
                 if (!headerLeftAnchorHasMargin) {
-                    titleAnchors += 'leftMargin: units.gu(1);\n'
+                    titleAnchors += 'leftMargin: units.gu(1);\n';
                 }
             }
             subtitleAnchors = 'left: titleLabel.left; \n\
                                leftMargin: titleLabel.leftMargin; \n\
-                               right: titleLabel.right; \n\
-                               rightMargin: titleLabel.rightMargin; \n\
-                               top: titleLabel.bottom; \n\
-                               topMargin: units.dp(2);\n';
+                               rightMargin: units.gu(1); \n';
+            if (hasEmblem) {
+                // using container
+                subtitleAnchors += 'right: parent.right; \n';
+            } else {
+                subtitleAnchors += 'right: titleLabel.right; \n';
+            }
+
             if (hasSubtitle) {
-                attributesAnchors = 'left: subtitleLabel.left; \n\
-                                   leftMargin: subtitleLabel.leftMargin; \n\
-                                   right: subtitleLabel.right; \n\
-                                   rightMargin: subtitleLabel.rightMargin; \n\
-                                   top: subtitleLabel.bottom; \n\
-                                   topMargin: units.dp(2);\n';
+                attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
+                subtitleAnchors += 'top: titleLabel.bottom;\n';
             } else {
-                attributesAnchors = subtitleAnchors;
+                attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
             }
         }
 
+        // code for different elements
         var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
-        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(color).arg(titleLabelVisibleExtra);
-        var subtitleCode = "";
+        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra);
+        var subtitleCode;
+        var attributesCode;
+        var emblemCode;
+
+        // code for the title container
+        var containerCode = [];
+        var containerHeight = 'titleLabel.height';
+        containerCode.push(titleCode);
         if (hasSubtitle) {
-            subtitleCode += kSubtitleLabelCode.arg(subtitleAnchors).arg(color);
+            subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);
+            containerCode.push(subtitleCode);
+            containerHeight += ' + subtitleLabel.height';
+        }
+        if (hasEmblem) {
+            containerCode.push(kEmblemImageCode);
+        }
+        if (hasAttributes) {
+            attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);
+            containerCode.push(kAttributesRowCode.arg(attributesAnchors).arg(titleColor));
+            containerHeight += ' + attributesRow.height';
         }
 
-        if (hasMascot && (hasSubtitle || hasAttributes)) {
-            // If using row + column wrap the code in the column
-            titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);
-            if (hasSubtitle && hasAttributes) {
-                var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);
-                titleSubtitleCode = kHeaderColumnCodeGenerator(titleCode, subtitleCode, attributesCode);
-            } else if (hasSubtitle) {
-                titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);
-            } else if (hasAttributes) {
-                var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);
-                titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(attributesCode);
-            }
+        if (hasTitleContainer) {
+            // use container
+            titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);
         } else {
+            // no container
             titleSubtitleCode = titleCode;
             if (hasSubtitle) {
-                titleSubtitleCode = titleSubtitleCode + subtitleCode;
+                titleSubtitleCode += subtitleCode;
             }
             if (hasAttributes) {
-                var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);
-                titleSubtitleCode = titleSubtitleCode + attributesCode;
+                titleSubtitleCode += attributesCode;
             }
         }
     }
 
     if (hasHeaderRow) {
-        if (mascotShapeCode != "") {
-            code += kHeaderRow3Code.arg(headerVerticalAnchors + headerLeftAnchor).arg(mascotShapeCode).arg(mascotCode).arg(titleSubtitleCode);
-        } else {
-            code += kHeaderRow2Code.arg(headerVerticalAnchors + headerLeftAnchor).arg(mascotCode).arg(titleSubtitleCode);
+        var rowCode = [mascotCode, titleSubtitleCode];
+        if (mascotShapeCode != '') {
+           rowCode.unshift(mascotShapeCode);
         }
+        code += kHeaderRowCodeGenerator(headerVerticalAnchors + headerLeftAnchor, rowCode)
     } else {
         code += mascotShapeCode + mascotCode + titleSubtitleCode;
     }
 
     if (hasSummary) {
         var summaryTopAnchor;
-        if (isHorizontal && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
-        else if (headerAsOverlay && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
-        else if (hasHeaderRow) summaryTopAnchor = "row.bottom";
-        else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";
-        else if (hasAttributes) summaryTopAnchor = "attributesRow.bottom";
-        else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";
-        else if (hasTitle) summaryTopAnchor = "titleLabel.bottom";
-        else if (hasArt) summaryTopAnchor = "artShapeHolder.bottom";
-        else summaryTopAnchor = "parent.top";
+        if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
+        else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
+        else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
+        else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
+        else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
+        else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
+        else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
+        else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
+        else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
+        else summaryTopAnchor = 'parent.top';
 
-        var color;
+        var summaryColor;
         if (hasBackground) {
-            color = summaryColorWithBackground;
+            summaryColor = summaryColorWithBackground;
         } else {
-            color = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
+            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
         }
 
         var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
 
-        code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);
+        code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);
     }
 
     var touchdownAnchors;
@@ -584,23 +614,26 @@
     }
     code += kTouchdownCode.arg(touchdownAnchors);
 
+    var implicitHeight = 'implicitHeight: ';
     if (hasSummary) {
-        code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
+        implicitHeight += 'summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
     } else if (hasHeaderRow) {
-        code += 'implicitHeight: row.y + row.height + units.gu(1);\n';
+        implicitHeight += 'row.y + row.height + units.gu(1);\n';
     } else if (hasMascot) {
-        code += 'implicitHeight: mascotImage.y + mascotImage.height;\n';
+        implicitHeight += 'mascotImage.y + mascotImage.height;\n';
+    } else if (hasTitleContainer) {
+        implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';
     } else if (hasAttributes) {
-        code += 'implicitHeight: attributesRow.y + attributesRow.height + units.gu(1);\n';
+        implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';
     } else if (hasSubtitle) {
-        code += 'implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
+        implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
     } else if (hasTitle) {
-        code += 'implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);\n';
+        implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
     } else if (hasArt) {
-        code += 'implicitHeight: artShapeHolder.height;\n';
+        implicitHeight += 'artShapeHolder.height;\n';
     }
     // Close the AbstractButton
-    code += '}\n';
+    code += implicitHeight + '}\n';
 
     return code;
 }

=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2014-07-25 11:42:06 +0000
+++ plugins/Dash/ScopeStyle.qml	2014-08-08 14:57:17 +0000
@@ -49,9 +49,10 @@
 
     /*! \brief Luminance threshold for switching between fore and background color
 
-        \note If background colour is not fully opaque, it's not taken into account.
+        \note If background colour is not fully opaque, the defaultLightLuminance it's taken into account instead of it.
      */
-    readonly property real threshold: background.a !== 1.0 ? foregroundLuminance : (foregroundLuminance + backgroundLuminance) / 2
+    readonly property real threshold: background.a !== 1.0 ? (foregroundLuminance + d.defaultLightLuminance) / 2
+                                                           : (foregroundLuminance + backgroundLuminance) / 2
 
     /*! \brief The lighter of foreground and background colors
 

=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2014-07-25 10:47:08 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2014-08-08 14:57:17 +0000
@@ -330,6 +330,11 @@
     return m_topSectionItem ? m_topSectionItem->height() : 0;
 }
 
+qreal ListViewWithPageHeader::headerItemShownHeight() const
+{
+    return m_headerItemShownHeight;
+}
+
 void ListViewWithPageHeader::positionAtBeginning()
 {
     if (m_delegateModel->count() <= 0)
@@ -396,6 +401,7 @@
                 firstItem->setY(firstItem->y() - m_headerItemShownHeight);
                 layout();
             }
+            Q_EMIT headerItemShownHeightChanged();
         }
         m_contentYAnimation->setTo(to);
         contentYAnimationType = ContentYAnimationShowHeader;
@@ -544,6 +550,7 @@
                     m_headerItem->setY(-m_minYExtent);
                 }
             }
+            Q_EMIT headerItemShownHeightChanged();
         } else {
             // Stick the header item to the top when dragging down
             m_headerItem->setY(contentY());
@@ -822,8 +829,8 @@
                 ListItem *nextItem = itemAtIndex(modelIndex + 1);
                 if (nextItem) {
                     listItem->setY(nextItem->y() - listItem->height());
-                } else if (modelIndex == 0 && m_headerItem) {
-                    listItem->setY(m_headerItem->height());
+                } else if (modelIndex == 0) {
+                    listItem->setY(m_headerItem ? m_headerItem->height() : 0);
                 } else if (!m_visibleItems.isEmpty()) {
                     lostItem = true;
                 }
@@ -1096,6 +1103,7 @@
         m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);
         updateClipItem();
         adjustMinYExtent();
+        Q_EMIT headerItemShownHeightChanged();
     } else {
         if (oldHeaderY + oldHeaderHeight > contentY()) {
             // If the header is shown because its position

=== modified file 'plugins/Dash/listviewwithpageheader.h'
--- plugins/Dash/listviewwithpageheader.h	2014-06-12 14:08:54 +0000
+++ plugins/Dash/listviewwithpageheader.h	2014-08-08 14:57:17 +0000
@@ -53,6 +53,7 @@
     Q_PROPERTY(QString sectionProperty READ sectionProperty WRITE setSectionProperty NOTIFY sectionPropertyChanged)
     Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
     Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
+    Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
 
     friend class ListViewWithPageHeaderTest;
     friend class ListViewWithPageHeaderTestSection;
@@ -81,6 +82,7 @@
     void setForceNoClip(bool noClip);
 
     int stickyHeaderHeight() const;
+    qreal headerItemShownHeight() const;
 
     Q_INVOKABLE void positionAtBeginning();
     Q_INVOKABLE void showHeader();
@@ -100,6 +102,7 @@
     void sectionPropertyChanged();
     void forceNoClipChanged();
     void stickyHeaderHeightChanged();
+    void headerItemShownHeightChanged();
 
 protected:
     void componentComplete() override;

=== modified file 'po/hu.po'
--- po/hu.po	2014-08-08 07:07:33 +0000
+++ po/hu.po	2014-08-08 14:57:17 +0000
@@ -6,16 +6,17 @@
 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-07-11 14:59+0200\n"
 "PO-Revision-Date: 2014-08-06 07:41+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-08-07 06:27+0000\n"
+"X-Generator: Launchpad (build 17147)\n"
 
 #: plugins/Unity/Launcher/launcheritem.cpp:43
 #: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -73,8 +74,8 @@
 "You have now mastered the edge gestures and can start using the "
 "phone<br><br>Tap on the screen to start"
 msgstr ""
-"Elsajátította a gesztusokat, és megkezdheti a telefon "
-"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
+"Elsajátította a gesztusokat, és megkezdheti a telefon használatát."
+"<br><br>Koppintson a képernyőre a kezdéshez."
 
 #: qml/Components/Lockscreen.qml:214
 msgid "Emergency Call"

=== modified file 'po/sl.po'
--- po/sl.po	2014-08-08 07:07:33 +0000
+++ po/sl.po	2014-08-08 14:57:17 +0000
@@ -6,16 +6,17 @@
 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-07-11 14:59+0200\n"
 "PO-Revision-Date: 2014-08-06 06:11+0000\n"
 "Last-Translator: Damir Jerovšek <Unknown>\n"
 "Language-Team: Slovenian <[e-mail]>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-08-07 06:27+0000\n"
+"X-Generator: Launchpad (build 17147)\n"
 
 #: plugins/Unity/Launcher/launcheritem.cpp:43
 #: plugins/Unity/Launcher/launcheritem.cpp:73

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-07-11 14:20:12 +0000
+++ po/unity8.pot	2014-08-08 14:57:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-11 14:59+0200\n"
+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -26,66 +26,82 @@
 msgid "Unpin shortcut"
 msgstr ""
 
+#: qml/Components/Dialogs.qml:142
+msgid "Are you sure you would like to turn power off?"
+msgstr ""
+
+#: qml/Components/Dialogs.qml:144
+msgid "Power off"
+msgstr ""
+
+#: qml/Components/Dialogs.qml:153
+msgid "Restart"
+msgstr ""
+
+#: qml/Components/Dialogs.qml:162
+msgid "Cancel"
+msgstr ""
+
 #: qml/Components/EdgeDemoOverlay.qml:151
 msgid "Skip intro"
 msgstr ""
 
+#: qml/Components/EdgeDemo.qml:112
+msgid "Right edge"
+msgstr ""
+
 #: qml/Components/EdgeDemo.qml:113
-msgid "Right edge"
-msgstr ""
-
-#: qml/Components/EdgeDemo.qml:114
 msgid "Try swiping from the right edge to unlock the phone"
 msgstr ""
 
+#: qml/Components/EdgeDemo.qml:144
+msgid "Top edge"
+msgstr ""
+
 #: qml/Components/EdgeDemo.qml:145
-msgid "Top edge"
-msgstr ""
-
-#: qml/Components/EdgeDemo.qml:146
 msgid "Try swiping from the top edge to access the indicators"
 msgstr ""
 
+#: qml/Components/EdgeDemo.qml:170
+msgid "Close"
+msgstr ""
+
 #: qml/Components/EdgeDemo.qml:171
-msgid "Close"
-msgstr ""
-
-#: qml/Components/EdgeDemo.qml:172
 msgid "Swipe up again to close the settings screen"
 msgstr ""
 
+#: qml/Components/EdgeDemo.qml:198
+msgid "Left edge"
+msgstr ""
+
 #: qml/Components/EdgeDemo.qml:199
-msgid "Left edge"
-msgstr ""
-
-#: qml/Components/EdgeDemo.qml:200
 msgid "Swipe from the left to reveal the launcher for quick access to apps"
 msgstr ""
 
+#: qml/Components/EdgeDemo.qml:226
+msgid "Well done"
+msgstr ""
+
 #: qml/Components/EdgeDemo.qml:227
-msgid "Well done"
-msgstr ""
-
-#: qml/Components/EdgeDemo.qml:228
 msgid ""
 "You have now mastered the edge gestures and can start using the "
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:214
+#: qml/Components/Lockscreen.qml:220
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:231
+#: qml/Components/Lockscreen.qml:243
 msgid "OK"
 msgstr ""
 
-#: qml/Components/PassphraseLockscreen.qml:60
+#: qml/Components/PassphraseLockscreen.qml:62
 #, qt-format
 msgid "Hello %1"
 msgstr ""
 
-#: qml/Components/PassphraseLockscreen.qml:60
+#: qml/Components/PassphraseLockscreen.qml:62
 msgid "Hello"
 msgstr ""
 
@@ -97,19 +113,11 @@
 msgid "DONE"
 msgstr ""
 
-#: qml/Components/SeeMore.qml:35
-msgid "See more"
-msgstr ""
-
-#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
+#: qml/Dash/GenericScopeView.qml:358
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/DashApps.qml:37
-msgid "Recent"
-msgstr ""
-
-#: qml/Dash/GenericScopeView.qml:330
+#: qml/Dash/GenericScopeView.qml:358
 msgid "See all"
 msgstr ""
 
@@ -133,6 +141,26 @@
 msgid "Send"
 msgstr ""
 
+#: qml/Dash/ScopesOverview.qml:200
+msgid "Manage Dash"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:405
+msgid "Done"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:431
+msgid "Store"
+msgstr ""
+
+#: qml/Dash/ScopesOverviewTab.qml:36
+msgid "Favorites"
+msgstr ""
+
+#: qml/Dash/ScopesOverviewTab.qml:54
+msgid "All"
+msgstr ""
+
 #: qml/Greeter/Greeter.qml:157
 msgid "Swipe to unlock"
 msgstr ""
@@ -157,11 +185,11 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:91
+#: qml/Notifications/NotificationMenuItemFactory.qml:100
 msgid "Show password"
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:103
+#: qml/Notifications/NotificationMenuItemFactory.qml:115
 msgid "Please enter SIM PIN"
 msgstr ""
 
@@ -173,35 +201,43 @@
 msgid "Conference"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:583
+#: qml/Panel/Indicators/MenuItemFactory.qml:651
 msgid "In queue…"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:587
+#: qml/Panel/Indicators/MenuItemFactory.qml:655
 msgid "Downloading"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:589
+#: qml/Panel/Indicators/MenuItemFactory.qml:657
 msgid "Paused, tap to resume"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:591
+#: qml/Panel/Indicators/MenuItemFactory.qml:659
 msgid "Canceled"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:593
+#: qml/Panel/Indicators/MenuItemFactory.qml:661
 msgid "Finished"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:595
+#: qml/Panel/Indicators/MenuItemFactory.qml:663
 msgid "Failed, tap to retry"
 msgstr ""
 
+#: qml/Panel/Indicators/ModemInfoItem.qml:105
+msgid "Unlock SIM"
+msgstr ""
+
+#: qml/Panel/Indicators/RoamingIndication.qml:27
+msgid "Roaming"
+msgstr ""
+
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
 
-#: qml/Shell.qml:359
+#: qml/Shell.qml:256
 #, qt-format
 msgid "Please enter %1"
 msgstr ""

=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-08-06 19:39:30 +0000
+++ qml/Components/PageHeader.qml	2014-08-08 14:57:17 +0000
@@ -24,7 +24,7 @@
 Item {
     id: root
     objectName: "pageHeader"
-    implicitHeight: headerContainer.height + units.gu(2) + bottomContainer.height
+    implicitHeight: headerContainer.height + bottomContainer.height + (showSignatureLine ? units.gu(2) : 0)
 
     property bool showBackButton: false
     property string title
@@ -32,6 +32,7 @@
     property bool searchEntryEnabled: false
     property ListModel searchHistory: SearchHistoryModel
     property alias searchQuery: searchTextField.text
+    property alias showSignatureLine: bottomBorder.visible
 
     property alias bottomItem: bottomContainer.children
     property int paginationCount: 0
@@ -251,6 +252,7 @@
 
                     actions: [
                         Action {
+                            objectName: "search"
                             iconName: "search"
                             visible: root.searchEntryEnabled
                             onTriggered: {

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-07-11 12:12:50 +0000
+++ qml/Components/ResponsiveGridView.qml	2014-08-08 14:57:17 +0000
@@ -34,7 +34,7 @@
     readonly property int cellWidth: gridView.cellWidth
     readonly property int cellHeight: gridView.cellHeight
     readonly property int totalContentHeight: {
-        return contentHeightForRows(Math.ceil(gridView.model.count / columns))
+        return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)
     }
     property alias interactive: gridView.interactive
     readonly property alias flicking: gridView.flicking
@@ -47,8 +47,8 @@
     property alias cacheBuffer: gridView.cacheBuffer
     readonly property alias currentItem: gridView.currentItem
 
-    function contentHeightForRows(rows) {
-        return rows * cellHeight;
+    function contentHeightForRows(rows, height) {
+        return rows * height
     }
 
     GridView {

=== removed directory 'qml/Dash/Apps'
=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2014-07-11 12:13:08 +0000
+++ qml/Dash/CardCarousel.qml	2014-08-08 14:57:17 +0000
@@ -48,8 +48,8 @@
 
             objectName: "carouselDelegate" + index
 
-            function clicked() { cardCarousel.clicked(index, model.result) }
-            function pressAndHold() { cardCarousel.pressAndHold(index, model.result) }
+            function clicked() { cardCarousel.clicked(index, model.result, loader.item, model) }
+            function pressAndHold() { cardCarousel.pressAndHold(index) }
 
             sourceComponent: cardTool.cardComponent
             onLoaded: {

=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2014-07-18 11:35:47 +0000
+++ qml/Dash/CardGrid.qml	2014-08-08 14:57:17 +0000
@@ -26,10 +26,20 @@
     }
 
     expandedHeight: grid.totalContentHeight
-    collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows), expandedHeight)
+    collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
     collapsedItemCount: collapsedRows * grid.columns
     originY: grid.originY
 
+    function cardPosition(index) {
+        var pos = {};
+        var row = Math.floor(index / grid.columns);
+        var column = index % grid.columns;
+        // Bit sad this is not symmetrical
+        pos.x = column * grid.cellWidth + grid.margins;
+        pos.y = row * grid.cellHeight;
+        return pos;
+    }
+
     ResponsiveGridView {
         id: grid
         anchors.fill: parent
@@ -53,6 +63,7 @@
                     item.objectName = "delegate" + index;
                     item.width = Qt.binding(function() { return cardTool.cardWidth; });
                     item.height = Qt.binding(function() { return cardTool.cardHeight; });
+                    item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
                     item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
                     item.cardData = Qt.binding(function() { return model; });
                     item.template = Qt.binding(function() { return cardTool.template; });
@@ -62,7 +73,7 @@
                 }
                 Connections {
                     target: loader.item
-                    onClicked: root.clicked(index, result)
+                    onClicked: root.clicked(index, result, loader.item, model)
                     onPressAndHold: root.pressAndHold(index)
                 }
             }

=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2014-07-22 12:17:34 +0000
+++ qml/Dash/CardVerticalJournal.qml	2014-08-08 14:57:17 +0000
@@ -61,7 +61,7 @@
             }
             Connections {
                 target: loader.item
-                onClicked: root.clicked(index, result)
+                onClicked: root.clicked(index, result, loader.item, model)
                 onPressAndHold: root.pressAndHold(index)
             }
         }

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-08-06 19:39:30 +0000
+++ qml/Dash/Dash.qml	2014-08-08 14:57:17 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 0.1
+import Ubuntu.Gestures 0.1
 import Unity 0.2
 import Utils 0.1
 import Unity.DashCommunicator 0.1
@@ -73,26 +74,104 @@
         id: scopes
     }
 
-    Image {
+    QtObject {
+        id: overviewController
+        objectName: "overviewController"
+
+        property alias enableAnimation: progressAnimation.enabled
+        property real progress: 0
+        Behavior on progress {
+            id: progressAnimation
+            UbuntuNumberAnimation { }
+        }
+    }
+
+    ScopesOverview {
+        id: scopesOverview
+        objectName: "scopesOverview"
         anchors.fill: parent
-        source: parent.width > parent.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
-        fillMode: Image.PreserveAspectCrop
-        horizontalAlignment: Image.AlignRight
-        verticalAlignment: Image.AlignTop
+        scope: scopes.overviewScope
+        progress: overviewController.progress
+        scopeScale: scopeItem.scope ? 0.4 : (1 - overviewController.progress * 0.6)
+        visible: scopeScale != 1
+        currentIndex: dashContent.currentIndex
+        onDone: {
+            if (currentTab == 1) {
+                animateDashFromAll(dashContent.currentScopeId);
+            }
+            hide();
+        }
+        onFavoriteSelected: {
+            setCurrentScope(scopeId, false, false);
+            dashContentCache.scheduleUpdate();
+            hide();
+        }
+        onAllFavoriteSelected: {
+            setCurrentScope(scopeId, false, false);
+            dashContentCache.scheduleUpdate();
+            animateDashFromAll(dashContent.currentScopeId);
+            hide();
+        }
+        onSearchSelected: {
+            var scopeIndex = -1;
+            for (var i = 0; i < scopes.count; ++i) {
+                if (scopes.getScope(i).id == scopeId) {
+                    scopeIndex = i;
+                    break;
+                }
+            }
+            if (scopeIndex >= 0) {
+                // Is a favorite one
+                setCurrentScope(scopeId, false, false);
+                dashContentCache.scheduleUpdate();
+                showDashFromPos(pos, size);
+                hide();
+            } else {
+                // Is not a favorite one, activate and get openScope
+                scope.activate(result);
+            }
+        }
+        function hide() {
+            overviewController.enableAnimation = true;
+            overviewController.progress = 0;
+        }
+        onProgressChanged: {
+            if (progress == 0) {
+                currentTab = scopeItem.scope ? 1 : 0;
+            }
+        }
+    }
+
+    ShaderEffectSource {
+        id: dashContentCache
+        parent: scopesOverview.dashItemEater
+        z: 1
+        sourceItem: dashContent
+        height: sourceItem.height
+        width: sourceItem.width
+        opacity: 1 - overviewController.progress
+        visible: overviewController.progress != 0 && scopeItem.scope === null
+        live: false
     }
 
     DashContent {
         id: dashContent
+
+        property var scopeThatOpenedScope: null
+
         objectName: "dashContent"
-        width: parent.width
-        height: parent.height
+        width: dash.width
+        height: dash.height
         scopes: scopes
-        visible: x != -width
+        visible: !scopesOverview.showingNonFavoriteScope && x != -width
         onGotoScope: {
             dash.setCurrentScope(scopeId, true, false);
         }
         onOpenScope: {
+            scopeThatOpenedScope = currentScope;
             scopeItem.scope = scope;
+            scopesOverview.currentTab = 1;
+            scopesOverview.ensureAllScopeVisible(scope.id);
             x = -width;
         }
         onScopeLoaded: {
@@ -102,25 +181,63 @@
             }
         }
         scale: dash.contentScale
-        clip: scale != 1.0 || scopeItem.visible
+        clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
         Behavior on x {
             UbuntuNumberAnimation {
+                duration: overviewController.progress != 0 ? 0 : UbuntuAnimation.FastDuration
                 onRunningChanged: {
                     if (!running && dashContent.x == 0) {
-                        dashContent.closeScope(scopeItem.scope);
+                        dashContent.scopeThatOpenedScope.closeScope(scopeItem.scope);
                         scopeItem.scope = null;
+                        if (overviewController.progress == 0) {
+                            // Set tab to Favorites only if we are not showing the overview
+                            scopesOverview.currentTab = 0;
+                        }
                     }
                 }
             }
         }
+
+        enabled: overviewController.progress == 0
+        opacity: enabled ? 1 : 0
+    }
+
+    DashBackground
+    {
+        anchors.fill: scopeItem
+        visible: scopeItem.visible
+        parent: scopeItem.parent
+        scale: scopeItem.scale
+        opacity: scopeItem.opacity
     }
 
     GenericScopeView {
         id: scopeItem
-        anchors.left: dashContent.right
+        objectName: "dashTempScopeItem"
+
+        readonly property real targetOverviewScale: {
+            if (scopesOverview.currentTab == 0) {
+                return 0.4;
+            } else {
+                return scopesOverview.allCardSize.width / scopeItem.width;
+            }
+        }
+        readonly property real overviewProgressScale: (1 - overviewController.progress * (1 - targetOverviewScale))
+        readonly property var targetOverviewPosition: scope ? scopesOverview.allScopeCardPosition(scope.id) : null
+        readonly property real overviewProgressX: scope && scopesOverview.currentTab == 1 && targetOverviewPosition ?
+                                                      overviewController.progress * (targetOverviewPosition.x - (width - scopesOverview.allCardSize.width) / 2)
+                                                      : 0
+        readonly property real overviewProgressY: scope && scopesOverview.currentTab == 1 && targetOverviewPosition ?
+                                                      overviewController.progress * (targetOverviewPosition.y - (height - scopesOverview.allCardSize.height) / 2)
+                                                      : 0
+
+        x: overviewController.progress == 0 ? dashContent.x + width : overviewProgressX
+        y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
         width: parent.width
         height: parent.height
-        scale: dash.contentScale
+        scale: dash.contentScale * overviewProgressScale
+        enabled: opacity == 1
+        opacity: 1 - overviewController.progress
         clip: scale != 1.0
         visible: scope != null
         hasBackAction: true
@@ -154,7 +271,7 @@
         opacity: 0
         visible: opacity > 0
 
-        readonly property bool processing: dashContent.processing || scopeItem.processing
+        readonly property bool processing: dashContent.processing || scopeItem.processing || scopesOverview.processing
 
         Behavior on opacity {
             UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
@@ -207,4 +324,45 @@
         }
     }
 
+    Image {
+        source: "graphics/overview_hint.png"
+        anchors.horizontalCenter: parent.horizontalCenter
+        opacity: (scopeItem.scope ? scopeItem.pageHeaderTotallyVisible : dashContent.pageHeaderTotallyVisible) &&
+                 (overviewDragHandle.enabled || overviewController.progress != 0) ? 1 : 0
+        Behavior on opacity {
+            enabled: overviewController.progress == 0
+            UbuntuNumberAnimation {}
+        }
+        y: parent.height - height * (1 - overviewController.progress * 4)
+    }
+
+    EdgeDragArea {
+        id: overviewDragHandle
+        objectName: "overviewDragHandle"
+        z: 1
+        direction: Direction.Upwards
+        enabled: !dashContent.previewShown &&
+                  dashContent.currentScope &&
+                  dashContent.currentScope.searchQuery == "" &&
+                  (overviewController.progress == 0 || dragging)
+
+        readonly property real fullMovement: units.gu(20)
+
+        anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
+        height: units.gu(2)
+
+        onSceneDistanceChanged: {
+            if (overviewController.enableAnimation) {
+                dashContentCache.scheduleUpdate();
+            }
+            overviewController.enableAnimation = false;
+            overviewController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));
+        }
+
+        onDraggingChanged: {
+            overviewController.enableAnimation = true;
+            overviewController.progress = (overviewController.progress > 0.7)  ? 1 : 0;
+        }
+    }
+
 }

=== added file 'qml/Dash/DashBackground.qml'
--- qml/Dash/DashBackground.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/DashBackground.qml	2014-08-08 14:57:17 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013, 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Image {
+    source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
+    fillMode: Image.PreserveAspectCrop
+    horizontalAlignment: Image.AlignRight
+    verticalAlignment: Image.AlignTop
+}

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-08-06 19:39:30 +0000
+++ qml/Dash/DashContent.qml	2014-08-08 14:57:17 +0000
@@ -25,8 +25,14 @@
 
     property alias scopes: dashContentList.model
     readonly property alias currentIndex: dashContentList.currentIndex
+    readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
+    readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
+    readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ?
+                                            dashContentList.currentItem.item.previewShown : false
     readonly property bool processing: dashContentList.currentItem && dashContentList.currentItem.item
                                        && dashContentList.currentItem.item.processing || false
+    readonly property bool pageHeaderTotallyVisible: dashContentList.currentItem && dashContentList.currentItem.item
+                                       && dashContentList.currentItem.item.pageHeaderTotallyVisible || false
 
     signal scopeLoaded(string scopeId)
     signal gotoScope(string scopeId)
@@ -77,15 +83,15 @@
         }
     }
 
-    function closeScope(scope) {
-        dashContentList.currentItem.theScope.closeScope(scope)
-    }
-
     Item {
         id: dashContentListHolder
 
         anchors.fill: parent
 
+        DashBackground {
+            anchors.fill: parent
+        }
+
         ListView {
             id: dashContentList
             objectName: "dashContentList"

=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-07-22 12:17:34 +0000
+++ qml/Dash/DashRenderer.qml	2014-08-08 14:57:17 +0000
@@ -41,7 +41,9 @@
     /// Emitted when the user clicked on an item
     /// @param index is the index of the clicked item
     /// @param result result model of the cliked item, used for activation
-    signal clicked(int index, var result)
+    /// @param item item that has been clicked
+    /// @param itemModel model of the item
+    signal clicked(int index, var result, var item, var itemModel)
 
     /// Emitted when the user pressed and held on an item
     /// @param index is the index of the held item

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-08-06 19:39:30 +0000
+++ qml/Dash/GenericScopeView.qml	2014-08-08 14:57:17 +0000
@@ -25,7 +25,7 @@
 FocusScope {
     id: scopeView
 
-    readonly property alias navigationShown: dashNavigation.showList
+    readonly property bool navigationShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].showList : false
     property var scope: null
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent: false
@@ -33,8 +33,11 @@
     property bool hasBackAction: false
     property bool enableHeightBehaviorOnNextCreation: false
     property var categoryView: categoryView
-    property alias paginationCount: pageHeader.paginationCount
-    property alias paginationIndex: pageHeader.paginationIndex
+    property bool showPageHeader: true
+    readonly property alias previewShown: previewListView.open
+    property int paginationCount: 0
+    property int paginationIndex: 0
+    property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}
@@ -56,6 +59,34 @@
         previewListView.open = false;
     }
 
+    function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount) {
+        if (scope.id === "scopes" || scope.id == "clickscope") {
+            // 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
+            scope.activate(result)
+        } else {
+            openPreview(index, resultsModel, limitedCategoryItemCount);
+        }
+    }
+
+    function itemPressedAndHeld(index, resultsModel, limitedCategoryItemCount) {
+        openPreview(index, resultsModel, limitedCategoryItemCount);
+    }
+
+    function openPreview(index, resultsModel, limitedCategoryItemCount) {
+        if (limitedCategoryItemCount > 0) {
+            previewLimitModel.model = resultsModel;
+            previewLimitModel.limit = limitedCategoryItemCount;
+            previewListView.model = previewLimitModel;
+        } else {
+            previewListView.model = resultsModel;
+        }
+        previewListView.currentIndex = -1;
+        previewListView.currentIndex = index;
+        previewListView.open = true;
+    }
+
     Binding {
         target: scope
         property: "isActive"
@@ -72,22 +103,24 @@
     }
 
     onIsCurrentChanged: {
-        pageHeader.resetSearch();
+        if (showPageHeader) {
+            pageHeaderLoader.item.resetSearch();
+        }
         previewListView.open = false;
     }
 
     Binding {
         target: scopeView.scope
         property: "searchQuery"
-        value: pageHeader.searchQuery
-        when: isCurrent
+        value: pageHeaderLoader.item ? pageHeaderLoader.item.searchQuery : ""
+        when: isCurrent && showPageHeader
     }
 
     Binding {
-        target: pageHeader
+        target: pageHeaderLoader.item
         property: "searchQuery"
         value: scopeView.scope ? scopeView.scope.searchQuery : ""
-        when: isCurrent
+        when: isCurrent && showPageHeader
     }
 
     Connections {
@@ -114,10 +147,13 @@
         model: scopeView.categories
         forceNoClip: previewListView.open
         pixelAligned: true
-        interactive: !dashNavigation.showList
+        interactive: !navigationShown
 
         property string expandedCategoryId: ""
 
+        readonly property bool pageHeaderTotallyVisible: scopeView.showPageHeader &&
+            ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == pageHeaderLoader.item.height))
+
         delegate: ListItems.Base {
             id: baseItem
             objectName: "dashCategory" + category
@@ -223,28 +259,19 @@
                 Connections {
                     target: rendererLoader.item
                     onClicked: {
-                        if (scopeView.scope.id === "scopes" || scopeView.scope.id == "clickscope") {
-                            // 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
-                            scopeView.scope.activate(result)
-                        } else {
-                            openPreview(index);
-                        }
-                    }
-                    onPressAndHold: openPreview(index)
-
-                    function openPreview(index) {
+                        scopeView.itemClicked(index, result, item, itemModel, target.model, categoryItemCount());
+                    }
+
+                    onPressAndHold: {
+                        scopeView.itemPressedAndHeld(index, target.model, categoryItemCount());
+                    }
+
+                    function categoryItemCount() {
+                        var categoryItemCount = -1;
                         if (!rendererLoader.expanded && !seeAllLabel.visible && target.collapsedItemCount > 0) {
-                            previewLimitModel.model = target.model;
-                            previewLimitModel.limit = target.collapsedItemCount;
-                            previewListView.model = previewLimitModel;
-                        } else {
-                            previewListView.model = target.model;
+                            categoryItemCount = target.collapsedItemCount;
                         }
-                        previewListView.currentIndex = -1;
-                        previewListView.currentIndex = index;
-                        previewListView.open = true;
+                        return categoryItemCount;
                     }
                 }
                 Connections {
@@ -380,26 +407,35 @@
             }
         }
 
-        pageHeader: PageHeader {
-            id: pageHeader
-            objectName: "scopePageHeader"
+        pageHeader: scopeView.showPageHeader ? pageHeaderLoader : null
+        Loader {
+            id: pageHeaderLoader
             width: parent.width
-            title: scopeView.scope ? scopeView.scope.name : ""
-            showBackButton: scopeView.hasBackAction
-            searchEntryEnabled: true
-            scopeStyle: scopeView.scopeStyle
-
-            bottomItem: DashNavigation {
-                id: dashNavigation
-                scope: scopeView.scope
-                width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
-                anchors.right: parent.right
-                windowHeight: scopeView.height
-                windowWidth: scopeView.width
-                scopeStyle: scopeView.scopeStyle
+            sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined
+            Component {
+                id: pageHeaderComponent
+                PageHeader {
+                    objectName: "scopePageHeader"
+                    width: parent.width
+                    title: scopeView.scope ? scopeView.scope.name : ""
+                    showBackButton: scopeView.hasBackAction
+                    searchEntryEnabled: true
+                    scopeStyle: scopeView.scopeStyle
+                    paginationCount: scopeView.paginationCount
+                    paginationIndex: scopeView.paginationIndex
+
+                    bottomItem: DashNavigation {
+                        scope: scopeView.scope
+                        width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
+                        anchors.right: parent.right
+                        windowHeight: scopeView.height
+                        windowWidth: scopeView.width
+                        scopeStyle: scopeView.scopeStyle
+                    }
+
+                    onBackClicked: scopeView.backClicked()
+                }
             }
-
-            onBackClicked: scopeView.backClicked()
         }
     }
 
@@ -418,7 +454,9 @@
         anchors.left: categoryView.right
 
         onOpenChanged: {
-            pageHeader.unfocus();
+            if (showPageHeader) {
+                pageHeaderLoader.item.unfocus();
+            }
         }
     }
 

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-07-30 15:46:44 +0000
+++ qml/Dash/PreviewListView.qml	2014-08-08 14:57:17 +0000
@@ -108,7 +108,7 @@
         anchors {
             left: parent.left
             right: parent.right
-            top: pageHeader.bottom
+            top: header.bottom
             bottom: parent.bottom
         }
 

=== added file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverview.qml	2014-08-08 14:57:17 +0000
@@ -0,0 +1,531 @@
+/*
+ * 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 Dash 0.1
+import Ubuntu.Components 0.1
+import "../Components"
+
+Item {
+    id: root
+
+    // Properties set by parent
+    property real progress: 0
+    property var scope: null
+    property int currentIndex: 0
+    property real scopeScale: 1
+
+    // Properties set and used by parent
+    property alias currentTab: tabBar.currentTab
+
+    // Properties used by parent
+    readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing
+    property bool growingDashFromPos: false
+    readonly property bool searching: scope && scope.searchQuery == ""
+    readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
+    readonly property var dashItemEater: {
+        if (!forceXYScalerEater && tabBar.currentTab == 0 && middleItems.count > 0) {
+            var loaderItem = middleItems.itemAt(0).item;
+            return loaderItem && loaderItem.currentItem ? loaderItem.currentItem : null;
+        }
+        return scopesOverviewXYScaler;
+    }
+    readonly property size allCardSize: {
+        if (middleItems.count > 1) {
+            var loaderItem = middleItems.itemAt(1).item;
+            if (loaderItem) {
+                var cardTool = loaderItem.cardTool;
+                return Qt.size(cardTool.cardWidth, cardTool.cardHeight);
+            }
+        }
+        return Qt.size(0, 0);
+    }
+
+    // Internal properties
+    property bool forceXYScalerEater: false
+
+    signal done()
+    signal favoriteSelected(var scopeId)
+    signal allFavoriteSelected(var scopeId)
+    signal searchSelected(var scopeId, var result, var pos, var size)
+
+    Connections {
+        target: scope
+        onOpenScope: {
+            var itemPos = scopesOverviewXYScaler.restorePosition;
+            var itemSize = scopesOverviewXYScaler.restoreSize;
+            scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
+            if (itemPos) {
+                scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
+                scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
+            } else {
+                scopesOverviewXYScaler.x = 0;
+                scopesOverviewXYScaler.y = 0;
+            }
+            scopesOverviewXYScaler.opacity = 0;
+            tempScopeItem.scope = scope;
+            middleItems.overrideOpacity = 0;
+            scopesOverviewXYScaler.scale = 1;
+            scopesOverviewXYScaler.x = 0;
+            scopesOverviewXYScaler.y = 0;
+            scopesOverviewXYScaler.opacity = 1;
+        }
+        onGotoScope: {
+            if (tabBar.currentTab == 0) {
+                root.favoriteSelected(scopeId);
+            } else {
+                root.allFavoriteSelected(scopeId);
+            }
+        }
+    }
+
+    Binding {
+        target: scope
+        property: "isActive"
+        value: progress === 1
+    }
+
+    function animateDashFromAll(scopeId) {
+        var currentScopePos = allScopeCardPosition(scopeId);
+        if (currentScopePos) {
+            showDashFromPos(currentScopePos, allCardSize);
+        } else {
+            console.log("Warning: Could not find Dash OverView All card position for scope", dashContent.currentScopeId);
+        }
+    }
+
+    function showDashFromPos(itemPos, itemSize) {
+        scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
+        scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
+        scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
+        scopesOverviewXYScaler.opacity = 0;
+        root.growingDashFromPos = true;
+        scopesOverviewXYScaler.scale = 1;
+        scopesOverviewXYScaler.x = 0;
+        scopesOverviewXYScaler.y = 0;
+        scopesOverviewXYScaler.opacity = 1;
+    }
+
+    function allScopeCardPosition(scopeId) {
+        if (middleItems.count > 1) {
+            var loaderItem = middleItems.itemAt(1).item;
+            if (loaderItem) {
+                var pos = loaderItem.scopeCardPosition(scopeId);
+                return loaderItem.mapToItem(null, pos.x, pos.y);
+            }
+        }
+    }
+
+    function ensureAllScopeVisible(scopeId) {
+        if (middleItems.count > 1) {
+            var loaderItem = middleItems.itemAt(1).item;
+            if (loaderItem) {
+                var pos = loaderItem.scopeCardPosition(scopeId);
+                loaderItem.contentY = Math.min(pos.y, loaderItem.contentHeight - loaderItem.height);
+            }
+        }
+    }
+
+    onProgressChanged: {
+        if (progress == 0) {
+            pageHeader.resetSearch();
+            pageHeader.unfocus(); // Shouldn't the previous call do this too?
+        }
+    }
+
+    ScopeStyle {
+        id: overviewScopeStyle
+        style: { "foreground-color" : "white", "background-color" : "transparent" }
+    }
+
+    DashBackground {
+        anchors.fill: parent
+        source: "graphics/dark_background.jpg"
+    }
+
+    Connections {
+        target: pageHeader
+        onSearchQueryChanged: {
+            // Need this in order, otherwise something gets unhappy in rendering
+            // of the overlay in carousels because the parent of the dash dies for
+            // a moment, this way we make sure it's reparented first
+            // by forceXYScalerEater making dashItemEater return scopesOverviewXYScaler
+            // before we kill the previous parent by scope.searchQuery
+            root.forceXYScalerEater = true;
+            root.scope.searchQuery = pageHeader.searchQuery;
+            root.forceXYScalerEater = false;
+        }
+    }
+
+    Binding {
+        target: pageHeader
+        property: "searchQuery"
+        value: scope ? scope.searchQuery : ""
+    }
+
+    Item {
+        id: scopesOverviewContent
+        x: previewListView.open ? -width : 0
+        Behavior on x { UbuntuNumberAnimation { } }
+        width: parent.width
+        height: parent.height
+
+        PageHeader {
+            id: pageHeader
+            objectName: "scopesOverviewPageHeader"
+
+            readonly property real yDisplacement: pageHeader.height + tabBar.height + tabBar.anchors.margins
+
+            y: {
+                if (root.progress < 0.5) {
+                    return -yDisplacement;
+                } else {
+                    return -yDisplacement + (root.progress - 0.5) * yDisplacement * 2;
+                }
+            }
+            width: parent.width
+            clip: true
+            title: i18n.tr("Manage Dash")
+            scopeStyle: overviewScopeStyle
+            showSignatureLine: false
+            searchEntryEnabled: true
+        }
+
+        ScopesOverviewTab {
+            id: tabBar
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: pageHeader.bottom
+                margins: units.gu(2)
+            }
+            height: units.gu(4)
+
+            enabled: opacity == 1
+            opacity: !scope || scope.searchQuery == "" ? 1 : 0
+            Behavior on opacity { UbuntuNumberAnimation { } }
+        }
+
+        Repeater {
+            id: middleItems
+            objectName: "scopesOverviewRepeater"
+            property real overrideOpacity: -1
+            model: scope && scope.searchQuery == "" ? scope.categories : null
+            delegate: Loader {
+                id: loader
+                objectName: "scopesOverviewRepeaterChild" + index
+
+                height: {
+                    if (index == 0) {
+                        return root.height;
+                    } else {
+                        return root.height - pageHeader.height - tabBar.height - tabBar.anchors.margins - units.gu(2);
+                    }
+                }
+                width: {
+                    if (index == 0) {
+                        return root.width / scopeScale;
+                    } else {
+                        return root.width;
+                    }
+                }
+                x: {
+                    if (index == 0) {
+                        return (root.width - width) / 2;
+                    } else {
+                        return 0;
+                    }
+                }
+                anchors {
+                    bottom: scopesOverviewContent.bottom
+                }
+
+                scale: index == 0 ? scopeScale : 1
+
+                opacity: {
+                    if (middleItems.overrideOpacity >= 0)
+                        return middleItems.overrideOpacity;
+
+                    if (tabBar.currentTab != index)
+                        return 0;
+
+                    return index == 0 ? 1 : root.progress;
+                }
+                Behavior on opacity {
+                    enabled: root.progress == 1
+                    UbuntuNumberAnimation { }
+                }
+                enabled: opacity == 1
+
+                clip: index == 1
+
+                CardTool {
+                    id: cardTool
+                    objectName: "cardTool"
+                    count: results.count
+                    template: model.renderer
+                    components: model.components
+                    viewWidth: parent.width
+                }
+
+                source: {
+                    if (index == 0 && categoryId == "favorites") return "ScopesOverviewFavorites.qml";
+                    else if (index == 1 && categoryId == "all") return "ScopesOverviewAll.qml";
+                    else return "";
+                }
+
+                onLoaded: {
+                    item.model = Qt.binding(function() { return results; });
+                    item.cardTool = cardTool;
+                    if (index == 0) {
+                        item.scopeWidth = Qt.binding(function() { return root.width; });
+                        item.scopeHeight = Qt.binding(function() { return root.height; });
+                        item.appliedScale = Qt.binding(function() { return loader.scale });
+                        item.currentIndex = Qt.binding(function() { return root.currentIndex });
+                    } else if (index == 1) {
+                        item.extraHeight = bottomBar.height;
+                    }
+                }
+
+                Connections {
+                    target: loader.item
+                    onClicked: {
+                        if (tabBar.currentTab == 0) {
+                            root.favoriteSelected(itemModel.scopeId);
+                        } else {
+                            var favoriteScopesItem = middleItems.itemAt(0).item;
+                            var scopeIndex = favoriteScopesItem.model.scopeIndex(itemModel.scopeId);
+                            if (scopeIndex >= 0) {
+                                root.allFavoriteSelected(itemModel.scopeId);
+                            } else {
+                                // Will result in an openScope from root.scope
+                                scopesOverviewXYScaler.restorePosition = item.mapToItem(null, 0, 0);
+                                scopesOverviewXYScaler.restoreSize = allCardSize;
+                                root.scope.activate(result);
+                            }
+                        }
+                    }
+                    onPressAndHold: {
+                        // Preview can call openScope so make sure restorePosition and restoreSize are set
+                        scopesOverviewXYScaler.restorePosition = undefined;
+                        scopesOverviewXYScaler.restoreSize = allCardSize;
+
+                        previewListView.model = target.model;
+                        previewListView.currentIndex = -1;
+                        previewListView.currentIndex = index;
+                        previewListView.open = true;
+                    }
+                }
+            }
+        }
+
+        GenericScopeView {
+            id: searchResultsViewer
+            objectName: "searchResultsViewer"
+            anchors {
+                top: pageHeader.bottom
+                right: parent.right
+                left: parent.left
+                bottom: parent.bottom
+            }
+            scope: root.scope && root.scope.searchQuery != "" ? root.scope : null
+            scopeStyle: overviewScopeStyle
+            enabled: opacity == 1
+            showPageHeader: false
+            clip: true
+            opacity: searchResultsViewer.scope ? 1 : 0
+            isCurrent: true
+            Behavior on opacity { UbuntuNumberAnimation { } }
+
+            function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount) {
+                pageHeader.closePopup();
+                if (itemModel.scopeId) {
+                    // This can end up in openScope so save restorePosition and restoreSize
+                    scopesOverviewXYScaler.restorePosition = item.mapToItem(null, 0, 0);
+                    scopesOverviewXYScaler.restoreSize = Qt.size(item.width, item.height);
+                    root.searchSelected(itemModel.scopeId, result, item.mapToItem(null, 0, 0), Qt.size(item.width, item.height));
+                } else {
+                    // Not a scope, just activate it
+                    searchResultsViewer.scope.activate(result);
+                }
+            }
+
+            function itemPressedAndHeld(index, resultsModel, limitedCategoryItemCount) {
+                // Do nothing
+            }
+        }
+
+        Rectangle {
+            id: bottomBar
+            color: "black"
+            height: units.gu(8)
+            width: parent.width
+            enabled: opacity == 1
+            opacity: scope && scope.searchQuery == "" ? 1 : 0
+            Behavior on opacity { UbuntuNumberAnimation { } }
+            y: {
+                if (root.progress < 0.5) {
+                    return parent.height;
+                } else {
+                    return parent.height - (root.progress - 0.5) * height * 2;
+                }
+            }
+
+            AbstractButton {
+                objectName: "scopesOverviewDoneButton"
+                width: Math.max(label.width + units.gu(2), units.gu(10))
+                height: units.gu(4)
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                Rectangle {
+                    anchors.fill: parent
+                    border.color: "white"
+                    border.width: units.dp(1)
+                    radius: units.dp(10)
+                    color: parent.pressed ? "gray" : "transparent"
+                }
+                Label {
+                    id: label
+                    anchors.centerIn: parent
+                    text: i18n.tr("Done")
+                    color: parent.pressed ? "black" : "white"
+                }
+                onClicked: root.done();
+            }
+
+            AbstractButton {
+                objectName: "scopesOverviewStoreButton"
+                width: Math.max(storeLabel.width, units.gu(10))
+                height: units.gu(4)
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+                Icon {
+                    id: storeImage
+                    name: "ubuntu-store-symbolic"
+                    color: "white"
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    width: units.gu(2)
+                    height: units.gu(2)
+                }
+                Label {
+                    id: storeLabel
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.top: storeImage.bottom
+                    text: i18n.tr("Store")
+                    color: "white"
+                }
+                onClicked: {
+                    // Just zoom from the middle
+                    scopesOverviewXYScaler.restorePosition = undefined;
+                    scopesOverviewXYScaler.restoreSize = allCardSize;
+                    scope.performQuery("scope://com.canonical.scopes.clickstore");
+                }
+            }
+        }
+    }
+
+    PreviewListView {
+        id: previewListView
+        objectName: "scopesOverviewPreviewListView"
+        scope: root.scope
+        scopeStyle: overviewScopeStyle
+        visible: x != width
+        width: parent.width
+        height: parent.height
+        anchors.left: scopesOverviewContent.right
+    }
+
+
+
+    Item {
+        id: scopesOverviewXYScaler
+        width: parent.width
+        height: parent.height
+
+        clip: scale != 1.0
+        enabled: scale == 1
+
+        property bool animationsEnabled: root.showingNonFavoriteScope || root.growingDashFromPos
+
+        property var restorePosition
+        property var restoreSize
+
+        Behavior on x {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation { }
+        }
+        Behavior on y {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation { }
+        }
+        Behavior on opacity {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation { }
+        }
+        Behavior on scale {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation {
+                onRunningChanged: {
+                    if (!running) {
+                        if (root.showingNonFavoriteScope && scopesOverviewXYScaler.scale != 1) {
+                            root.scope.closeScope(tempScopeItem.scope);
+                            tempScopeItem.scope = null;
+                        } else if (root.growingDashFromPos) {
+                            root.growingDashFromPos = false;
+                        }
+                    }
+                }
+            }
+        }
+
+        DashBackground {
+            anchors.fill: tempScopeItem
+            visible: tempScopeItem.visible
+            parent: tempScopeItem.parent
+        }
+
+        GenericScopeView {
+            id: tempScopeItem
+            objectName: "scopesOverviewTempScopeItem"
+
+            width: parent.width
+            height: parent.height
+            scale: dash.contentScale
+            clip: scale != 1.0
+            visible: scope != null
+            hasBackAction: true
+            isCurrent: visible
+            onBackClicked: {
+                var v = scopesOverviewXYScaler.restoreSize.width / tempScopeItem.width;
+                scopesOverviewXYScaler.scale = v;
+                if (scopesOverviewXYScaler.restorePosition) {
+                    scopesOverviewXYScaler.x = scopesOverviewXYScaler.restorePosition.x -(tempScopeItem.width - tempScopeItem.width * v) / 2;
+                    scopesOverviewXYScaler.y = scopesOverviewXYScaler.restorePosition.y -(tempScopeItem.height - tempScopeItem.height * v) / 2;
+                } else {
+                    scopesOverviewXYScaler.x = 0;
+                    scopesOverviewXYScaler.y = 0;
+                }
+                scopesOverviewXYScaler.opacity = 0;
+                middleItems.overrideOpacity = -1;
+            }
+        }
+    }
+}

=== added file 'qml/Dash/ScopesOverviewAll.qml'
--- qml/Dash/ScopesOverviewAll.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverviewAll.qml	2014-08-08 14:57:17 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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
+
+Flickable {
+    id: root
+
+    property alias model: cardGrid.model
+    property alias cardTool: cardGrid.cardTool
+
+    property real extraHeight: 0
+
+    signal clicked(int index, var result, var item, var itemModel)
+    signal pressAndHold(int index)
+
+    contentHeight: cardGrid.expandedHeight + extraHeight
+    contentWidth: cardGrid.width
+    flickableDirection: Flickable.VerticalFlick
+
+    function scopeCardPosition(scopeId) {
+        var index = model.scopeIndex(scopeId);
+        var pos = cardGrid.cardPosition(index);
+        pos.y = pos.y - root.contentY;
+        return pos;
+    }
+
+    CardGrid {
+        id: cardGrid
+        width: root.width
+        height: parent.height
+
+        onClicked: {
+            root.clicked(index, result, item, itemModel);
+        }
+        onPressAndHold: {
+            root.pressAndHold(index);
+        }
+    }
+}

=== added file 'qml/Dash/ScopesOverviewFavorites.qml'
--- qml/Dash/ScopesOverviewFavorites.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverviewFavorites.qml	2014-08-08 14:57:17 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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
+
+Flickable {
+    id: root
+
+    signal clicked(int index, var result, var itemModel)
+    signal pressAndHold(int index)
+
+    property var cardTool: null
+    property real scopeHeight: 0
+    property real scopeWidth: 0
+    property real appliedScale: 1
+    property int currentIndex: -1
+    property var currentItem: currentIndex < repeater.count ? repeater.itemAt(currentIndex) : null
+
+    property alias model: repeater.model
+
+    contentHeight: height
+    contentWidth: repeater.count * root.scopeWidth + units.gu(2) / appliedScale * (repeater.count - 1)
+
+    contentX: {
+        var indexX = currentIndex * scopeWidth + units.gu(2) / appliedScale * currentIndex;
+        var newContentX = indexX - (width - scopeWidth) / 2;
+        newContentX = Math.min(Math.max(newContentX, 0), contentWidth - width);
+        return newContentX;
+    }
+
+    Repeater {
+        id: repeater
+        objectName: "scopesOverviewFavoritesRepeater"
+
+        delegate: Loader {
+            id: loader
+
+            x: index * root.scopeWidth + units.gu(2) / appliedScale * index
+            asynchronous: true
+
+            sourceComponent: cardTool.cardComponent
+            onLoaded: {
+                item.fixedArtShapeSize = Qt.binding(function() { return Qt.size(root.scopeWidth, root.scopeHeight); });
+                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight / appliedScale; });
+                item.fontScale = Qt.binding(function() { return 1 / appliedScale; });
+                item.height = Qt.binding(function() { return root.scopeHeight; });
+                item.width = Qt.binding(function() { return root.scopeWidth; });
+                item.cardData = Qt.binding(function() { return model; });
+                item.template = Qt.binding(function() { return cardTool.template; });
+                item.components = Qt.binding(function() { return cardTool.components; });
+                item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });
+            }
+
+            Connections {
+                target: loader.item
+                onClicked: root.clicked(index, result, model)
+            }
+        }
+    }
+}

=== added file 'qml/Dash/ScopesOverviewTab.qml'
--- qml/Dash/ScopesOverviewTab.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverviewTab.qml	2014-08-08 14:57:17 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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.3
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    property int currentTab: 0
+
+    AbstractButton {
+        id: tab1
+        height: parent.height
+        width: parent.width / 2
+        Rectangle {
+            anchors.fill: parent
+            color: root.currentTab == 0 && root.enabled ? "white" : "transparent"
+            radius: units.dp(10)
+        }
+        Label {
+            anchors.centerIn: parent
+            text: i18n.tr("Favorites")
+            color: root.currentTab == 0 && root.enabled ? "black" : "white"
+        }
+        onClicked: root.currentTab = 0
+    }
+    AbstractButton {
+        id: tab2
+        objectName: "scopesOverviewAllTabButton"
+        x: width
+        height: parent.height
+        width: parent.width / 2
+        Rectangle {
+            anchors.fill: parent
+            color: root.currentTab == 1 && root.enabled ? "white" : "transparent"
+            radius: units.dp(10)
+        }
+        Label {
+            anchors.centerIn: parent
+            text: i18n.tr("All")
+            color: root.currentTab == 1 && root.enabled ? "black" : "white"
+        }
+        onClicked: root.currentTab = 1
+    }
+    Rectangle {
+        id: centerPiece
+        width: root.enabled ? units.dp(10) : units.dp(1)
+        height: parent.height
+        color: "white"
+        x: root.currentTab == 1 ? tab2.x : tab2.x - width
+    }
+    Rectangle {
+        id: border
+        anchors.fill: parent
+        radius: units.dp(10)
+        color: "transparent"
+        border.color: centerPiece.color
+        border.width: units.dp(1)
+    }
+}

=== added file 'qml/Dash/graphics/dark_background.jpg'
Binary files qml/Dash/graphics/dark_background.jpg	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/dark_background.jpg	2014-08-08 14:57:17 +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-08-08 14:57:17 +0000 differ
=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-07-30 20:01:30 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-08-08 14:57:17 +0000
@@ -122,7 +122,7 @@
         self._assert_scope_is_opened(scope, scope_id)
 
     def test_open_generic_scope(self):
-        scope_id = 'scopes'
+        scope_id = 'musicaggregator'
         scope = self.dash.open_scope(scope_id)
         self._assert_scope_is_opened(scope, scope_id)
         self.assertIsInstance(scope, dash_emulators.GenericScopeView)

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2014-08-06 19:38:57 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2014-08-08 14:57:17 +0000
@@ -22,6 +22,7 @@
 set(UnityQML_SOURCES
   fake_scope.cpp
   fake_scopes.cpp
+  fake_scopesoverview.cpp
   fake_categories.cpp
   fake_navigation.cpp
   fake_resultsmodel.cpp

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2014-07-18 11:35:47 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2014-08-08 14:57:17 +0000
@@ -109,11 +109,13 @@
             }
             case RoleComponents:
             {
-                QVariantMap map, artMap;
+                QVariantMap map, artMap, attributeMap;
                 artMap["aspect-ratio"] = "1.0";
                 artMap["field"] = "art";
                 map["art"] = artMap;
                 map["title"] = "HOLA";
+                attributeMap["field"] = "attribute";
+                map["attributes"] = attributeMap;
                 return map;
             }
             case RoleHeaderLink:
@@ -156,7 +158,7 @@
             }
             case RoleComponents:
             {
-                QVariantMap map, artMap;
+                QVariantMap map, artMap, attributeMap;
                 if (index.row() % 2 != 0) {
                     artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
                 } else {
@@ -166,6 +168,8 @@
                 map["art"] = artMap;
                 map["title"] = "HOLA";
                 map["subtitle"] = "HOLA";
+                attributeMap["field"] = "attribute";
+                map["attributes"] = attributeMap;
                 return map;
             }
             case RoleHeaderLink:

=== modified file 'tests/mocks/Unity/fake_resultsmodel.cpp'
--- tests/mocks/Unity/fake_resultsmodel.cpp	2014-05-20 10:29:20 +0000
+++ tests/mocks/Unity/fake_resultsmodel.cpp	2014-08-08 14:57:17 +0000
@@ -58,8 +58,9 @@
         case RoleUri:
         case RoleCategoryId:
         case RoleDndUri:
+            return QString();
         case RoleResult:
-            return QString();
+            return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());
         case RoleTitle:
             return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());
         case RoleArt:

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-08-06 10:03:55 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-08-08 14:57:17 +0000
@@ -18,14 +18,16 @@
 #include <QUrl>
 
 #include "fake_scope.h"
+
 #include "fake_navigation.h"
 #include "fake_resultsmodel.h"
+#include "fake_scopes.h"
 
-Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)
+Scope::Scope(Scopes* parent) : Scope(QString(), QString(), false, parent)
 {
 }
 
-Scope::Scope(QString const& id, QString const& name, bool favorite, QObject* parent, int categories)
+Scope::Scope(QString const& id, QString const& name, bool favorite, Scopes* parent, int categories)
     : unity::shell::scopes::ScopeInterface(parent)
     , m_id(id)
     , m_name(name)
@@ -36,6 +38,7 @@
     , m_currentAltNavigationId("altroot")
     , m_previewRendererName("preview-generic")
     , m_categories(new Categories(categories, this))
+    , m_openScope(nullptr)
 {
 }
 
@@ -158,7 +161,12 @@
 
 void Scope::activate(QVariant const& result)
 {
-    Q_UNUSED(result);
+    qDebug() << "Called activate on scope" << m_id << "with result" << result;
+    if (result.toString() == "Result.2.2") {
+        Scopes *scopes = dynamic_cast<Scopes*>(parent());
+        m_openScope = scopes->getScopeFromAll("MockScope9");
+        Q_EMIT openScope(m_openScope);
+    }
 }
 
 PreviewStack* Scope::preview(QVariant const& result)
@@ -174,9 +182,13 @@
 {
 }
 
-void Scope::closeScope(unity::shell::scopes::ScopeInterface* /*scope*/)
+void Scope::closeScope(unity::shell::scopes::ScopeInterface* scope)
 {
-    qFatal("Scope::closeScope is not implemented");
+    if (scope != m_openScope) {
+        qDebug() << scope << m_openScope;
+        qFatal("Scope::closeScope got wrong scope in closeScope");
+    }
+    m_openScope = nullptr;
 }
 
 QString Scope::currentNavigationId() const

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-08-06 10:03:55 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-08-08 14:57:17 +0000
@@ -24,13 +24,15 @@
 
 #include <QTimer>
 
+class Scopes;
+
 class Scope : public unity::shell::scopes::ScopeInterface
 {
     Q_OBJECT
 
 public:
-    Scope(QObject* parent = 0);
-    Scope(QString const& id, QString const& name, bool favorite, QObject* parent = 0, int categories = 20);
+    Scope(Scopes* parent = 0);
+    Scope(QString const& id, QString const& name, bool favorite, Scopes* parent = 0, int categories = 20);
 
     /* getters */
     QString id() const override;
@@ -92,7 +94,8 @@
 
     QString m_previewRendererName;
 
-    Categories* m_categories;
+    unity::shell::scopes::CategoriesInterface* m_categories;
+    unity::shell::scopes::ScopeInterface* m_openScope;
 };
 
 #endif // FAKE_SCOPE_H

=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2014-08-06 19:38:57 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2014-08-08 14:57:17 +0000
@@ -18,6 +18,7 @@
 
 // Self
 #include "fake_scopes.h"
+#include "fake_scopesoverview.h"
 
 // TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)
 
@@ -26,6 +27,7 @@
 
 Scopes::Scopes(QObject *parent)
  : unity::shell::scopes::ScopesInterface(parent)
+ , m_scopesOverview(nullptr)
  , m_loaded(false)
  , timer(this)
 {
@@ -52,10 +54,17 @@
     addScope(new Scope("clickscope", "Apps", true, this));
     addScope(new Scope("MockScope5", "Videos", true, this));
     addScope(new Scope("SingleCategoryScope", "Single", true, this, 1));
+    addScope(new Scope("MockScope4", "MS4", true, this));
+    addScope(new Scope("MockScope6", "MS6", true, this));
+    addScope(new Scope("MockScope7", "MS7", false, this));
+    addScope(new Scope("MockScope8", "MS8", false, this));
+    addScope(new Scope("MockScope9", "MS9", false, this));
+    m_scopesOverview = new ScopesOverview(this);
 
     if (!m_loaded) {
         m_loaded = true;
         Q_EMIT loadedChanged();
+        Q_EMIT overviewScopeChanged();
     }
 }
 
@@ -64,10 +73,13 @@
     timer.stop();
     if (m_scopes.size() > 0) {
         beginRemoveRows(QModelIndex(), 0, m_scopes.count()-1);
-        qDeleteAll(m_scopes);
+        qDeleteAll(m_allScopes);
+        m_allScopes.clear();
         m_scopes.clear();
         endRemoveRows();
     }
+    delete m_scopesOverview;
+    m_scopesOverview = nullptr;
 
     if (m_loaded) {
         m_loaded = false;
@@ -113,8 +125,22 @@
     return m_scopes[row];
 }
 
-unity::shell::scopes::ScopeInterface* Scopes::getScope(QString const&) const
-{
+unity::shell::scopes::ScopeInterface* Scopes::getScope(QString const &scope_id) const
+{
+    // According to mh3 Scopes::getScope should only return favorite scopes (i.e the ones in the model)
+    for (Scope *scope : m_scopes) {
+        if (scope->id() == scope_id)
+            return scope;
+    }
+    return nullptr;
+}
+
+Scope* Scopes::getScopeFromAll(const QString& scope_id) const
+{
+    for (Scope *scope : m_allScopes) {
+        if (scope->id() == scope_id)
+            return scope;
+    }
     return nullptr;
 }
 
@@ -135,13 +161,26 @@
 
 unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const
 {
-    return nullptr;
+    return m_scopesOverview;
+}
+
+QList<Scope*> Scopes::scopes() const
+{
+    return m_scopes;
+}
+
+QList<Scope*> Scopes::allScopes() const
+{
+    return m_allScopes;
 }
 
 void Scopes::addScope(Scope* scope)
 {
     int index = rowCount();
-    beginInsertRows(QModelIndex(), index, index);
-    m_scopes.append(scope);
-    endInsertRows();
+    if (scope->favorite()) {
+        beginInsertRows(QModelIndex(), index, index);
+        m_scopes.append(scope);
+        endInsertRows();
+    }
+    m_allScopes.append(scope);
 }

=== modified file 'tests/mocks/Unity/fake_scopes.h'
--- tests/mocks/Unity/fake_scopes.h	2014-08-06 19:38:57 +0000
+++ tests/mocks/Unity/fake_scopes.h	2014-08-08 14:57:17 +0000
@@ -53,11 +53,18 @@
     int count() const override;
     unity::shell::scopes::ScopeInterface* overviewScope() const override;
 
+    // This is used as part of implementation of the other C++ code, not API
+    QList<Scope*> scopes() const;
+    QList<Scope*> allScopes() const;
+    Scope* getScopeFromAll(const QString& scope_id) const;
+
 private Q_SLOTS:
     void updateScopes();
 
 private:
-    QList<Scope*> m_scopes;
+    QList<Scope*> m_scopes; // the favorite ones
+    QList<Scope*> m_allScopes;
+    Scope *m_scopesOverview;
     bool m_loaded;
     QTimer timer;
 };

=== added file 'tests/mocks/Unity/fake_scopesoverview.cpp'
--- tests/mocks/Unity/fake_scopesoverview.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2014-08-08 14:57:17 +0000
@@ -0,0 +1,281 @@
+/*
+ * 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/>.
+ */
+
+#include "fake_scopesoverview.h"
+
+#include "fake_scopes.h"
+
+#include <paths.h>
+
+ScopesOverview::ScopesOverview(Scopes* parent)
+ : Scope("scopesOverview", "Scopes Overview", false, parent)
+{
+    delete m_categories; // delete the usual categories, we're not going to use it
+    m_scopesOverviewCategories = new ScopesOverviewCategories(parent, this);
+    m_searchCategories = new ScopesOverviewSearchCategories(parent, this);
+    m_categories = m_scopesOverviewCategories;
+}
+
+void ScopesOverview::setSearchQuery(const QString& search_query)
+{
+    Scope::setSearchQuery(search_query);
+
+    auto origCategories = m_categories;
+    if (search_query.isEmpty()) m_categories = m_scopesOverviewCategories;
+    else m_categories = m_searchCategories;
+
+    if (m_categories != origCategories)
+        Q_EMIT categoriesChanged();
+}
+
+Q_INVOKABLE void ScopesOverview::activate(QVariant const& result)
+{
+    Scopes *scopes = dynamic_cast<Scopes*>(parent());
+    m_openScope = scopes->getScopeFromAll(result.toString());
+    Q_EMIT openScope(m_openScope);
+}
+
+ScopesOverviewCategories::ScopesOverviewCategories(Scopes *scopes, QObject* parent)
+    : unity::shell::scopes::CategoriesInterface(parent)
+    , m_scopes(scopes)
+{
+}
+
+int ScopesOverviewCategories::rowCount(const QModelIndex& /*parent*/) const
+{
+    return 2;
+}
+
+void ScopesOverviewCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
+{
+    qFatal("Using un-implemented ScopesOverviewCategories::addSpecialCategory");
+}
+
+bool ScopesOverviewCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
+{
+    qFatal("Using un-implemented ScopesOverviewCategories::overrideCategoryJson");
+}
+
+QVariant
+ScopesOverviewCategories::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    const QString categoryId = index.row() == 0 ? "favorites" : "all";
+
+    unity::shell::scopes::ResultsModelInterface *resultsModel = m_resultsModels[index.row()];
+    if (!resultsModel) {
+        QObject *that = const_cast<ScopesOverviewCategories*>(this);
+        QList<Scope*> scopes = index.row() == 0 ? m_scopes->scopes() : m_scopes->allScopes();
+        resultsModel = new ScopesOverviewResultsModel(scopes, categoryId, that);
+        m_resultsModels[index.row()] = resultsModel;
+    }
+    switch (role) {
+        case RoleCategoryId:
+            return categoryId;
+        case RoleName:
+            return index.row() == 0 ? "Favorites" : "All";
+        case RoleIcon:
+            return QVariant();
+        case RoleRawRendererTemplate:
+            qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
+            return QVariant();
+        case RoleRenderer:
+        {
+            QVariantMap map;
+            map["category-layout"] = "grid";
+            map["card-size"] = "small";
+            map["overlay"] = true;
+            return map;
+        }
+        case RoleComponents:
+        {
+            QVariantMap map, artMap;
+            artMap["aspect-ratio"] = "0.5";
+            artMap["field"] = "art";
+            map["art"] = artMap;
+            map["title"] = "HOLA";
+            return map;
+        }
+        case RoleResults:
+            return QVariant::fromValue(resultsModel);
+        case RoleCount:
+            return resultsModel->rowCount();
+        case RoleHeaderLink:
+            return QString();
+        default:
+            qFatal("Using un-implemented Categories role");
+            return QVariant();
+    }
+}
+
+
+
+ScopesOverviewSearchCategories::ScopesOverviewSearchCategories(Scopes *scopes, QObject* parent)
+    : unity::shell::scopes::CategoriesInterface(parent)
+    , m_scopes(scopes)
+{
+}
+
+int ScopesOverviewSearchCategories::rowCount(const QModelIndex& /*parent*/) const
+{
+    return 2;
+}
+
+void ScopesOverviewSearchCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
+{
+    qFatal("Using un-implemented ScopesOverviewSearchCategories::addSpecialCategory");
+}
+
+bool ScopesOverviewSearchCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
+{
+    qFatal("Using un-implemented ScopesOverviewSearchCategories::overrideCategoryJson");
+}
+
+QVariant
+ScopesOverviewSearchCategories::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    const QString categoryId = index.row() == 0 ? "searchA" : "searchB";
+
+    unity::shell::scopes::ResultsModelInterface *resultsModel = m_resultsModels[index.row()];
+    if (!resultsModel) {
+        QObject *that = const_cast<ScopesOverviewSearchCategories*>(this);
+        QList<Scope *> scopes;
+        if (index.row() == 0) {
+            scopes << m_scopes->getScopeFromAll("clickscope") << nullptr << m_scopes->getScopeFromAll("MockScope2");
+        } else {
+            scopes << nullptr << m_scopes->getScopeFromAll("MockScope7") << nullptr << m_scopes->getScopeFromAll("MockScope1");
+        }
+        resultsModel = new ScopesOverviewResultsModel(scopes, categoryId, that);
+        m_resultsModels[index.row()] = resultsModel;
+    }
+    switch (role) {
+        case RoleCategoryId:
+            return categoryId;
+        case RoleName:
+            return index.row() == 0 ? "SearchA" : "SearchB";
+        case RoleIcon:
+            return QVariant();
+        case RoleRawRendererTemplate:
+            qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
+            return QVariant();
+        case RoleRenderer:
+        {
+            QVariantMap map;
+            map["category-layout"] = "grid";
+            map["card-size"] = "small";
+            map["overlay"] = true;
+            return map;
+        }
+        case RoleComponents:
+        {
+            QVariantMap map, artMap;
+            artMap["aspect-ratio"] = "1";
+            artMap["field"] = "art";
+            map["art"] = artMap;
+            map["title"] = "HOLA";
+            return map;
+        }
+        case RoleResults:
+            return QVariant::fromValue(resultsModel);
+        case RoleCount:
+            return resultsModel->rowCount();
+        case RoleHeaderLink:
+            return QString();
+        default:
+            qFatal("Using un-implemented Categories role");
+            return QVariant();
+    }
+}
+
+
+ScopesOverviewResultsModel::ScopesOverviewResultsModel(const QList<Scope *> &scopes, const QString &categoryId, QObject* parent)
+    : unity::shell::scopes::ResultsModelInterface(parent)
+    , m_scopes(scopes)
+    , m_categoryId(categoryId)
+{
+}
+
+QString ScopesOverviewResultsModel::categoryId() const
+{
+    return m_categoryId;
+}
+
+void ScopesOverviewResultsModel::setCategoryId(QString const& /*id*/)
+{
+    qFatal("Calling un-implemented ScopesOverviewResultsModel::setCategoryId");
+}
+
+int ScopesOverviewResultsModel::scopeIndex(QString const& id) const
+{
+    const int scopeCount = count();
+    for (int i = 0; i < scopeCount; ++i) {
+        if (m_scopes[i]->id() == id)
+            return i;
+    }
+    return -1;
+}
+
+QHash<int, QByteArray> ScopesOverviewResultsModel::roleNames() const
+{
+    QHash<int, QByteArray> roles = unity::shell::scopes::ResultsModelInterface::roleNames();
+    roles[RoleBackground + 1] = "scopeId";
+    return roles;
+}
+
+int ScopesOverviewResultsModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+
+    return m_scopes.count();
+}
+
+int ScopesOverviewResultsModel::count() const
+{
+    return rowCount();
+}
+
+QVariant
+ScopesOverviewResultsModel::data(const QModelIndex& index, int role) const
+{
+    unity::shell::scopes::ScopeInterface *scope = m_scopes[index.row()];
+    switch (role) {
+        case RoleUri:
+        case RoleCategoryId:
+        case RoleDndUri:
+            return QString();
+        case RoleResult:
+            return scope ? scope->id() : QString("Result.%1.%2").arg(categoryId()).arg(index.row());
+        case RoleTitle:
+            return scope ? scope->name() : QString("Title.%1.%2").arg(categoryId()).arg(index.row());
+        case RoleArt:
+            return qmlDirectory() + "graphics/applicationIcons/dash.png";
+        case RoleMascot:
+        case RoleEmblem:
+        case RoleSummary:
+        case RoleBackground + 1: // scopeId
+            return scope ? scope->id() : nullptr;
+            break;
+        default:
+            return QVariant();
+    }
+}

=== added file 'tests/mocks/Unity/fake_scopesoverview.h'
--- tests/mocks/Unity/fake_scopesoverview.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_scopesoverview.h	2014-08-08 14:57:17 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FAKE_SCOPESOVERVIEW_H
+#define FAKE_SCOPESOVERVIEW_H
+
+#include "fake_scope.h"
+#include <unity/shell/scopes/ResultsModelInterface.h>
+
+class Scopes;
+
+class ScopesOverview : public Scope
+{
+    Q_OBJECT
+
+public:
+    ScopesOverview(Scopes* parent = 0);
+
+    void setSearchQuery(const QString& search_query) override;
+    Q_INVOKABLE void activate(QVariant const& result) override;
+
+private:
+    unity::shell::scopes::CategoriesInterface *m_scopesOverviewCategories;
+    unity::shell::scopes::CategoriesInterface *m_searchCategories;
+};
+
+class ScopesOverviewCategories : public unity::shell::scopes::CategoriesInterface
+{
+    Q_OBJECT
+
+public:
+    ScopesOverviewCategories(Scopes *scopes, QObject* parent = 0);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
+    Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
+
+private:
+    mutable QHash<int, unity::shell::scopes::ResultsModelInterface*> m_resultsModels;
+
+    Scopes *m_scopes;
+};
+
+class ScopesOverviewSearchCategories : public unity::shell::scopes::CategoriesInterface
+{
+    Q_OBJECT
+
+public:
+    ScopesOverviewSearchCategories(Scopes *scopes, QObject* parent = 0);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
+    Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
+
+private:
+    mutable QHash<int, unity::shell::scopes::ResultsModelInterface*> m_resultsModels;
+
+    Scopes *m_scopes;
+};
+
+class ScopesOverviewResultsModel : public unity::shell::scopes::ResultsModelInterface
+{
+    Q_OBJECT
+
+public:
+    explicit ScopesOverviewResultsModel(const QList<Scope *> &scopes, const QString &categoryId, QObject* parent = 0);
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+    /* getters */
+    QString categoryId() const override;
+    int count() const override;
+
+    /* setters */
+    void setCategoryId(QString const& id) override;
+
+    /* Special API */
+    Q_INVOKABLE int scopeIndex(QString const& id) const;
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    QList<Scope *> m_scopes;
+    QString m_categoryId;
+};
+
+#endif // FAKE_SCOPESOVERVIEW_H

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2014-08-08 14:57:17 +0000
@@ -61,12 +61,12 @@
                         id: titleLabel; 
                         objectName: "titleLabel"; 
                         anchors { right: parent.right;
-rightMargin: units.gu(1);
-left: parent.left;
-top: artShapeHolder.bottom; 
-                                         topMargin: units.gu(1);
-leftMargin: units.gu(1);
- } 
+                        rightMargin: units.gu(1);
+                        left: parent.left;
+                        top: artShapeHolder.bottom; 
+                        topMargin: units.gu(1);
+                        leftMargin: units.gu(1);
+                        } 
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 

=== modified file 'tests/plugins/Dash/cardcreator/1.tst'
--- tests/plugins/Dash/cardcreator/1.tst	2014-07-28 15:09:45 +0000
+++ tests/plugins/Dash/cardcreator/1.tst	2014-08-08 14:57:17 +0000
@@ -1,3 +1,3 @@
 template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
-components: {"art":{"aspect-ratio":1.6,"field":"art"},"title":{"field":"title"}}
+components: {"art":{"aspect-ratio":1.6,"field":"art"},"title":{"field":"title"},"attributes":{}}
 result: 1.res

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2014-07-31 13:33:56 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2014-08-08 14:57:17 +0000
@@ -55,17 +55,19 @@
                         spacing: margins; 
                         height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; 
                         anchors { top: parent.top; 
-                                     topMargin: units.gu(1);
-left: parent.left;
- } 
+                        topMargin: units.gu(1);
+                        left: parent.left;
+                        } 
                         anchors.right: parent.right; 
                         anchors.margins: margins;
-                        data: [ Image { 
+                        anchors.rightMargin: 0;
+                        data: [
+Image { 
                             id: mascotImage; 
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
                             readonly property int maxSize: Math.max(width, height) * 4; 
-                            source: cardData && cardData["mascot"]; 
+                            source: cardData && cardData["mascot"] || "";
                             width: units.gu(6); 
                             height: units.gu(5.625); 
                             sourceSize { width: maxSize; height: maxSize } 
@@ -74,37 +76,43 @@
                             verticalAlignment: Image.AlignVCenter; 
                             visible: showHeader; 
                         }
-
-                                ,
-                                Column { 
-                            anchors.verticalCenter: parent.verticalCenter; 
-                            spacing: units.dp(2); 
-                            width: parent.width - x;
-                            data: [ Label { 
+,Item { 
+                            id: headerTitleContainer; 
+                            anchors { verticalCenter: parent.verticalCenter;  } 
+                            width: parent.width - x; 
+                            implicitHeight: titleLabel.height + subtitleLabel.height; 
+                            data: [ 
+                                Label { 
                         id: titleLabel; 
                         objectName: "titleLabel"; 
-                        anchors { left: parent.left; right: parent.right } 
+                        anchors { right: parent.right;
+                        rightMargin: units.gu(1);
+                        left: parent.left;
+                        top: parent.top; } 
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey"); 
+                        color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
                         visible: showHeader ; 
                         text: root.title; 
                         font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.headerAlignment; 
                     }
-
-                                    ,
-                                    Label { 
+                                    ,Label { 
                             id: subtitleLabel; 
                             objectName: "subtitleLabel"; 
-                            anchors { left: parent.left; right: parent.right } 
+                            anchors { right: parent.right;
+                            left: parent.left;
+                            rightMargin: units.gu(1);
+                            top: titleLabel.bottom;
+                            } 
+                            anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
                             fontSize: "small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey"); 
+                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/2.tst'
--- tests/plugins/Dash/cardcreator/2.tst	2014-07-28 15:09:45 +0000
+++ tests/plugins/Dash/cardcreator/2.tst	2014-08-08 14:57:17 +0000
@@ -1,3 +1,3 @@
 template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
-components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"}}
+components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"},"attributes":{}}
 result: 2.res

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2014-08-08 14:57:17 +0000
@@ -61,12 +61,12 @@
                         id: titleLabel; 
                         objectName: "titleLabel"; 
                         anchors { right: parent.right;
-rightMargin: units.gu(1);
-left: parent.left;
-top: artShapeHolder.bottom; 
-                                         topMargin: units.gu(1);
-leftMargin: units.gu(1);
- } 
+                        rightMargin: units.gu(1);
+                        left: parent.left;
+                        top: artShapeHolder.bottom; 
+                        topMargin: units.gu(1);
+                        leftMargin: units.gu(1);
+                        } 
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
@@ -82,12 +82,12 @@
                             id: subtitleLabel; 
                             objectName: "subtitleLabel"; 
                             anchors { left: titleLabel.left; 
-                               leftMargin: titleLabel.leftMargin; 
-                               right: titleLabel.right; 
-                               rightMargin: titleLabel.rightMargin; 
-                               top: titleLabel.bottom; 
-                               topMargin: units.dp(2);
- } 
+                            leftMargin: titleLabel.leftMargin; 
+                            rightMargin: units.gu(1);
+                            right: titleLabel.right; 
+                            top: titleLabel.bottom; 
+                            } 
+                            anchors.topMargin: units.dp(2);
                             elide: Text.ElideRight; 
                             fontSize: "small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 

=== modified file 'tests/plugins/Dash/cardcreator/3.tst'
--- tests/plugins/Dash/cardcreator/3.tst	2014-07-28 15:09:45 +0000
+++ tests/plugins/Dash/cardcreator/3.tst	2014-08-08 14:57:17 +0000
@@ -1,3 +1,3 @@
 template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
-components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"}}
+components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"},"attributes":{}}
 result: 3.res

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2014-07-25 13:41:19 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2014-08-08 14:57:17 +0000
@@ -27,7 +27,9 @@
 }
                     anchors.right: parent.right; 
                     anchors.margins: margins;
-data: [ Loader { 
+                    anchors.rightMargin: 0;
+data: [ 
+Loader { 
                         id: mascotShapeLoader; 
                         objectName: "mascotShapeLoader"; 
                         asynchronous: root.asynchronous; 
@@ -39,13 +41,12 @@
                         anchors { verticalCenter: parent.verticalCenter; }
                     }
 
-,
-Image { 
+,Image { 
                     id: mascotImage; 
                     objectName: "mascotImage"; 
                     anchors { verticalCenter: parent.verticalCenter; }
                     readonly property int maxSize: Math.max(width, height) * 4; 
-                    source: cardData && cardData["mascot"]; 
+                    source: cardData && cardData["mascot"] || ""; 
                     width: units.gu(6); 
                     height: units.gu(5.625); 
                     sourceSize { width: maxSize; height: maxSize } 
@@ -55,15 +56,19 @@
                     visible: false; 
                 }
 
-,
-Column { 
-                        anchors.verticalCenter: parent.verticalCenter; 
-                        spacing: units.dp(2); 
-                        width: parent.width - x;
-data: [ Label { 
+,Item { 
+                            id: headerTitleContainer; 
+                            anchors { verticalCenter: parent.verticalCenter;  } 
+                            width: parent.width - x; 
+                            implicitHeight: titleLabel.height + subtitleLabel.height; 
+                            data: [ 
+Label { 
                     id: titleLabel; 
                     objectName: "titleLabel"; 
-                    anchors { left: parent.left; right: parent.right }
+                    anchors { right: parent.right;
+                    rightMargin: units.gu(1); 
+                    left: parent.left; 
+                    top: parent.top; }
                     elide: Text.ElideRight; 
                     fontSize: "small"; 
                     wrapMode: Text.Wrap; 
@@ -75,12 +80,15 @@
                     font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
                     horizontalAlignment: root.headerAlignment; 
                 }
-,
-Label { 
+,Label { 
                         id: subtitleLabel; 
                         objectName: "subtitleLabel"; 
-                        anchors { left: parent.left; right: parent.right }
-
+                        anchors { right: parent.right; 
+                        left: parent.left; 
+                        rightMargin: units.gu(1); 
+                        top: titleLabel.bottom; 
+                        }
+                        anchors.topMargin: units.dp(2);
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 

=== modified file 'tests/plugins/Dash/cardcreator/4.tst'
--- tests/plugins/Dash/cardcreator/4.tst	2014-07-28 15:09:45 +0000
+++ tests/plugins/Dash/cardcreator/4.tst	2014-08-08 14:57:17 +0000
@@ -1,3 +1,3 @@
 template: {"card-layout":"horizontal","card-size":"large","category-layout":"grid","collapsed-rows":2}
-components: {"art":{"aspect-ratio":1},"mascot":{"field":"mascot"},"subtitle":{"field":"domain"},"title":{"field":"title"}}
+components: {"art":{"aspect-ratio":1},"mascot":{"field":"mascot"},"subtitle":{"field":"domain"},"title":{"field":"title"},"attributes":{}}
 result: 4.res

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2014-08-08 14:57:17 +0000
@@ -68,8 +68,9 @@
                             visible: showHeader && status == Loader.Ready; 
                             sourceComponent: ShaderEffect { 
                                 id: overlay; 
-                                height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); 
-                                opacity: 0.6; 
+                                height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
+                                property real luminance: 0.2126 * overlayColor.r + 0.7152 * overlayColor.g + 0.0722 * overlayColor.b;
+                                property color overlayColor: cardData && cardData["overlayColor"] || "#99000000";
                                 property var source: ShaderEffectSource { 
                                     id: shaderSource; 
                                     sourceItem: artShapeLoader.item; 
@@ -90,29 +91,30 @@
                                     varying highp vec2 coord; 
                                     uniform sampler2D source; 
                                     uniform lowp float qt_Opacity; 
+                                    uniform highp vec4 overlayColor;
                                     void main() { 
                                         lowp vec4 tex = texture2D(source, coord); 
-                                        gl_FragColor = vec4(0, 0, 0, tex.a) * qt_Opacity; 
+                                        gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a; 
                                     }"; 
                             } 
                         }
 readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
 Label { 
-                        id: titleLabel; 
+                        id: titleLabel;
                         objectName: "titleLabel"; 
-                        anchors { left: parent.left; 
-                                leftMargin: units.gu(1); 
-                                right: parent.right; 
-                                rightMargin: units.gu(1); 
-                                top: overlayLoader.top; 
-                                topMargin: units.gu(1);
- } 
+                        anchors { right: parent.right; 
+                        rightMargin: units.gu(1); 
+                        left: parent.left; 
+                        leftMargin: units.gu(1); 
+                        top: overlayLoader.top; 
+                        topMargin: units.gu(1);
+                        } 
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: "white"; 
+                        color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
                         visible: showHeader && overlayLoader.active; 
                         text: root.title; 
                         font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
@@ -122,16 +124,16 @@
                             id: subtitleLabel; 
                             objectName: "subtitleLabel"; 
                             anchors { left: titleLabel.left; 
-                               leftMargin: titleLabel.leftMargin; 
-                               right: titleLabel.right; 
-                               rightMargin: titleLabel.rightMargin; 
-                               top: titleLabel.bottom; 
-                               topMargin: units.dp(2);
- } 
+                            leftMargin: titleLabel.leftMargin; 
+                            rightMargin: units.gu(1); 
+                            right: titleLabel.right; 
+                            top: titleLabel.bottom; 
+                            } 
+                            anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
                             fontSize: "small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: "white"; 
+                            color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/5.tst'
--- tests/plugins/Dash/cardcreator/5.tst	2014-07-28 15:09:45 +0000
+++ tests/plugins/Dash/cardcreator/5.tst	2014-08-08 14:57:17 +0000
@@ -1,3 +1,3 @@
 template: {"card-layout":"vertical","card-size":"medium","category-layout":"carousel","collapsed-rows":2,"overlay":true}
-components: {"art":{"aspect-ratio":1,"field":"art"},"subtitle":{"field":"artist"},"title":{"field":"title"}}
+components: {"art":{"aspect-ratio":1,"field":"art"},"subtitle":{"field":"artist"},"title":{"field":"title"},"attributes":{}}
 result: 5.res

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2014-08-08 14:57:17 +0000
@@ -13,57 +13,110 @@
                 property bool asynchronous: true;
                 property bool showHeader: true;
                 implicitWidth: childrenRect.width;
-onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }
-readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
-Item  {
-                    id: artShapeHolder;
-                    height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
-                    width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
-                    anchors { horizontalCenter: parent.horizontalCenter; }
-                    Loader {
-                        id: artShapeLoader;
-                        objectName: "artShapeLoader";
-                        active: cardData && cardData["art"] || false;
-                        asynchronous: root.asynchronous;
-                        visible: status == Loader.Ready;
-                        sourceComponent: UbuntuShape {
-                            id: artShape;
-                            objectName: "artShape";
-                            radius: "medium";
-                            visible: image.status == Image.Ready;
-                            readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
-                            readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
-                            Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
-                            Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
-                            function updateWidthHeightBindings() {
-                                if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
-                                            width = root.fixedArtShapeSize.width;
-                                            height = root.fixedArtShapeSize.height;
-                                } else {
-                                    width = Qt.binding(function() { return !visible ? 0 : image.width });
-                                    height = Qt.binding(function() { return !visible ? 0 : image.height });
-                                }
-                            }
-                            image: Image {
-                                objectName: "artImage";
-                                source: cardData && cardData["art"] || "";
-                                cache: true;
-                                asynchronous: root.asynchronous;
-                                fillMode: Image.PreserveAspectCrop;
-                                width: root.width;
-                                height: width / artShape.aspect;
-                            }
-                        }
+Loader {
+                                id: backgroundLoader; 
+                                objectName: "backgroundLoader"; 
+                                anchors.fill: parent; 
+                                asynchronous: root.asynchronous; 
+                                visible: status == Loader.Ready; 
+                                sourceComponent: UbuntuShape { 
+                                    objectName: "background"; 
+                                    radius: "medium"; 
+                                    color: getColor(0) || "white"; 
+                                    gradientColor: getColor(1) || color; 
+                                    anchors.fill: parent; 
+                                    image: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b; 
+                                    property Image backgroundImage: Image { 
+                                        objectName: "backgroundImage"; 
+                                        source: { 
+                                            if (cardData && typeof cardData["background"] === "string") return cardData["background"]; 
+                                            else if (template && typeof template["card-background"] === "string") return template["card-background"]; 
+                                            else return ""; 
+                                        } 
+                                    } 
+                                    function getColor(index) { 
+                                        if (cardData && typeof cardData["background"] === "object" 
+                                            && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { 
+                                            return cardData["background"]["elements"][index]; 
+                                        } else if (template && typeof template["card-background"] === "object" 
+                                                && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient"))  { 
+                                            return template["card-background"]["elements"][index]; 
+                                        } else return undefined; 
+                                    } 
+                                } 
+                            }
+readonly property size artShapeSize: Qt.size(-1, -1);
+readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
+Item { 
+                            id: headerTitleContainer; 
+                            anchors { right: parent.right; left: parent.left;
+                            top: parent.top; 
+                            topMargin: units.gu(1);
+                            leftMargin: units.gu(1);
+                            } 
+                            width: parent.width - x; 
+                            implicitHeight: titleLabel.height + subtitleLabel.height; 
+                            data: [ 
+                                Label { 
+                        id: titleLabel; 
+                        objectName: "titleLabel"; 
+                        anchors { right: emblemImage.left; 
+                        rightMargin: emblemImage.width > 0 ? units.gu(0.5) : 0; 
+                        left: parent.left; 
+                        top: parent.top; } 
+                        elide: Text.ElideRight; 
+                        fontSize: "small"; 
+                        wrapMode: Text.Wrap; 
+                        maximumLineCount: 2; 
+                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                        color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
+                        visible: showHeader ; 
+                        text: root.title; 
+                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.headerAlignment; 
                     }
-                }
-readonly property int headerHeight: 0;
+,Label { 
+                            id: subtitleLabel; 
+                            objectName: "subtitleLabel"; 
+                            anchors { right: parent.right; 
+                            left: parent.left; 
+                            rightMargin: units.gu(1); 
+                            top: titleLabel.bottom;
+                            } 
+                            anchors.topMargin: units.dp(2); 
+                            elide: Text.ElideRight; 
+                            fontSize: "small"; 
+                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
+                            visible: titleLabel.visible && titleLabel.text; 
+                            text: cardData && cardData["subtitle"] || ""; 
+                            font.weight: Font.Light; 
+                            horizontalAlignment: root.headerAlignment; 
+                        }
+,Image { 
+                            id: emblemImage; 
+                            objectName: "emblemImage"; 
+                            anchors { 
+                            bottom: titleLabel.baseline; 
+                            right: parent.right; 
+                            rightMargin: status === Image.Ready ? units.gu(1) : 0; 
+                            } 
+                            source: cardData && cardData["emblem"] || ""; 
+                            width: height; 
+                            height: status === Image.Ready ? titleLabel.font.pixelSize : 0; 
+                            fillMode: Image.PreserveAspectFit; 
+                        }
+ 
+                            ]
+                        }
 UbuntuShape {
     id: touchdown;
     objectName: "touchdown";
-    anchors { fill: artShapeHolder }
+    anchors { fill: backgroundLoader }
     visible: root.pressed;
     radius: "medium";
     borderSource: "radius_pressed.sci"
 }
-implicitHeight: artShapeHolder.height;
+implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
 }

=== modified file 'tests/plugins/Dash/cardcreator/6.tst'
--- tests/plugins/Dash/cardcreator/6.tst	2014-07-28 15:09:45 +0000
+++ tests/plugins/Dash/cardcreator/6.tst	2014-08-08 14:57:17 +0000
@@ -1,3 +1,3 @@
-template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
-components: {"art":{"aspect-ratio":1.6,"field":"art"}}
+template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
+components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"subtitle":{"field":"author"},"title":{"field":"title"},"emblem":{"field":"source"},"attributes":{}}
 result: 6.res

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2014-08-08 14:57:17 +0000
@@ -55,17 +55,19 @@
                         spacing: margins; 
                         height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; 
                         anchors { top: parent.top; 
-                                     topMargin: units.gu(1);
-left: parent.left;
- } 
+                        topMargin: units.gu(1);
+                        left: parent.left;
+                        } 
                         anchors.right: parent.right; 
                         anchors.margins: margins;
-                        data: [ Image { 
+                        anchors.rightMargin: 0;
+                        data: [ 
+Image { 
                             id: mascotImage; 
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
                             readonly property int maxSize: Math.max(width, height) * 4; 
-                            source: cardData && cardData["mascot"]; 
+                            source: cardData && cardData["mascot"] || ""; 
                             width: units.gu(6); 
                             height: units.gu(5.625); 
                             sourceSize { width: maxSize; height: maxSize } 
@@ -75,48 +77,58 @@
                             visible: showHeader; 
                         }
 
-                                ,
-                                Column { 
-                    anchors.verticalCenter: parent.verticalCenter; 
-                    spacing: units.dp(2); 
-                    width: parent.width - x;
-                    data: [ 
-                        Label { 
+,Item { 
+                            id: headerTitleContainer; 
+                            anchors { verticalCenter: parent.verticalCenter;  } 
+                            width: parent.width - x; 
+                            implicitHeight: titleLabel.height + subtitleLabel.height + attributesRow.height; 
+                            data: [ 
+                                Label { 
                         id: titleLabel; 
                         objectName: "titleLabel"; 
-                        anchors { left: parent.left; right: parent.right } 
+                        anchors { right: parent.right; 
+                        rightMargin: units.gu(1); 
+                        left: parent.left; 
+                        top: parent.top; } 
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey"); 
+                        color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
                         visible: showHeader ; 
                         text: root.title; 
                         font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.headerAlignment; 
                     }
-,
-Label { 
+,Label { 
                             id: subtitleLabel; 
                             objectName: "subtitleLabel"; 
-                            anchors { left: parent.left; right: parent.right } 
+                            anchors { right: parent.right; 
+                            left: parent.left; 
+                            rightMargin: units.gu(1); 
+                            top: titleLabel.bottom; 
+                            } 
+                            anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
                             fontSize: "small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey"); 
+                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
                             horizontalAlignment: root.headerAlignment; 
                         }
-,
-CardAttributes { 
+,CardAttributes { 
                             id: attributesRow; 
                             objectName: "attributesRow"; 
-                            anchors { left: parent.left; right: parent.right } 
-                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey"); 
-                            model: cardData["attributes"]; 
+                            anchors { right: parent.right;
+                            left: parent.left;
+                            rightMargin: units.gu(1);
+                            top: subtitleLabel.bottom; 
+                            } 
+                            color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey"); 
+                            model: cardData && cardData["attributes"]; 
                           }
  
                     ]

=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
--- tests/plugins/Dash/tst_ScopeStyle.qml	2014-07-25 11:42:06 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2014-08-08 14:57:17 +0000
@@ -101,7 +101,7 @@
 
         function test_threshold_data() {
             return [
-                { tag: "default", index: 0, threshold: 0.5020 },
+                { tag: "default", index: 0, threshold: 0.7510 },
                 { tag: "red on black", index: 1, threshold: 0.1063 },
                 { tag: "green on white", index: 2, threshold: 0.6795 },
                 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },

=== modified file 'tests/qmltests/Dash/CardHelpers.js'
--- tests/qmltests/Dash/CardHelpers.js	2014-08-06 19:38:16 +0000
+++ tests/qmltests/Dash/CardHelpers.js	2014-08-08 14:57:17 +0000
@@ -60,6 +60,7 @@
   "art": "art", \
   "subtitle": "subtitle", \
   "mascot": "mascot", \
+  "emblem": "emblem", \
   "overlayColor": "overlayColor", \
   "summary": "summary", \
   "attributes": "attributes" \

=== added file 'tests/qmltests/Dash/artwork/emblem.png'
Binary files tests/qmltests/Dash/artwork/emblem.png	1970-01-01 00:00:00 +0000 and tests/qmltests/Dash/artwork/emblem.png	2014-08-08 14:57:17 +0000 differ
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2014-08-05 22:51:17 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2014-08-08 14:57:17 +0000
@@ -31,6 +31,7 @@
     {
       "art": "../../../tests/qmltests/Dash/artwork/music-player-design.png",
       "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",
+      "emblem": "../../../tests/qmltests/Dash/artwork/emblem.png",
       "title": "foo",
       "subtitle": "bar",
       "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
@@ -270,7 +271,7 @@
                 { tag: "Large", width: units.gu(38), index: 2 },
                 { tag: "Wide", height: units.gu(19), size: "large", index: 3 },
                 { tag: "Tall", height: units.gu(38) / 0.7, size: "large", width: units.gu(38), index: 4 },
-                { tag: "VerticalWidth", width: function() { return headerRow.width + units.gu(1) * 2 }, index: 0 },
+                { tag: "VerticalWidth", width: function() { return headerRow.width + units.gu(1) }, index: 0 },
                 { tag: "HorizontalHeight", height: function() { return headerRow.height + units.gu(1) * 2 }, index: 5 },
                 { tag: "HorizontalWidth", width: function() { return headerRow.x - units.gu(1) }, index: 5 },
             ]
@@ -458,6 +459,23 @@
             tryCompareFunction(function() { return Qt.colorEqual(subtitle.color, fontColor); }, true);
         }
 
+        function test_emblemImage_data() {
+            return [
+                { tag: "Art and summary", emblem: true, index: 0 },
+                { tag: "Art and summary, small", emblem: false, index: 1 },
+                { tag: "No header", emblem: false, index: 7 },
+                { tag: "With background", emblem: true, index: 10 },
+            ];
+        }
+
+        function test_emblemImage(data) {
+            selector.selectedIndex = data.index;
+            waitForRendering(card);
+
+            var emblemImage = findChild(card, "emblemImage");
+            compare(emblemImage !== null, data.emblem);
+        }
+
         function test_mascotShape_data() {
             return [
                 { tag: "Art and summary", shape: false, index: 0 },

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-08-06 14:50:25 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-08-08 14:57:17 +0000
@@ -20,8 +20,6 @@
 import Ubuntu.Components 0.1
 import Unity.Test 0.1 as UT
 
-// TODO We don't have any tests for the overlay scope functionality.
-
 Item {
     id: shell
     width: units.gu(40)
@@ -61,9 +59,9 @@
         function get_scope_data() {
             return [
                         { tag: "MockScope1", visualIndex: 0 },
-                        { tag: "MockScope2", visualIndex: 1 },
-                        { tag: "clickscope", visualIndex: 2 },
-                        { tag: "MockScope5", visualIndex: 3 },
+                        { tag: "MockScope2", visualIndex: -1 },
+                        { tag: "clickscope", visualIndex: 1 },
+                        { tag: "MockScope5", visualIndex: 2 },
             ]
         }
 
@@ -79,10 +77,234 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(scopes, "loaded", true);
-            tryCompare(dashContentList, "count", 5);
+            tryCompare(dashContentList, "count", 6);
 
             verify(dashContentList != undefined);
-            tryCompare(dashContentList, "currentIndex", data.visualIndex);
+            if (data.visualIndex == -1) {
+                tryCompare(dashContentList, "currentIndex", 0);
+                expectFail(data.tag, "non favorite scopes should not be visble in the scopes model");
+                compare(dashContentList.currentItem.scopeId, data.tag); // this should fail
+            } else {
+                tryCompare(dashContentList, "currentIndex", data.visualIndex);
+                compare(dashContentList.currentItem.scopeId, data.tag);
+            }
+        }
+
+        function test_dash_overview_show_select_same_favorite() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 0);
+
+            // Make sure stuff is loaded
+            var scopesOverviewFavoritesRepeater = findChild(dash, "scopesOverviewFavoritesRepeater");
+            tryCompare(scopesOverviewFavoritesRepeater, "count", 6);
+            tryCompareFunction(function() { return scopesOverviewFavoritesRepeater.itemAt(0).item != null; }, true);
+            waitForRendering(scopesOverviewFavoritesRepeater.itemAt(0).item);
+
+            // Click in first item
+            mouseClick(scopesOverviewFavoritesRepeater.itemAt(0).item, 0, 0);
+
+            // Make sure animation went back
+            tryCompare(overviewController, "progress", 0);
+            compare(dashContentList.currentIndex, 0);
+        }
+
+        function test_dash_overview_show_select_different_favorite() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 0);
+
+            // Make sure stuff is loaded
+            var scopesOverviewFavoritesRepeater = findChild(dash, "scopesOverviewFavoritesRepeater");
+            tryCompare(scopesOverviewFavoritesRepeater, "count", 6);
+            tryCompareFunction(function() { return scopesOverviewFavoritesRepeater.itemAt(0).item != null; }, true);
+            waitForRendering(scopesOverviewFavoritesRepeater.itemAt(1).item);
+
+            // Click in first item
+            mouseClick(scopesOverviewFavoritesRepeater.itemAt(1).item, 0, 0);
+
+            // Make sure animation went back
+            tryCompare(overviewController, "progress", 0);
+            compare(dashContentList.currentIndex, 1);
+        }
+
+        function test_dash_overview_all_temp_scope_done_from_all() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 0);
+
+            // Make sure stuff is loaded
+            var scopesOverviewFavoritesRepeater = findChild(dash, "scopesOverviewFavoritesRepeater");
+            tryCompare(scopesOverviewFavoritesRepeater, "count", 6);
+            tryCompareFunction(function() { return scopesOverviewFavoritesRepeater.itemAt(0).item != null; }, true);
+            waitForRendering(scopesOverviewFavoritesRepeater.itemAt(1).item);
+
+            // Click on the all tab
+            var scopesOverviewAllTabButton = findChild(dash, "scopesOverviewAllTabButton");
+            mouseClick(scopesOverviewAllTabButton, 0, 0);
+
+            // Wait for all tab to be enabled (animation finish)
+            var scopesOverviewAllView = findChild(dash, "scopesOverviewRepeaterChild1");
+            tryCompare(scopesOverviewAllView, "enabled", true);
+
+            // Click on a temp scope
+            var tempScopeCard = findChild(scopesOverviewAllView, "delegate1");
+            mouseClick(tempScopeCard, 0, 0);
+
+            // Check the bottom edge (overview) is disabled from temp scope
+            var overviewDragHandle = findChild(dash, "overviewDragHandle");
+            compare(overviewDragHandle.enabled, false);
+
+            // Check temp scope is there
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope != null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", true);
+
+            // Go back
+            var scopesOverviewTempScopeItemHeader = findChild(scopesOverviewTempScopeItem, "scopePageHeader");
+            var backButton = findChild(findChild(scopesOverviewTempScopeItemHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+
+            // Check temp scope is gone
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope == null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", false);
+
+            // Press on done
+            var scopesOverviewDoneButton = findChild(scopesOverview, "scopesOverviewDoneButton");
+            mouseClick(scopesOverviewDoneButton, 0, 0);
+
+            // Check the dash overview is gone
+            tryCompare(overviewController, "progress", 0);
+
+            // Original list is still on 0
+            compare(dashContentList.currentIndex, 0);
+        }
+
+        function test_temp_scope_dash_overview_all_search_temp_scope_favorite_from_all() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Swipe right to Apps scope
+            touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));
+            tryCompare(dashContentList, "contentX", dashContentList.width);
+            tryCompare(dashContentList, "currentIndex", 1);
+
+            // Click on card that opens temp scope
+            var categoryListView = findChild(dashContentList.currentItem, "categoryListView");
+            var dashCategory2 = findChild(categoryListView, "dashCategory2");
+            tryCompareFunction(function() {
+                    var d = findChild(dashCategory2, "delegate2");
+                    if (d) return true;
+                    categoryListView.contentY += 100;
+                    return false;
+                }, true);
+            var card2 = findChild(dashCategory2, "delegate2");
+            waitForRendering(card2);
+            mouseClick(card2, card2.width / 2, card2.height / 2);
+
+            // Wait for temp scope to be there
+            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
+            tryCompare(dashTempScopeItem, "x", 0);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 1);
+
+            // Do a search
+            var scopesOverviewPageHeader = findChild(scopesOverview, "scopesOverviewPageHeader");
+            var searchButton = findChild(scopesOverviewPageHeader, "search_header_button");
+            mouseClick(searchButton, 0, 0);
+
+            // Type something
+            keyClick(Qt.Key_H);
+
+            // Check results grid is there and the other lists are not
+            var searchResultsViewer = findChild(scopesOverview, "searchResultsViewer");
+            var scopesOverviewRepeater = findChild(dash, "scopesOverviewRepeater");
+            tryCompare(searchResultsViewer, "opacity", 1);
+            tryCompare(scopesOverviewRepeater, "count", 0);
+
+            // Click on a temp scope in the search
+            var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
+            var cardTempScope = findChild(dashCategorysearchA, "delegate2");
+            waitForRendering(cardTempScope);
+            mouseClick(cardTempScope, cardTempScope.width / 2, cardTempScope.height / 2);
+
+            // Check the bottom edge (overview) is disabled from temp scope
+            var overviewDragHandle = findChild(dash, "overviewDragHandle");
+            compare(overviewDragHandle.enabled, false);
+
+            // Check temp scope is there
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope != null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", true);
+
+            // Go back
+            var scopesOverviewTempScopeItemHeader = findChild(scopesOverviewTempScopeItem, "scopePageHeader");
+            var backButton = findChild(findChild(scopesOverviewTempScopeItemHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+
+            // Check temp scope is gone
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope == null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", false);
+
+            // Press on a favorite
+            var dashCategorysearchB = findChild(searchResultsViewer, "dashCategorysearchB");
+            var cardFavSearch = findChild(dashCategorysearchB, "delegate3");
+            mouseClick(cardFavSearch, 0, 0);
+
+            // Check the dash overview is gone
+            tryCompare(overviewController, "progress", 0);
+
+            // Original list went to the favorite
+            compare(dashContentList.currentIndex, 0);
         }
 
         function test_setCurrentScope() {

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-08-06 10:16:59 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2014-08-08 14:57:17 +0000
@@ -70,7 +70,7 @@
         function loadScopes() {
             scopeLoadedSpy.clear();
             scopesModel.load();
-            tryCompare(scopeLoadedSpy, "count", 4);
+            tryCompare(scopeLoadedSpy, "count", 6);
         }
 
         function init() {
@@ -114,7 +114,8 @@
 
             loadScopes();
 
-            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);
+            compare(dashContentList.count, 6);
+            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
         }
 
         function test_show_header_on_list_movement() {
@@ -170,7 +171,7 @@
 
             // test greater than scope count.
             var currentScopeIndex = dashContent.currentIndex;
-            dashContent.setCurrentScopeAtIndex(8, true, false);
+            dashContent.setCurrentScopeAtIndex(18, true, false);
             compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
         }
 
@@ -189,9 +190,9 @@
         function test_scope_mapping_data() {
             return [
                 {tag: "index0", index: 0, objectName: "MockScope1"},
-                {tag: "index1", index: 1, objectName: "MockScope2"},
-                {tag: "index2", index: 2, objectName: "clickscope"},
-                {tag: "index3", index: 3, objectName: "MockScope5"}
+                {tag: "index1", index: 1, objectName: "clickscope"},
+                {tag: "index2", index: 2, objectName: "MockScope5"},
+                {tag: "index3", index: 3, objectName: "SingleCategoryScope"}
             ]
         }
 

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-06 19:39:30 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-08 14:57:17 +0000
@@ -61,8 +61,8 @@
             property Item header: findChild(genericScopeView, "scopePageHeader")
 
             function init() {
-                genericScopeView.scope = scopes.getScope(1)
-                shell.width = units.gu(120)
+                genericScopeView.scope = scopes.getScope(2);
+                shell.width = units.gu(120);
                 genericScopeView.categoryView.positionAtBeginning();
                 waitForRendering(genericScopeView.categoryView);
             }
@@ -88,13 +88,13 @@
 
             function test_showDash() {
                 testCase.previewListView.open = true;
-                scopes.getScope(1).showDash();
+                genericScopeView.scope.showDash();
                 tryCompare(testCase.previewListView, "open", false);
             }
 
             function test_hideDash() {
                 testCase.previewListView.open = true;
-                scopes.getScope(1).hideDash();
+                genericScopeView.scope.hideDash();
                 tryCompare(testCase.previewListView, "open", false);
             }
 
@@ -111,8 +111,9 @@
 
             function test_changeScope() {
                 genericScopeView.scope.searchQuery = "test"
-                genericScopeView.scope = scopes.getScope(2)
-                genericScopeView.scope = scopes.getScope(1)
+                var originalScopeId = genericScopeView.scope.id;
+                genericScopeView.scope = scopes.getScope(originalScopeId + 1)
+                genericScopeView.scope = scopes.getScope(originalScopeId)
                 tryCompare(genericScopeView.scope, "searchQuery", "test")
             }
 
@@ -198,6 +199,8 @@
                 openPreview(4, 0);
 
                 compare(testCase.previewListView.count, 12, "There should only be 12 items in preview.");
+
+                closePreview();
             }
 
             function test_narrow_delegate_ranges_expand() {
@@ -232,7 +235,7 @@
             }
 
             function test_single_category_expansion() {
-                genericScopeView.scope = scopes.getScope(4);
+                genericScopeView.scope = scopes.getScope(3);
 
                 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
                 var category = findChild(genericScopeView, "dashCategory0")
@@ -329,8 +332,8 @@
             function test_header_style_data() {
                 return [
                     { tag: "Default", index: 0, foreground: "grey", background: "", logo: "" },
-                    { tag: "Foreground", index: 2, foreground: "yellow", background: "", logo: "" },
-                    { tag: "Logo+Background", index: 3, foreground: "grey", background: "gradient:///lightgrey/grey",
+                    { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },
+                    { tag: "Logo+Background", index: 2, foreground: "grey", background: "gradient:///lightgrey/grey",
                       logo: Qt.resolvedUrl("../Components/tst_PageHeader/logo-ubuntu-orange.svg") },
                 ];
             }