Merge lp:~cimi/unity8/scope-settings into lp:unity8

[Andrea Cimitan]

WIP but let's jenkins build the packages

WIP but let's jenkins build the packages

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1111
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/scope-settings/+merge/229995/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/3822/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3210/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/824/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/916/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/916/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/916/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4456/console

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

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity8/scope-settings]

1112. By Andrea Cimitan on 2014-08-08

Merged dash overview

1113. By Andrea Cimitan on 2014-08-08

Remerged

1114. By Andrea Cimitan on 2014-08-09

Whitespaces

1115. By Andrea Cimitan on 2014-08-11

Add small tests

1116. By Andrea Cimitan on 2014-08-11

Added more tests

1117. By Andrea Cimitan on 2014-08-12

Merge trunk

1118. By Andrea Cimitan on 2014-08-12

Added fake settings

1119. By Andrea Cimitan on 2014-08-12

Moar fixes

1120. By Andrea Cimitan on 2014-08-12

Added tests for settings open close

1121. By Andrea Cimitan on 2014-08-13

Update ScopeSettingBoolean

1122. By Andrea Cimitan on 2014-08-14

Merge el trunko

1123. By Andrea Cimitan on 2014-08-15

Force focus properly

1124. By Andrea Cimitan on 2014-08-15

Merged horizontal list

1125. By Andrea Cimitan on 2014-08-15

Fix issue with initial count for preview

1126. By Andrea Cimitan on 2014-08-15

Should not feature overview in settings page

1127. By Andrea Cimitan on 2014-08-16

Workaround test

1128. By Andrea Cimitan on 2014-08-16

Properly fix tests

1129. By Andrea Cimitan on 2014-08-16

Better the string test too

1130. By Andrea Cimitan on 2014-08-16

Fix issue with preview in scope overview

1131. By Andrea Cimitan on 2014-08-18

[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Fix dash overview test and prevent crash in mock ApplicationInfo's
  d'tor. tryCompareFunction didn't work because .item threw.
[ Michael Terry ]
* Bring dialer to front on incoming call even when device is locked
  (LP: #1354532)
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Use palette's baseText for text colour in dash.
* Update qmltypes definitions
* Move PageHeader out of qml/Components into qml/Dash
* Reshuffle and update dependencies
* Fix cardtool test and make card creator output debugging info on
  errors.
* Support previews for scopes in overview and hook up preview
  processing to activity indicator.
* Fix notifications indicator title
* Fix horizontal list activation and add test for it.
[ Ying-Chun Liu ]
* Add button colors and i18n for power off dialog. (LP: #1354506)
[ Mirco Müller ]
* Force plain-text rendering for summary- and body-text. (LP:
  #1335787)

1132. By Andrea Cimitan on 2014-08-18

More stuff addressed

1133. By Andrea Cimitan on 2014-08-19

Fixed tests

1134. By Andrea Cimitan on 2014-08-22

[ CI bot ]
* Resync trunk
[ Nick Dedekind ]
* Fixed CachedUnityMenuModel destruction unhinging indicators. (LP:
  #1328646)
[ Mirco Müller ]
* Temporarily disable any opacity-animation for notifications to
  unblock the train due to LP: 1354406. (LP: #1354406)

1135. By Andrea Cimitan on 2014-08-25

Removed previewShown and settingsShown properties

1136. By Andrea Cimitan on 2014-08-25

More changes requested

1137. By Andrea Cimitan on 2014-08-25

More fixes

1138. By Andrea Cimitan on 2014-08-25

More changes, still doesn't work

1139. By Andrea Cimitan on 2014-08-25

More changes to review

1140. By Andrea Cimitan on 2014-08-25

Fix tests with refactor

1141. By Andrea Cimitan on 2014-08-26

Another thing addressed

1142. By Andrea Cimitan on 2014-08-26

Changes according to review

1143. By Andrea Cimitan on 2014-08-26

merged trunk

1144. By Andrea Cimitan on 2014-08-26

More changes

1145. By Andrea Cimitan on 2014-08-26

Fixed tests

1146. By Andrea Cimitan on 2014-08-26

Test initialValue

1147. By Andrea Cimitan on 2014-08-26

Other approach to test

1148. By Andrea Cimitan on 2014-08-26

New approach to test

1149. By Andrea Cimitan on 2014-08-26

merged lp:~unity-team/unity8/alt_nav_support

Unmerged revisions

1149. By Andrea Cimitan on 2014-08-26

merged lp:~unity-team/unity8/alt_nav_support

=== modified file 'data/unity8-dash.conf'
--- data/unity8-dash.conf	2014-07-29 11:35:10 +0000
+++ data/unity8-dash.conf	2014-08-08 20:44:52 +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 20:44:52 +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\
@@ -446,13 +447,13 @@
         mascotCode = kMascotImageCode.arg(anchors).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 = "";
     if (hasTitle) {
         var color;
         if (headerAsOverlay) {
-            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")';
         } else if (hasSummary) {
             color = 'summary.color';
         } else if (hasBackground) {
 
=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2014-07-25 11:42:06 +0000
+++ plugins/Dash/ScopeStyle.qml	2014-08-08 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-11 14:59+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-05 19:54+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"
@@ -26,70 +27,86 @@
 msgid "Unpin shortcut"
 msgstr "Indító feloldása"
 
+#: 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 "A bemutató kihagyása"
 
-#: qml/Components/EdgeDemo.qml:113
+#: qml/Components/EdgeDemo.qml:112
 msgid "Right edge"
 msgstr "Jobb szél"
 
-#: qml/Components/EdgeDemo.qml:114
+#: qml/Components/EdgeDemo.qml:113
 msgid "Try swiping from the right edge to unlock the phone"
 msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
 
-#: qml/Components/EdgeDemo.qml:145
+#: qml/Components/EdgeDemo.qml:144
 msgid "Top edge"
 msgstr "Felső szél"
 
-#: qml/Components/EdgeDemo.qml:146
+#: qml/Components/EdgeDemo.qml:145
 msgid "Try swiping from the top edge to access the indicators"
 msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
 
-#: qml/Components/EdgeDemo.qml:171
+#: qml/Components/EdgeDemo.qml:170
 msgid "Close"
 msgstr "Bezárás"
 
-#: qml/Components/EdgeDemo.qml:172
+#: qml/Components/EdgeDemo.qml:171
 msgid "Swipe up again to close the settings screen"
 msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
 
-#: qml/Components/EdgeDemo.qml:199
+#: qml/Components/EdgeDemo.qml:198
 msgid "Left edge"
 msgstr "Bal szél"
 
-#: qml/Components/EdgeDemo.qml:200
+#: qml/Components/EdgeDemo.qml:199
 msgid "Swipe from the left to reveal the launcher for quick access to apps"
 msgstr ""
 "Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
 "eléréséhez"
 
-#: qml/Components/EdgeDemo.qml:227
+#: qml/Components/EdgeDemo.qml:226
 msgid "Well done"
 msgstr "Rendben"
 
-#: qml/Components/EdgeDemo.qml:228
+#: qml/Components/EdgeDemo.qml:227
 msgid ""
 "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
+#: qml/Components/Lockscreen.qml:220
 msgid "Emergency Call"
 msgstr "Vészhívás"
 
-#: qml/Components/Lockscreen.qml:231
+#: qml/Components/Lockscreen.qml:243
 msgid "OK"
 msgstr "Ok"
 
-#: qml/Components/PassphraseLockscreen.qml:60
+#: qml/Components/PassphraseLockscreen.qml:62
 #, qt-format
 msgid "Hello %1"
 msgstr "Üdv %1"
 
-#: qml/Components/PassphraseLockscreen.qml:60
+#: qml/Components/PassphraseLockscreen.qml:62
 msgid "Hello"
 msgstr "Üdvözöljük"
 
@@ -105,15 +122,11 @@
 msgid "See more"
 msgstr "Több"
 
-#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
+#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:354
 msgid "See less"
 msgstr "Kevesebb"
 
-#: qml/Dash/DashApps.qml:37
-msgid "Recent"
-msgstr "Legutóbbi"
-
-#: qml/Dash/GenericScopeView.qml:330
+#: qml/Dash/GenericScopeView.qml:354
 msgid "See all"
 msgstr "Összes megtekintése"
 
@@ -137,6 +150,26 @@
 msgid "Send"
 msgstr "Küldés"
 
+#: qml/Dash/ScopesOverview.qml:187
+msgid "Manage Dash"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:392
+msgid "Done"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:418
+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 "Csúsztasson a feloldáshoz"
@@ -161,11 +194,11 @@
 msgid "Speaking..."
 msgstr "Beszéd…"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:91
+#: qml/Notifications/NotificationMenuItemFactory.qml:97
 msgid "Show password"
 msgstr "Jelszó megjelenítése"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:103
+#: qml/Notifications/NotificationMenuItemFactory.qml:112
 msgid "Please enter SIM PIN"
 msgstr "Adja meg a SIM PIN kódját"
 
@@ -177,27 +210,27 @@
 msgid "Conference"
 msgstr "Konferencia"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:583
+#: qml/Panel/Indicators/MenuItemFactory.qml:577
 msgid "In queue…"
 msgstr "Sorban…"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:587
+#: qml/Panel/Indicators/MenuItemFactory.qml:581
 msgid "Downloading"
 msgstr "Letöltés"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:589
+#: qml/Panel/Indicators/MenuItemFactory.qml:583
 msgid "Paused, tap to resume"
 msgstr "Szüneteltetve, koppintson a folytatáshoz"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:591
+#: qml/Panel/Indicators/MenuItemFactory.qml:585
 msgid "Canceled"
 msgstr "Megszakítva"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:593
+#: qml/Panel/Indicators/MenuItemFactory.qml:587
 msgid "Finished"
 msgstr "Befejeződött"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:595
+#: qml/Panel/Indicators/MenuItemFactory.qml:589
 msgid "Failed, tap to retry"
 msgstr "Sikertelen, koppintson az újrapróbáláshoz"
 
@@ -205,7 +238,10 @@
 msgid "Search"
 msgstr "Keresés"
 
-#: qml/Shell.qml:359
+#: qml/Shell.qml:256
 #, qt-format
 msgid "Please enter %1"
 msgstr "Adja meg a következőt: %1"
+
+#~ msgid "Recent"
+#~ msgstr "Legutóbbi"
 
=== modified file 'po/sl.po'
--- po/sl.po	2014-08-08 07:07:33 +0000
+++ po/sl.po	2014-08-08 20:44:52 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-11 14:59+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-05 19:54+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"
@@ -26,49 +27,65 @@
 msgid "Unpin shortcut"
 msgstr "Odpni bližnjico"
 
+#: 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 "Preskoči uvod"
 
-#: qml/Components/EdgeDemo.qml:113
+#: qml/Components/EdgeDemo.qml:112
 msgid "Right edge"
 msgstr "Desni rob"
 
-#: qml/Components/EdgeDemo.qml:114
+#: qml/Components/EdgeDemo.qml:113
 msgid "Try swiping from the right edge to unlock the phone"
 msgstr "Poskusite povleči od desnega roba za odklep telefona"
 
-#: qml/Components/EdgeDemo.qml:145
+#: qml/Components/EdgeDemo.qml:144
 msgid "Top edge"
 msgstr "Zgornji rob"
 
-#: qml/Components/EdgeDemo.qml:146
+#: qml/Components/EdgeDemo.qml:145
 msgid "Try swiping from the top edge to access the indicators"
 msgstr "Poskusite povleči od zgornjega roba za dostop do kazalnikov"
 
-#: qml/Components/EdgeDemo.qml:171
+#: qml/Components/EdgeDemo.qml:170
 msgid "Close"
 msgstr "Zapri"
 
-#: qml/Components/EdgeDemo.qml:172
+#: qml/Components/EdgeDemo.qml:171
 msgid "Swipe up again to close the settings screen"
 msgstr "Povlecite ponovno navzgor za zaprtje zaslona z nastavitvami"
 
-#: qml/Components/EdgeDemo.qml:199
+#: qml/Components/EdgeDemo.qml:198
 msgid "Left edge"
 msgstr "Levi rob"
 
-#: qml/Components/EdgeDemo.qml:200
+#: qml/Components/EdgeDemo.qml:199
 msgid "Swipe from the left to reveal the launcher for quick access to apps"
 msgstr ""
 "Poskusite povleči od leve za razkritje zaganjalnika za hiter dostop do "
 "programov"
 
-#: qml/Components/EdgeDemo.qml:227
+#: qml/Components/EdgeDemo.qml:226
 msgid "Well done"
 msgstr "Odlično"
 
-#: qml/Components/EdgeDemo.qml:228
+#: qml/Components/EdgeDemo.qml:227
 msgid ""
 "You have now mastered the edge gestures and can start using the "
 "phone<br><br>Tap on the screen to start"
@@ -76,20 +93,20 @@
 "Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
 "telefon<br><br>Tapnite na zaslon za začetek"
 
-#: qml/Components/Lockscreen.qml:214
+#: qml/Components/Lockscreen.qml:220
 msgid "Emergency Call"
 msgstr "Klic v sili"
 
-#: qml/Components/Lockscreen.qml:231
+#: qml/Components/Lockscreen.qml:243
 msgid "OK"
 msgstr "V REDU"
 
-#: qml/Components/PassphraseLockscreen.qml:60
+#: qml/Components/PassphraseLockscreen.qml:62
 #, qt-format
 msgid "Hello %1"
 msgstr "Pozdravljeni, %1"
 
-#: qml/Components/PassphraseLockscreen.qml:60
+#: qml/Components/PassphraseLockscreen.qml:62
 msgid "Hello"
 msgstr "Pozdravljeni"
 
@@ -105,15 +122,11 @@
 msgid "See more"
 msgstr "Pokaži več"
 
-#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
+#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:354
 msgid "See less"
 msgstr "Pokaži manj"
 
-#: qml/Dash/DashApps.qml:37
-msgid "Recent"
-msgstr "Nedavno"
-
-#: qml/Dash/GenericScopeView.qml:330
+#: qml/Dash/GenericScopeView.qml:354
 msgid "See all"
 msgstr "Ogled vsega"
 
@@ -137,6 +150,26 @@
 msgid "Send"
 msgstr "Pošlji"
 
+#: qml/Dash/ScopesOverview.qml:187
+msgid "Manage Dash"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:392
+msgid "Done"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:418
+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 "Podrsajte za odklenitev"
@@ -161,11 +194,11 @@
 msgid "Speaking..."
 msgstr "Govorjenje ..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:91
+#: qml/Notifications/NotificationMenuItemFactory.qml:97
 msgid "Show password"
 msgstr "Pokaži geslo"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:103
+#: qml/Notifications/NotificationMenuItemFactory.qml:112
 msgid "Please enter SIM PIN"
 msgstr "Vnesite PIN kartice SIM"
 
@@ -177,27 +210,27 @@
 msgid "Conference"
 msgstr "Konferenca"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:583
+#: qml/Panel/Indicators/MenuItemFactory.qml:577
 msgid "In queue…"
 msgstr "V vrsti ..."
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:587
+#: qml/Panel/Indicators/MenuItemFactory.qml:581
 msgid "Downloading"
 msgstr "Prejemanje"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:589
+#: qml/Panel/Indicators/MenuItemFactory.qml:583
 msgid "Paused, tap to resume"
 msgstr "Premor, tapnite za nadaljevanje"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:591
+#: qml/Panel/Indicators/MenuItemFactory.qml:585
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:593
+#: qml/Panel/Indicators/MenuItemFactory.qml:587
 msgid "Finished"
 msgstr "Končano"
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:595
+#: qml/Panel/Indicators/MenuItemFactory.qml:589
 msgid "Failed, tap to retry"
 msgstr "Spodletelo, tapnite za ponovni poskus"
 
@@ -205,7 +238,10 @@
 msgid "Search"
 msgstr "Iskanje"
 
-#: qml/Shell.qml:359
+#: qml/Shell.qml:256
 #, qt-format
 msgid "Please enter %1"
 msgstr "Vnesite %1"
+
+#~ msgid "Recent"
+#~ msgstr "Nedavno"
 
=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-07-11 14:20:12 +0000
+++ po/unity8.pot	2014-08-08 20:44:52 +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 20:44:52 +0000
@@ -24,14 +24,16 @@
 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
 
     property bool searchEntryEnabled: false
+    property bool settingsEnabled: false
     property ListModel searchHistory: SearchHistoryModel
     property alias searchQuery: searchTextField.text
+    property alias showSignatureLine: bottomBorder.visible
 
     property alias bottomItem: bottomContainer.children
     property int paginationCount: 0
@@ -44,6 +46,8 @@
 
     signal backClicked()
 
+    signal settingsClicked()
+
     onScopeStyleChanged: refreshLogo()
     onSearchQueryChanged: {
         // Make sure we are at the search page if the search query changes behind our feet
@@ -251,12 +255,20 @@
 
                     actions: [
                         Action {
+                            objectName: "search"
                             iconName: "search"
                             visible: root.searchEntryEnabled
                             onTriggered: {
                                 headerContainer.showSearch = true;
                                 searchTextField.forceActiveFocus();
                             }
+                        },
+                        Action {
+                            iconName: "settings"
+                            visible: root.settingsEnabled
+                            onTriggered: {
+                                root.settingsClicked()
+                            }
                         }
                     ]
                 }
 
=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-07-11 12:12:50 +0000
+++ qml/Components/ResponsiveGridView.qml	2014-08-08 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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,14 +33,18 @@
     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: subPageLoader.previewShown
+    readonly property alias settingsShown: subPageLoader.settingsShown
+    property int paginationCount: 0
+    property int paginationIndex: 0
+    property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}
     }
 
-    readonly property bool processing: scope ? scope.searchInProgress || previewListView.processing : false
+    readonly property bool processing: scope ? scope.searchInProgress || subPageLoader.processing : false
 
     signal backClicked()
 
@@ -53,13 +57,42 @@
     }
 
     function closePreview() {
-        previewListView.open = false;
+        subPageLoader.closeSubPage()
+    }
+
+    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;
+            subPageLoader.model = previewLimitModel;
+        } else {
+            subPageLoader.model = resultsModel;
+        }
+        subPageLoader.currentIndex = -1;
+        subPageLoader.currentIndex = index;
+        subPageLoader.subPage = "preview";
+        subPageLoader.openSubPage();
     }
 
     Binding {
         target: scope
         property: "isActive"
-        value: isCurrent && !previewListView.open
+        value: isCurrent && !subPageLoader.open
     }
 
     SortFilterProxyModel {
@@ -72,28 +105,30 @@
     }
 
     onIsCurrentChanged: {
-        pageHeader.resetSearch();
-        previewListView.open = false;
+        if (showPageHeader) {
+            pageHeaderLoader.item.resetSearch();
+        }
+        subPageLoader.closeSubPage();
     }
 
     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 {
         target: scopeView.scope
-        onShowDash: previewListView.open = false;
-        onHideDash: previewListView.open = false;
+        onShowDash: subPageLoader.closeSubPage()
+        onHideDash: subPageLoader.closeSubPage()
     }
 
     Rectangle {
@@ -106,18 +141,21 @@
         id: categoryView
         objectName: "categoryListView"
 
-        x: previewListView.open ? -width : 0
+        x: subPageLoader.open ? -width : 0
         Behavior on x { UbuntuNumberAnimation { } }
         width: parent.width
         height: parent.height
 
         model: scopeView.categories
-        forceNoClip: previewListView.open
+        forceNoClip: subPageLoader.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 +261,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 {
@@ -260,10 +289,10 @@
                                 // If the filter animation will be seen start it, otherwise, just flip the switch
                                 var shrinkingVisible = !shouldExpand && y + item.collapsedHeight + seeAll.height < categoryView.height;
                                 var growingVisible = shouldExpand && y + height < categoryView.height;
-                                if (!previewListView.open || shouldExpand) {
+                                if (!subPageLoader.open || shouldExpand) {
                                     var animate = shrinkingVisible || growingVisible;
                                     baseItem.expand(shouldExpand, animate)
-                                    if (shouldExpand && !previewListView.open) {
+                                    if (shouldExpand && !subPageLoader.open) {
                                         categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);
                                     }
                                 }
@@ -380,26 +409,41 @@
             }
         }
 
-        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
+                    settingsEnabled: scopeView.scope ? scopeView.scope.settings && scopeView.scope.settings.count > 0 : false
+                    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()
+
+                    onSettingsClicked: {
+                        subPageLoader.subPage = "settings";
+                        subPageLoader.openSubPage();
+                    }
+                }
             }
-
-            onBackClicked: scopeView.backClicked()
         }
     }
 
@@ -407,19 +451,79 @@
         id: previewLimitModel
     }
 
-    PreviewListView {
-        id: previewListView
-        objectName: "previewListView"
+    Loader {
+        id: subPageLoader
+        objectName: "subPageLoader"
         visible: x != width
-        scope: scopeView.scope
-        scopeStyle: scopeView.scopeStyle
         width: parent.width
         height: parent.height
         anchors.left: categoryView.right
 
+        property bool open: false
+        property var scope: scopeView.scope
+        property var scopeStyle: scopeView.scopeStyle
+        property int currentIndex: -1
+        property var model: null
+
+        readonly property bool processing: status === Loader.Ready && item.hasOwnProperty("processing") ? item.processing : false
+        readonly property int count: status === Loader.Ready && item.hasOwnProperty("count") ? item.count : 0
+        readonly property var currentItem: status === Loader.Ready && item.hasOwnProperty("currentItem") ? item.currentItem : false
+
+        property string subPage: ""
+        readonly property bool previewShown: open && subPage == "preview"
+        readonly property bool settingsShown: open && subPage == "settings"
+
+        function updateBindings() {
+            if (status === Loader.Ready) {
+                item.scope = Qt.binding(function() { return subPageLoader.scope } )
+                item.scopeStyle = Qt.binding(function() { return subPageLoader.scopeStyle } )
+                if (item.hasOwnProperty("open")) item.open = Qt.binding(function() { return subPageLoader.open } )
+                if (item.hasOwnProperty("currentIndex")) item.currentIndex = Qt.binding(function() { return subPageLoader.currentIndex } )
+                if (item.hasOwnProperty("model")) item.model = Qt.binding(function() { return subPageLoader.model } )
+            }
+        }
+
+        function updateSource() {
+            switch (subPage) {
+                case "preview": source = "PreviewListView.qml"; break;
+                case "settings": source = "ScopeSettingsPage.qml"; break;
+                default: source = ""; break;
+            }
+        }
+
+        function openSubPage() {
+            // FIXME adding the following check before opening makes more sense to me,
+            // but it doesn't seem to work in qmltestrunner::GenericScopeView::test_previewOpenClose()
+            // if (!visible && status === Loader.Ready), x is different to width.
+            // Let's just check status for now.
+            if (status === Loader.Ready) open = true;
+        }
+
+        function closeSubPage() {
+            open = false;
+            subPage = "";
+        }
+
+        onSubPageChanged: {
+            // let's update the source only when the loader is not visible
+            if (!visible) updateSource();
+        }
+
+        onVisibleChanged: {
+            // let's update the source only when the loader is not visible
+            if (!visible) updateSource();
+        }
+
+        onLoaded: updateBindings()
+
         onOpenChanged: {
-            pageHeader.unfocus();
+            if (open) updateBindings();
+            pageHeaderLoader.item.unfocus();
+        }
+
+        Connections {
+            target: subPageLoader.item
+            onBackClicked: subPageLoader.closeSubPage()
         }
     }
-
 }
 
=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-07-30 15:46:44 +0000
+++ qml/Dash/PreviewListView.qml	2014-08-08 20:44:52 +0000
@@ -35,6 +35,8 @@
     readonly property bool processing: currentItem && (!currentItem.previewModel.loaded
                                                        || currentItem.previewModel.processingAction)
 
+    signal backClicked()
+
     PageHeader {
         id: header
         objectName: "pageHeader"
@@ -44,7 +46,7 @@
         searchEntryEnabled: false
         scopeStyle: root.scopeStyle
 
-        onBackClicked: root.open = false
+        onBackClicked: root.backClicked()
     }
 
     ListView  {
@@ -108,7 +110,7 @@
         anchors {
             left: parent.left
             right: parent.right
-            top: pageHeader.bottom
+            top: header.bottom
             bottom: parent.bottom
         }
 
 
=== added directory 'qml/Dash/ScopeSettings'
=== added file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
--- qml/Dash/ScopeSettings/ScopeSetting.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,36 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+/*! Interface for settings widgets. */
+
+Item {
+    //! The ScopeStyle component.
+    property var scopeStyle: null
+
+    //! Variable used to contain widget's data
+    property var widgetData: null
+
+    readonly property real __margins: units.gu(2)
+
+    /*! \brief This signal should be emitted when a setting action was triggered.
+     *
+     *  \param new value
+     */
+    signal triggered(var value)
+}
 
=== added file 'qml/Dash/ScopeSettings/ScopeSettingLabel.qml'
--- qml/Dash/ScopeSettings/ScopeSettingLabel.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingLabel.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,51 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+ScopeSetting {
+    id: root
+    implicitHeight: units.gu(6)
+
+    Label {
+        anchors {
+            left: parent.left
+            leftMargin: __margins
+            right: control.left
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        text: widgetData.displayName
+        elide: Text.ElideMiddle
+        color: scopeStyle ? scopeStyle.foreground : "grey"
+    }
+
+    TextField {
+        id: control
+        anchors {
+            right: parent.right
+            rightMargin: __margins
+            verticalCenter: parent.verticalCenter
+        }
+        text: widgetData.value
+
+        onTriggered: root.triggered(text)
+        onActiveFocusChanged: {
+            if (!activeFocus) root.triggered(text);
+        }
+    }
+}
 
=== added file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
--- qml/Dash/ScopeSettings/ScopeSettingList.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+ScopeSetting {
+    id: root
+    implicitHeight: optionSelector.implicitHeight
+
+    OptionSelector {
+        id: optionSelector
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            margins: __margins
+        }
+        text: widgetData.displayName
+        model: widgetData.properties["values"]
+
+        onSelectedIndexChanged: root.triggered(selectedIndex)
+    }
+}
 
=== added file 'qml/Dash/ScopeSettings/ScopeSettingNumber.qml'
--- qml/Dash/ScopeSettings/ScopeSettingNumber.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingNumber.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+ScopeSetting {
+    id: root
+    implicitHeight: units.gu(6)
+
+    Label {
+        anchors {
+            left: parent.left
+            leftMargin: __margins
+            right: control.left
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        text: widgetData.displayName
+        elide: Text.ElideMiddle
+        color: scopeStyle ? scopeStyle.foreground : "grey"
+    }
+
+    TextField {
+        id: control
+        anchors {
+            right: parent.right
+            rightMargin: __margins
+            verticalCenter: parent.verticalCenter
+        }
+        text: widgetData.value
+        validator: DoubleValidator {}
+
+        onTriggered: root.triggered(text)
+        onActiveFocusChanged: {
+            if (!activeFocus) root.triggered(text);
+        }
+    }
+}
 
=== added file 'qml/Dash/ScopeSettings/ScopeSettingSwitch.qml'
--- qml/Dash/ScopeSettings/ScopeSettingSwitch.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingSwitch.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+ScopeSetting {
+    id: root
+    implicitHeight: units.gu(6)
+
+    Label {
+        anchors {
+            left: parent.left
+            leftMargin: __margins
+            right: control.left
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        text: widgetData.displayName
+        elide: Text.ElideMiddle
+        color: scopeStyle ? scopeStyle.foreground : "grey"
+    }
+
+    Switch {
+        id: control
+        anchors {
+            right: parent.right
+            rightMargin: __margins
+            verticalCenter: parent.verticalCenter
+        }
+        checked: widgetData.value
+
+        onTriggered: root.triggered(checked)
+    }
+}
 
=== added file 'qml/Dash/ScopeSettings/ScopeSettingWidgetFactory.qml'
--- qml/Dash/ScopeSettings/ScopeSettingWidgetFactory.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingWidgetFactory.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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.2
+
+//! \brief This component loads the widgets based on type.
+
+Loader {
+    id: root
+
+    //! The ScopeStyle component.
+    property var scopeStyle: null
+
+    //! Variable used to contain widget's data
+    property var widgetData: null
+
+    //! Triggered signal forwarded from the widgets.
+    signal triggered(var value)
+
+    source: widgetSource
+
+    //! \cond private
+    property url widgetSource: {
+        switch (widgetData.type) {
+            case "boolean": return "ScopeSettingSwitch.qml";
+            case "list": return "ScopeSettingSwitch.qml";
+            case "number": return "ScopeSettingNumber.qml";
+            case "string": return "ScopeSettingLabel.qml";
+            default: return "";
+        }
+    }
+    //! \endcond
+
+    onLoaded: {
+        item.widgetData = Qt.binding(function() { return root.widgetData } )
+    }
+
+    Connections {
+        target: root.item
+        onTriggered: root.triggered(value)
+    }
+}
 
=== added file 'qml/Dash/ScopeSettings/ScopeSettings.qml'
--- qml/Dash/ScopeSettings/ScopeSettings.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettings/ScopeSettings.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+ListView {
+    //! The ScopeStyle component.
+    property var scopeStyle: null
+
+    orientation: ListView.Vertical
+
+    delegate: ScopeSettingWidgetFactory {
+        objectName: "scopeSettingItem" + index
+        width: root.width
+        widgetData: model
+        scopeStyle: root.scopeStyle
+
+        onTriggered: model.value = value;
+    }
+}
+
 
=== added file 'qml/Dash/ScopeSettingsPage.qml'
--- qml/Dash/ScopeSettingsPage.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeSettingsPage.qml	2014-08-08 20:44:52 +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.2
+import Ubuntu.Components 1.1
+import Unity 0.2
+import "../Components"
+import "ScopeSettings"
+
+Item {
+    id: root
+
+    property var scope: null
+    property var scopeStyle: null
+
+    signal backClicked()
+
+    PageHeader {
+        id: header
+        objectName: "pageHeader"
+        width: parent.width
+        title: scope ? scope.name : ""
+        showBackButton: true
+        searchEntryEnabled: false
+        scopeStyle: root.scopeStyle || undefined
+
+        onBackClicked: root.backClicked()
+    }
+
+    ScopeSettings {
+        id: scopeSettings
+        objectName: "scopeSettings"
+        anchors {
+            top: header.bottom
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+        model: root.scope ? root.scope.settings : null
+    }
+}
 
=== added file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverview.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,533 @@
+/*
+ * 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: {
+                        pageHeader.unfocus();
+                        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.unfocus();
+                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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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_resultsmodel.cpp'
--- tests/mocks/Unity/fake_resultsmodel.cpp	2014-05-20 10:29:20 +0000
+++ tests/mocks/Unity/fake_resultsmodel.cpp	2014-08-08 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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 20:44:52 +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/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2014-07-31 13:33:56 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2014-08-08 20:44:52 +0000
@@ -89,7 +89,7 @@
                         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; 
@@ -104,7 +104,7 @@
                             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/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2014-08-08 20:44:52 +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,15 +91,16 @@
                                     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); 
@@ -112,7 +114,7 @@
                         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; 
@@ -131,7 +133,7 @@
                             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/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2014-08-05 22:51:17 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2014-08-08 20:44:52 +0000
@@ -90,7 +90,7 @@
                         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; 
@@ -104,7 +104,7 @@
                             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; 
@@ -115,8 +115,8 @@
                             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"]; 
+                            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["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 20:44:52 +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 },
 
=== added directory 'tests/qmltests/Dash/ScopeSettings'
=== added file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingSwitch.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingSwitch.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingSwitch.qml	2014-08-08 20:44:52 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 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 QtTest 1.0
+import "../../../../qml/Dash/ScopeSettings"
+import Unity.Test 0.1 as UT
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+
+    property var widgetData: {
+        "title": "THE TITLE",
+        "subtitle": "Something catchy",
+        "mascot": "../graphics/play_button.png"
+    }
+    
+}
 
=== 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 20:44:52 +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 20:44:52 +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 20:44:52 +0000
@@ -57,12 +57,12 @@
             name: "GenericScopeView"
             when: scopes.loaded && windowShown
 
-            property Item previewListView: findChild(genericScopeView, "previewListView")
+            property Item subPageLoader: findChild(genericScopeView, "subPageLoader")
             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);
             }
@@ -78,24 +78,24 @@
                 tryCompare(genericScopeView.scope, "isActive", false)
                 genericScopeView.isCurrent = true
                 tryCompare(genericScopeView.scope, "isActive", true)
-                testCase.previewListView.open = true
+                testCase.subPageLoader.open = true
                 tryCompare(genericScopeView.scope, "isActive", false)
-                testCase.previewListView.open = false
+                testCase.subPageLoader.open = false
                 tryCompare(genericScopeView.scope, "isActive", true)
                 genericScopeView.isCurrent = false
                 tryCompare(genericScopeView.scope, "isActive", false)
             }
 
             function test_showDash() {
-                testCase.previewListView.open = true;
-                scopes.getScope(1).showDash();
-                tryCompare(testCase.previewListView, "open", false);
+                testCase.subPageLoader.open = true;
+                genericScopeView.scope.showDash();
+                tryCompare(testCase.subPageLoader, "open", false);
             }
 
             function test_hideDash() {
-                testCase.previewListView.open = true;
-                scopes.getScope(1).hideDash();
-                tryCompare(testCase.previewListView, "open", false);
+                testCase.subPageLoader.open = true;
+                genericScopeView.scope.hideDash();
+                tryCompare(testCase.subPageLoader, "open", false);
             }
 
             function test_searchQuery() {
@@ -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")
             }
 
@@ -197,7 +198,9 @@
 
                 openPreview(4, 0);
 
-                compare(testCase.previewListView.count, 12, "There should only be 12 items in preview.");
+                compare(testCase.subPageLoader.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")
@@ -258,19 +261,19 @@
                                     true);
                 var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);
                 mouseClick(tile, tile.width / 2, tile.height / 2);
-                tryCompare(testCase.previewListView, "open", true);
-                tryCompare(testCase.previewListView, "x", 0);
+                tryCompare(testCase.subPageLoader, "open", true);
+                tryCompare(testCase.subPageLoader, "x", 0);
             }
 
             function closePreview() {
-                var closePreviewMouseArea = findChild(genericScopeView, "innerPageHeader");
+                var closePreviewMouseArea = findChild(subPageLoader.item, "pageHeader");
                 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
 
-                tryCompare(testCase.previewListView, "open", false);
+                tryCompare(testCase.subPageLoader, "open", false);
             }
 
             function test_previewOpenClose() {
-                tryCompare(testCase.previewListView, "open", false);
+                tryCompare(testCase.subPageLoader, "open", false);
 
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 categoryListView.positionAtBeginning();
@@ -290,15 +293,15 @@
                                     },
                                     true);
 
-                tryCompare(testCase.previewListView, "open", false);
+                tryCompare(testCase.subPageLoader, "open", false);
 
                 var dashCategory1 = findChild(genericScopeView, "dashCategory1");
                 var tile = findChild(dashCategory1, "carouselDelegate1");
                 mouseClick(tile, tile.width / 2, tile.height / 2);
                 tryCompare(tile, "explicitlyScaled", true);
                 mouseClick(tile, tile.width / 2, tile.height / 2);
-                tryCompare(testCase.previewListView, "open", true);
-                tryCompare(testCase.previewListView, "x", 0);
+                tryCompare(testCase.subPageLoader, "open", true);
+                tryCompare(testCase.subPageLoader, "x", 0);
 
                 closePreview();
             }
@@ -307,21 +310,20 @@
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 categoryListView.positionAtBeginning();
 
-                tryCompare(testCase.previewListView, "open", false);
-                var previewListViewList = findChild(previewListView, "listView");
+                tryCompare(testCase.subPageLoader, "open", false);
 
                 openPreview();
+                var previewListViewList = findChild(subPageLoader.item, "listView");
 
                 // flick to the next previews
-                tryCompare(testCase.previewListView, "count", 15);
-                for (var i = 1; i < testCase.previewListView.count; ++i) {
-                    mouseFlick(testCase.previewListView, testCase.previewListView.width - units.gu(1),
-                                                testCase.previewListView.height / 2,
+                tryCompare(testCase.subPageLoader, "count", 15);
+                for (var i = 1; i < testCase.subPageLoader.count; ++i) {
+                    mouseFlick(testCase.subPageLoader.item, testCase.subPageLoader.width - units.gu(1),
+                                                testCase.subPageLoader.height / 2,
                                                 units.gu(2),
-                                                testCase.previewListView.height / 2);
+                                                testCase.subPageLoader.height / 2);
                     tryCompare(previewListViewList, "moving", false);
-                    tryCompare(testCase.previewListView.currentItem, "objectName", "preview" + i);
-
+                    tryCompare(testCase.subPageLoader.currentItem, "objectName", "preview" + i);
                 }
                 closePreview();
             }
@@ -329,8 +331,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") },
                 ];
             }