Merge lp:~lukas-kde/unity8/dashboard into lp:unity8

[Lukáš Tinkl]

WIP: Unity 8 Dashboard prototype & playground

[lp:~lukas-kde/unity8/dashboard]

2776. By Lukáš Tinkl on 2017-01-20

implement a stub dashboard location edit view

turn the button bar into a state machine

2777. By Lukáš Tinkl on 2017-01-20

a more complete location/locale editor

2778. By Lukáš Tinkl on 2017-01-23

add location support, more sensible Back btn behavior

2779. By Lukáš Tinkl on 2017-01-23

updates to the location/locale page

2780. By Lukáš Tinkl on 2017-01-24

move the height randomization into the model so that it doesn't shuffle too much

2781. By Lukáš Tinkl on 2017-01-26

merge trunk, fix conflicts

2782. By Lukáš Tinkl on 2017-01-31

put u8-dash mostly back

2783. By Lukáš Tinkl on 2017-01-31

make dash non-special

2784. By Lukáš Tinkl on 2017-02-10

WIP undoable closing

2785. By Lukáš Tinkl on 2017-02-10

merge trunk

Unmerged revisions

2785. By Lukáš Tinkl on 2017-02-10

merge trunk

2784. By Lukáš Tinkl on 2017-02-10

WIP undoable closing

2783. By Lukáš Tinkl on 2017-01-31

make dash non-special

2782. By Lukáš Tinkl on 2017-01-31

put u8-dash mostly back

2781. By Lukáš Tinkl on 2017-01-26

merge trunk, fix conflicts

2780. By Lukáš Tinkl on 2017-01-24

move the height randomization into the model so that it doesn't shuffle too much

2779. By Lukáš Tinkl on 2017-01-23

updates to the location/locale page

2778. By Lukáš Tinkl on 2017-01-23

add location support, more sensible Back btn behavior

2777. By Lukáš Tinkl on 2017-01-20

a more complete location/locale editor

2776. By Lukáš Tinkl on 2017-01-20

implement a stub dashboard location edit view

turn the button bar into a state machine

=== modified file 'plugins/Dash/abstractdashview.cpp'
--- plugins/Dash/abstractdashview.cpp	2016-12-23 11:04:53 +0000
+++ plugins/Dash/abstractdashview.cpp	2017-02-10 14:04:06 +0000
@@ -301,7 +301,7 @@
 
         // The current AbstractDashViews do not support insertions that are not at the end
         // so reset if that happens
-        Q_FOREACH(const QQmlChangeSet::Change insert, changeSet.inserts()) {
+        Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {
             if (insert.index < m_delegateModel->count() - 1) {
                 cleanupExistingItems();
                 break;

=== modified file 'plugins/Dash/abstractdashview.h'
--- plugins/Dash/abstractdashview.h	2016-11-28 09:57:06 +0000
+++ plugins/Dash/abstractdashview.h	2017-02-10 14:04:06 +0000
@@ -79,8 +79,8 @@
     void displayMarginBeginningChanged();
     void displayMarginEndChanged();
 
-protected Q_SLOTS:
-    void relayout();
+public Q_SLOTS:
+    Q_INVOKABLE void relayout();
 
 protected:
     void updatePolish() override;

=== modified file 'plugins/Dash/verticaljournal.cpp'
--- plugins/Dash/verticaljournal.cpp	2016-11-28 09:57:06 +0000
+++ plugins/Dash/verticaljournal.cpp	2017-02-10 14:04:06 +0000
@@ -34,6 +34,7 @@
 VerticalJournal::VerticalJournal()
  : m_columnWidth(0)
 {
+    setFlag(ItemAcceptsDrops);
 }
 
 qreal VerticalJournal::columnWidth() const
@@ -49,7 +50,7 @@
 
         if (isComponentComplete()) {
             Q_FOREACH(const auto &column, m_columnVisibleItems) {
-                Q_FOREACH(const ViewItem item, column) {
+                Q_FOREACH(const ViewItem &item, column) {
                     item.m_item->setWidth(columnWidth);
                 }
             }
@@ -65,7 +66,7 @@
 
     Q_FOREACH(const auto &column, m_columnVisibleItems) {
         if (!column.isEmpty()) {
-            const ViewItem &item = column.last();
+            const ViewItem &item = column.constLast();
             *yPos = qMin(*yPos, item.y() + item.height() + rowSpacing());
             *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);
         } else {
@@ -82,9 +83,9 @@
 
     // Find the topmost free column
     for (int i = 0; i < m_columnVisibleItems.count(); ++i) {
-        const auto &column = m_columnVisibleItems[i];
+        const auto &column = m_columnVisibleItems.at(i);
         if (!column.isEmpty()) {
-            const ViewItem &item = column.first();
+            const ViewItem &item = column.constFirst();
             const auto itemTopPos = item.y() - rowSpacing();
             if (itemTopPos > *yPos) {
                 *yPos = itemTopPos;
@@ -113,12 +114,12 @@
 
     for (int i = 0; i < m_columnVisibleItems.count(); ++i) {
         QList<ViewItem> &column = m_columnVisibleItems[i];
-        while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFromY) {
+        while (!column.isEmpty() && column.constFirst().y() + column.constFirst().height() < bufferFromY) {
             releaseItem(column.takeFirst().m_item);
             changed = true;
         }
 
-        while (!column.isEmpty() && column.last().y() > bufferToY) {
+        while (!column.isEmpty() && column.constLast().y() > bufferToY) {
             releaseItem(column.takeLast().m_item);
             changed = true;
         }
@@ -135,20 +136,20 @@
     }
 
     // Check if we add it to the bottom of existing column items
-    const QList<ViewItem> &firstColumn = m_columnVisibleItems[0];
-    qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.last().y() + firstColumn.last().height() : -rowSpacing();
+    const QList<ViewItem> &firstColumn = m_columnVisibleItems.constFirst();
+    qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.constLast().y() + firstColumn.constLast().height() : -rowSpacing();
     int columnToAddTo = 0;
     for (int i = 1; i < m_columnVisibleItems.count(); ++i) {
-        const QList<ViewItem> &column = m_columnVisibleItems[i];
-        const qreal iY = !column.isEmpty() ? column.last().y() + column.last().height() : -rowSpacing();
+        const QList<ViewItem> &column = m_columnVisibleItems.at(i);
+        const qreal iY = !column.isEmpty() ? column.constLast().y() + column.constLast().height() : -rowSpacing();
         if (iY < columnToAddY) {
             columnToAddTo = i;
             columnToAddY = iY;
         }
     }
 
-    const QList<ViewItem> &columnToAdd = m_columnVisibleItems[columnToAddTo];
-    if (columnToAdd.isEmpty() || columnToAdd.last().m_modelIndex < modelIndex) {
+    const QList<ViewItem> &columnToAdd = m_columnVisibleItems.at(columnToAddTo);
+    if (columnToAdd.isEmpty() || columnToAdd.constLast().m_modelIndex < modelIndex) {
         item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));
         item->setY(columnToAddY + rowSpacing());
 
@@ -157,7 +158,7 @@
     } else {
         Q_ASSERT(m_indexColumnMap.contains(modelIndex));
         columnToAddTo = m_indexColumnMap[modelIndex];
-        columnToAddY = m_columnVisibleItems[columnToAddTo].first().y();
+        columnToAddY = m_columnVisibleItems[columnToAddTo].constFirst().y();
 
         item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));
         item->setY(columnToAddY - rowSpacing() - item->height());
@@ -171,7 +172,7 @@
     // Cleanup the existing items
     for (int i = 0; i < m_columnVisibleItems.count(); ++i) {
         QList<ViewItem> &column = m_columnVisibleItems[i];
-        Q_FOREACH(const ViewItem item, column)
+        Q_FOREACH(const ViewItem &item, column)
             releaseItem(item.m_item);
         column.clear();
     }
@@ -185,7 +186,7 @@
     qreal bottomMostY = 0;
     Q_FOREACH(const auto &column, m_columnVisibleItems) {
         if (!column.isEmpty()) {
-            const ViewItem &item = column.last();
+            const ViewItem &item = column.constLast();
             lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);
             bottomMostY = qMax(bottomMostY, item.y() + item.height());
         }
@@ -216,11 +217,11 @@
     // all since we can't consistently relayout without the first item being there
 
     if (!allItems.isEmpty()) {
-        if (allItems.first().m_modelIndex == 0) {
-            Q_FOREACH(const ViewItem item, allItems)
+        if (allItems.constFirst().m_modelIndex == 0) {
+            Q_FOREACH(const ViewItem &item, allItems)
                 addItemToView(item.m_modelIndex, item.m_item);
         } else {
-            Q_FOREACH(const ViewItem item, allItems)
+            Q_FOREACH(const ViewItem &item, allItems)
                 releaseItem(item.m_item);
         }
     }
@@ -229,7 +230,7 @@
 void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
 {
     Q_FOREACH(const auto &column, m_columnVisibleItems) {
-        Q_FOREACH(const ViewItem item, column) {
+        Q_FOREACH(const ViewItem &item, column) {
             const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;
             QQuickItemPrivate::get(item.m_item)->setCulled(cull);
         }
@@ -238,7 +239,7 @@
 
 void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
 {
-    Q_FOREACH(const QQmlChangeSet::Change remove, removes) {
+    Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
         for (int i = remove.count - 1; i >= 0; --i) {
             const int indexToRemove = remove.index + i;
             // Since we only support removing from the end, indexToRemove
@@ -250,7 +251,7 @@
             for (int i = 0; !found && i < m_columnVisibleItems.count(); ++i) {
                 QList<ViewItem> &column = m_columnVisibleItems[i];
                 if (!column.isEmpty()) {
-                    const int lastColumnIndex = column.last().m_modelIndex;
+                    const int lastColumnIndex = column.constLast().m_modelIndex;
                     if (lastColumnIndex == indexToRemove) {
                         releaseItem(column.takeLast().m_item);
                         found = true;

=== modified file 'plugins/Utils/globalfunctions.cpp'
--- plugins/Utils/globalfunctions.cpp	2016-12-07 13:47:15 +0000
+++ plugins/Utils/globalfunctions.cpp	2017-02-10 14:04:06 +0000
@@ -38,13 +38,13 @@
                 && child->width() >= point.x()
                 && point.y() >= 0
                 && child->height() >= point.y()) {
-            if (!matcher.isCallable()) return child;
+            if (matcher.isUndefined() || !matcher.isCallable()) return child;
 
             QQmlEngine* engine = qmlEngine(child);
             if (!engine) return child;
 
             QJSValue newObj = engine->newQObject(child);
-            if (matcher.call(QJSValueList() << newObj).toBool()) {
+            if (matcher.call({newObj}).toBool()) {
                 return child;
             }
         }

=== modified file 'plugins/Utils/globalfunctions.h'
--- plugins/Utils/globalfunctions.h	2016-10-14 11:04:20 +0000
+++ plugins/Utils/globalfunctions.h	2017-02-10 14:04:06 +0000
@@ -36,7 +36,7 @@
     static Q_INVOKABLE QQuickItem* itemAt(QQuickItem* parent,
                                           int x,
                                           int y,
-                                          QJSValue matcher);
+                                          QJSValue matcher = QJSValue(QJSValue::UndefinedValue));
 
     static Q_INVOKABLE bool itemUnderMouse(QQuickItem* item);
 };

=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2015-07-15 15:07:19 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2017-02-10 14:04:06 +0000
@@ -51,6 +51,8 @@
     property real displayMarginBeginning: 0
     property real displayMarginEnd: 0
 
+    readonly property alias view: verticalJournalView
+
     implicitHeight: verticalJournalView.implicitHeight + rowSpacing
     clip: height < implicitHeight
 
@@ -75,7 +77,7 @@
         columnSpacing: {
             // parent.width = columns * columnWidth + (columns-1) * spacing + spacing(margins)
             var expectedColumns = Math.max(1, Math.floor(parent.width / (columnWidth + minimumColumnSpacing)));
-            Math.floor((parent.width - expectedColumns * columnWidth) / expectedColumns);
+            return Math.floor((parent.width - expectedColumns * columnWidth) / expectedColumns);
         }
     }
 }

=== added file 'qml/Dash/Autoscroller.qml'
--- qml/Dash/Autoscroller.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Autoscroller.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2017 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.4
+
+Item {
+    id: autoscroller
+
+    property bool dragging: false
+    property var dragItem: new Object();
+    property var flickable
+
+    function autoscroll(dragging, dragItem) {
+        if (dragging) {
+            autoscroller.dragItem = dragItem;
+            autoscroller.dragging = true;
+        } else {
+            autoscroller.dragItem = null;
+            autoscroller.dragging = false;
+        }
+    }
+
+    readonly property real bottomBoundary: {
+        var contentHeight = flickable.contentHeight
+        var contentY = flickable.contentY
+        var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
+        var heightRatio = flickable.visibleArea.heightRatio
+
+        if (!dragItem) {
+            return true;
+        } else {
+            return (heightRatio * contentHeight) -
+                   (1.5 * dragItemHeight) + contentY
+        }
+    }
+
+    readonly property int delayMs: 32
+    readonly property real topBoundary: dragItem ? flickable.contentY + (.5 * dragItem.height) : 0
+
+    visible: false
+    readonly property real maxStep: units.dp(10)
+    function stepSize(scrollingUp) {
+        var delta, step;
+        if (scrollingUp) {
+            delta = dragItem.y - topBoundary;
+            delta /= (1.5 * dragItem.height);
+        } else {
+            delta = dragItem.y - bottomBoundary;
+            delta /= (1.5 * dragItem.height);
+        }
+
+        step = Math.abs(delta) * autoscroller.maxStep
+        return Math.ceil(step);
+    }
+
+    Timer {
+        interval: autoscroller.delayMs
+        running: autoscroller.dragItem ? (autoscroller.dragging &&
+            autoscroller.dragItem.y < autoscroller.topBoundary &&
+            !flickable.atYBeginning) : false
+        repeat: true
+        onTriggered: {
+            flickable.contentY -= autoscroller.stepSize(true);
+            autoscroller.dragItem.y -= autoscroller.stepSize(true);
+        }
+    }
+
+    Timer {
+        interval: autoscroller.delayMs
+        running: autoscroller.dragItem ? (autoscroller.dragging &&
+            autoscroller.dragItem.y >= autoscroller.bottomBoundary &&
+            !autoscroller.flickable.atYEnd) : false
+        repeat: true
+        onTriggered: {
+            flickable.contentY += autoscroller.stepSize(false);
+            autoscroller.dragItem.y += autoscroller.stepSize(false);
+        }
+    }
+}

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2016-09-02 15:38:15 +0000
+++ qml/Dash/Dash.qml	2017-02-10 14:04:06 +0000
@@ -262,7 +262,7 @@
             bottomMargin: Qt.inputMethod.keyboardRectangle.height
         }
         height: units.dp(3)
-        color: scopeStyle.backgroundLuminance > 0.7 ? "#50000000" : "#50ffffff"
+        color: scopeItem.scopeStyle.backgroundLuminance > 0.7 ? "#50000000" : "#50ffffff"
         opacity: 0
         visible: opacity > 0
 

=== added directory 'qml/Dash/Dashboard'
=== added file 'qml/Dash/Dashboard/Dashboard.qml'
--- qml/Dash/Dashboard/Dashboard.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Dashboard/Dashboard.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 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.4
+import Ubuntu.Components 1.3
+import "../../Components"
+
+Showable {
+    id: root
+
+    // This is a bool instead of an alias because Loader classes like to emit
+    // changed signals for 'active' during startup even if they aren't actually
+    // changing values. Having it cached as a proper Qml bool property prevents
+    // unnecessary 'changed' emissions and provides consuming classes the
+    // expected behavior of no emission on startup.
+    readonly property bool active: loader.active
+
+    property int columnCount: 3
+
+    hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
+
+    onRequiredChanged: {
+        if (!required) {
+            available = false;
+        }
+    }
+
+    Loader {
+        id: loader
+        anchors.fill: parent
+        active: available
+        source: "DashboardView.qml"
+    }
+
+    Binding {
+        target: loader.item
+        property: "columnCount"
+        value: root.columnCount
+        when: root.active
+    }
+}

=== added file 'qml/Dash/Dashboard/DashboardDelegate.qml'
--- qml/Dash/Dashboard/DashboardDelegate.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Dashboard/DashboardDelegate.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2017 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.4
+import Ubuntu.Components 1.3
+import "../../Notifications"
+import ".."
+
+Item {
+    id: root
+    objectName: "dashboardDelegate" + index
+
+    // read-write API
+    property bool editMode: false
+    property bool shouldClose: false
+
+    // readonly API
+    readonly property int visualIndex: index
+
+    scale: editMode ? 0.95 : 1
+    Behavior on scale { UbuntuNumberAnimation {} }
+
+    Drag.keys: "unity8-dashboard"
+    Drag.active: mouseArea.drag.active
+    Drag.hotSpot.x: width/2
+    Drag.hotSpot.y: height/2
+    Drag.proposedAction: Qt.MoveAction
+
+    signal itemDragging(bool dragging, var dragItem)
+    signal close()
+    signal undoClose()
+
+    Rectangle {
+        anchors.fill: parent
+        radius: units.gu(.5)
+        color: UbuntuColors.jet
+        opacity: editMode ? 0.15 : 0.1
+        Behavior on opacity { UbuntuNumberAnimation {} }
+    }
+
+    Label {
+        id: label
+        anchors.fill: parent
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+
+        text: model.name + " (" + index + ")" + (model.content ? "\n" + eval(model.content) : "")
+        color: model.headerColor ? model.headerColor : "white"
+    }
+
+    MouseArea {
+        id: mouseArea
+        enabled: editMode
+        anchors.fill: parent
+        cursorShape: drag.active ? Qt.DragMoveCursor : undefined
+
+        drag.target: parent
+
+        drag.onActiveChanged: {
+            itemDragging(drag.active, root);
+        }
+
+        onReleased: {
+            if (drag.active) {
+                var result = parent.Drag.drop();
+                if (result) {
+                    print("Drop accepted");
+                } else {
+                    print("Drop rejected");
+                }
+            }
+        }
+    }
+
+    Timer {
+        running: model.ttl
+        repeat: running
+        interval: running ? model.ttl : 0
+        onTriggered: label.text = eval(model.content);
+    }
+
+    NotificationButton { // FIXME make this a generic component
+        objectName: "closeButton"
+        width: units.gu(3)
+        height: width
+        radius: width / 2
+        visible: opacity > 0
+        enabled: editMode
+        opacity: enabled ? 1 : 0
+        iconName: root.shouldClose ? "add" : "close"
+        outline: false
+        hoverEnabled: true
+        color: root.shouldClose ? theme.palette.normal.positive : theme.palette.normal.negative
+        anchors.horizontalCenter: parent.left
+        anchors.horizontalCenterOffset: width/4
+        anchors.verticalCenter: parent.top
+        anchors.verticalCenterOffset: height/4
+
+        onClicked: root.shouldClose ? undoClose() : close()
+
+        Behavior on opacity { UbuntuNumberAnimation {} }
+    }
+}

=== added file 'qml/Dash/Dashboard/DashboardView.qml'
--- qml/Dash/Dashboard/DashboardView.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Dashboard/DashboardView.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2017 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.4
+import QtQuick.Layouts 1.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+import "../../Components"
+import ".."
+
+StyledItem {
+    id: root
+    objectName: "dashboard"
+
+    property bool editMode: false
+    property int columnCount: 3
+
+    readonly property int leftMargin: units.gu(3)
+    readonly property int topMargin: units.gu(3)
+    readonly property int contentSpacing: units.gu(1)
+
+    theme: ThemeSettings {
+        name: "Ubuntu.Components.Themes.Ambiance"
+    }
+
+    ListModel {
+        id: fakeModel
+        ListElement { name: "Weather"; headerColor: "yellow" }
+        ListElement { name: "BBC News"; headerColor: "red"  }
+        ListElement { name: "Fitbit"; headerColor: "teal"  }
+        ListElement { name: "The Guardian"; headerColor: "blue"  }
+        ListElement { name: "Telegram"; headerColor: "navy"  }
+        ListElement { name: "Clock"; content: "Qt.formatTime(new Date())"; ttl: 1000 }
+        ListElement { name: "G" }
+        ListElement { name: "H" }
+        ListElement { name: "I" }
+        ListElement { name: "J" }
+        ListElement { name: "K" }
+        ListElement { name: "L" }
+        ListElement { name: "M" }
+        ListElement { name: "N" }
+        ListElement { name: "O" }
+        ListElement { name: "P" }
+        ListElement { name: "Q" }
+        ListElement { name: "R" }
+        ListElement { name: "S" }
+        ListElement { name: "T" }
+        ListElement { name: "U" }
+
+        Component.onCompleted: { // set random heights
+            for (var i = 0; i < count; i++) {
+                setProperty(i, "height", Math.max(units.gu(8), Math.floor(Math.random() * 300)));
+            }
+        }
+    }
+
+    Component {
+        id: dashboardViewContentsComponent
+        DashboardViewContents {
+            model: fakeModel
+            editMode: root.editMode
+            columnCount: root.columnCount
+            contentSpacing: root.contentSpacing
+        }
+    }
+
+    Component {
+        id: dashboardViewLocationComponent
+        DashboardViewLocation {
+            contentSpacing: root.contentSpacing
+        }
+    }
+
+    Loader {
+        id: loader
+        active: true
+        asynchronous: true
+        visible: status === Loader.Ready
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: buttonBar.top
+            right: parent.right
+            leftMargin: root.leftMargin
+            rightMargin: root.leftMargin
+            topMargin: root.topMargin
+            bottomMargin: root.contentSpacing
+        }
+    }
+
+    RowLayout {
+        id: buttonBar
+        spacing: root.contentSpacing
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            leftMargin: root.leftMargin
+            rightMargin: root.leftMargin
+            topMargin: root.contentSpacing
+            bottomMargin: root.contentSpacing
+        }
+
+        Item { // horizontal spacer
+            Layout.fillWidth: true
+        }
+
+        Button {
+            id: btnSources
+            text: i18n.tr("Add sources")
+            onClicked: {
+                root.state = "edit";
+                // TODO launch Manage dashboard/scopes inside unity8-dash
+            }
+        }
+
+        Button {
+            id: btnEditApply
+        }
+    }
+
+    state: "dashboard"
+    states: [
+        State {
+            name: "dashboard"
+            when: !root.editMode
+            PropertyChanges { target: loader; sourceComponent: dashboardViewContentsComponent }
+            PropertyChanges { target: btnEditApply; text: i18n.tr("Edit"); onClicked: root.editMode = true; }
+            PropertyChanges { target: btnSources; visible: false }
+        },
+        State {
+            name: "edit"
+            extend: "dashboard"
+            when: root.editMode
+            PropertyChanges { target: btnEditApply; text: i18n.tr("Apply changes");
+                onClicked: {
+                    var toClose = loader.item.indexesToClose;
+                    print("!!! To close:", toClose);
+                    if (toClose.length > 0) {
+                        toClose.sort(function(a, b) { // sort numerically in descending order
+                            return b - a;
+                        });
+                        print("!!! To close sorted:", toClose);
+
+                        toClose.forEach(function(index) {
+                            print("Closing", index);
+                            loader.item.model.remove(index, 1);
+                        });
+                    }
+                    root.editMode = false;
+                    loader.item.indexesToClose = [];
+                }
+            }
+            PropertyChanges { target: btnSources; visible: true }
+        }
+    ]
+}

=== added file 'qml/Dash/Dashboard/DashboardViewContents.qml'
--- qml/Dash/Dashboard/DashboardViewContents.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Dashboard/DashboardViewContents.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 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.4
+import Ubuntu.Components 1.3
+import Utils 0.1
+import "../../Components"
+import ".."
+import "../../Components/flickableUtils.js" as FlickableUtilsJS
+
+ScrollView {
+    id: contents
+    objectName: "DashboardViewContents"
+
+    // write API
+    property alias model: journal.model
+    property bool editMode: false
+    property int columnCount: 3
+    property int contentSpacing
+
+    // read-write API
+    property var indexesToClose: []
+
+    flickableItem {
+        flickableDirection: Flickable.VerticalFlick
+        flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
+        maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
+        boundsBehavior: Flickable.StopAtBounds
+    }
+    horizontalScrollbar.enabled: false
+
+    Autoscroller {
+        id: autoscroller
+        flickable: contents.flickableItem
+    }
+
+    DropArea {
+        id: dropArea
+        anchors.fill: parent
+        keys: "unity8-dashboard"
+
+        onDropped: {
+            var fromIndex = drop.source.visualIndex;
+            print("Drop from:", drop.source, ", index:", fromIndex);
+            
+            function matchDelegate(obj) { return String(obj.objectName).indexOf("dashboardDelegate") >= 0 &&
+                                          obj.objectName !== drag.source.objectName; }
+            var delegateAtCenter = Functions.itemAt(journal.view, drop.x, drop.y, matchDelegate);
+            
+            if (!delegateAtCenter) {
+                print("Invalid drop, bailing out");
+                journal.view.relayout();
+                return;
+            }
+            
+            var toIndex = delegateAtCenter.visualIndex;
+            print("Dropped on", delegateAtCenter, ", index:", toIndex);
+            
+            if (delegateAtCenter) {
+                journal.model.move(fromIndex, toIndex, 1);
+
+                Array.prototype.move = function (old_index, new_index) {
+                    if (new_index >= this.length) {
+                        var k = new_index - this.length;
+                        while ((k--) + 1) {
+                            this.push(undefined);
+                        }
+                    }
+                    this.splice(new_index, 0, this.splice(old_index, 1)[0]);
+                    return this; // for testing purposes
+                };
+                indexesToClose.move(fromIndex, toIndex);
+
+                drop.acceptProposedAction();
+            }
+        }
+    }
+
+    ResponsiveVerticalJournal {
+        id: journal
+        width: contents.width
+        
+        rowSpacing: contents.contentSpacing
+        minimumColumnSpacing: contents.contentSpacing
+        columnWidth: (contents.width - root.leftMargin*2 - contents.verticalScrollbar.width) / contents.columnCount
+
+        delegate: DashboardDelegate {
+            editMode: contents.editMode
+            shouldClose: indexesToClose.indexOf(index) !== -1
+            width: parent.columnWidth
+            height: model.height
+
+            onClose: {
+                print("Closing index:", index);
+                indexesToClose.push(index);
+                shouldClose = true;
+            }
+            onUndoClose: {
+                print("Undoing close:", index);
+                indexesToClose.splice(indexesToClose.indexOf(index), 1);
+                shouldClose = false;
+            }
+
+            onItemDragging: autoscroller.autoscroll(dragging, dragItem)
+        }
+    }
+}

=== added file 'qml/Dash/Dashboard/DashboardViewLocation.qml'
--- qml/Dash/Dashboard/DashboardViewLocation.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Dashboard/DashboardViewLocation.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2017 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.4
+import QtPositioning 5.6
+import QtLocation 5.6
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.SystemSettings.LanguagePlugin 1.0
+
+Column {
+    id: root
+    objectName: "DashboardViewLocation"
+    spacing: root.contentSpacing
+
+    // write API
+    property int contentSpacing
+
+    // read API
+    readonly property string currentLanguage: langPlugin.languageCodes[langListView.currentIndex] // locale code
+    readonly property var location: src.position.coordinate // QtPositioning.coordinate
+
+    UbuntuLanguagePlugin {
+        id: langPlugin
+    }
+
+    Plugin {
+        id: osmPlugin
+        name: "osm"
+        PluginParameter { name: "osm.useragent"; value: "Unity 8 Dashboard" }
+    }
+
+    GeocodeModel {
+        id: geo
+        autoUpdate: false
+        plugin: osmPlugin
+        query: src.position.coordinate.isValid ? src.position.coordinate : undefined
+        onStatusChanged: {
+            print("Reverse geocoder status changed:", status)
+            if (status === GeocodeModel.Ready) {
+                print("Ready, results:", count)
+            } else if (status === GeocodeModel.Error) {
+                console.error("Reverse geocoder error:", errorString, error);
+            }
+        }
+        onLocationsChanged: {
+            if (count > 0) {
+                var address = get(0).address;
+                print("LOCATION:", address.text)
+                var parts = [address.district, address.city, address.state, address.country]
+                locationEdit.text = parts.filter(Boolean).join(", ");
+            }
+        }
+    }
+
+    PositionSource {
+        id: src
+        active: false
+
+        onPositionChanged: {
+            var coord = position.coordinate;
+            console.log("Coordinate:", coord, "(", coord.latitude, coord.longitude, ")");
+            geo.update();
+        }
+    }
+
+    Component.onCompleted: {
+        if (src.valid) {
+            src.update(); // Request a single update of the position
+        } else {
+            console.warn("No supported positioning methods")
+        }
+    }
+
+    Label {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        text: i18n.tr("Location and language")
+        textSize: Label.Large
+        wrapMode: Label.WordWrap
+        maximumLineCount: 2
+        color: "white"
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        spacing: root.contentSpacing
+
+        Image {
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: units.gu(15)
+            height: width
+            source: "image://theme/language-chooser"
+        }
+
+        TextField {
+            id: locationEdit
+            enabled: !checkbox.checked
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            placeholderText: i18n.tr("Select your location")
+            primaryItem: Icon {
+                name: "location-active"
+                height: parent.height * 0.7
+                width: height
+            }
+            secondaryItem: Icon {
+                name: "reset"
+                height: parent.height * 0.7
+                width: height
+                visible: src.valid
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: src.update();
+                }
+            }
+        }
+
+        ComboButton {
+            id: langCombo
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            text: langPlugin.languageNames[langListView.currentIndex]
+            ListView {
+                id: langListView
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                model: langPlugin.languageNames
+                currentIndex: langPlugin.currentLanguage
+                delegate: Standard {
+                    highlightWhenPressed: false
+                    __foregroundColor: UbuntuColors.jet
+                    text: modelData
+                    onClicked: {
+                        langListView.currentIndex = index;
+                        langCombo.expanded = false;
+                    }
+                }
+            }
+            onClicked: expanded = !expanded
+        }
+
+        Item {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: childrenRect.height
+            CheckBox {
+                id: checkbox
+                anchors.left: parent.left
+            }
+            Label {
+                anchors {
+                    left: checkbox.right
+                    right: parent.right
+                    leftMargin: root.contentSpacing
+                }
+                text: i18n.tr("Do not allow Scopes to use your location and language")
+                wrapMode: Label.WordWrap
+                maximumLineCount: 2
+                color: "white"
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: checkbox.trigger()
+                }
+            }
+        }
+    }
+}

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2016-12-01 23:26:45 +0000
+++ qml/Dash/ScopesList.qml	2017-02-10 14:04:06 +0000
@@ -37,92 +37,9 @@
     signal requestFavoriteMoveTo(string scopeId, int index)
     signal requestRestore(string scopeId)
 
-    Item {
+    Autoscroller {
         id: autoscroller
-
-        property bool dragging: false
-        property var dragItem: new Object();
-
-        readonly property bool fuzzyAtYEnd: {
-            var contentHeight = root.scopesListFlickable.contentHeight
-            var contentY = root.scopesListFlickable.contentY
-            var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
-            var flickableHeight = root.scopesListFlickable.height
-
-            if (!dragItem) {
-                return true;
-            } else {
-                return contentY >= (contentHeight - flickableHeight) - dragItemHeight
-            }
-        }
-
-        readonly property real bottomBoundary: {
-            var contentHeight = root.scopesListFlickable.contentHeight
-            var contentY = root.scopesListFlickable.contentY
-            var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
-            var heightRatio = root.scopesListFlickable.visibleArea.heightRatio
-
-            if (!dragItem) {
-                return true;
-            } else {
-                return (heightRatio * contentHeight) -
-                       (1.5 * dragItemHeight) + contentY
-            }
-        }
-
-        readonly property int delayMs: 32
-        readonly property real topBoundary: dragItem ? root.scopesListFlickable.contentY + (.5 * dragItem.height) : 0
-
-        visible: false
-        readonly property real maxStep: units.dp(10)
-        function stepSize(scrollingUp) {
-            var delta, step;
-            if (scrollingUp) {
-                delta = dragItem.y - topBoundary;
-                delta /= (1.5 * dragItem.height);
-            } else {
-                delta = dragItem.y - bottomBoundary;
-                delta /= (1.5 * dragItem.height);
-            }
-
-            step = Math.abs(delta) * autoscroller.maxStep
-            return Math.ceil(step);
-        }
-
-
-        Timer {
-            interval: autoscroller.delayMs
-            running: autoscroller.dragItem ? (autoscroller.dragging &&
-                autoscroller.dragItem.y < autoscroller.topBoundary &&
-                !root.scopesListFlickable.atYBeginning) : false
-            repeat: true
-            onTriggered: {
-                root.scopesListFlickable.contentY -= autoscroller.stepSize(true);
-                autoscroller.dragItem.y -= autoscroller.stepSize(true);
-            }
-        }
-
-        Timer {
-            interval: autoscroller.delayMs
-            running: autoscroller.dragItem ? (autoscroller.dragging &&
-                autoscroller.dragItem.y >= autoscroller.bottomBoundary &&
-                !autoscroller.fuzzyAtYEnd) : false
-            repeat: true
-            onTriggered: {
-                root.scopesListFlickable.contentY += autoscroller.stepSize(false);
-                autoscroller.dragItem.y += autoscroller.stepSize(false);
-            }
-        }
-    }
-
-    function autoscroll(dragging, dragItem) {
-        if (dragging) {
-            autoscroller.dragItem = dragItem
-            autoscroller.dragging = true;
-        } else {
-            autoscroller.dragItem = null;
-            autoscroller.dragging = false
-        }
+        flickable: scopesListFlickable
     }
 
     state: "browse"
@@ -173,33 +90,33 @@
         }
         clip: true
         model: scope ? scope.categories : null
-            delegate: Loader {
-                asynchronous: true
-                width: root.width
-                active: results.count > 0
-                visible: active
-                sourceComponent: ScopesListCategory {
-                    objectName: "scopesListCategory" + categoryId
-
-                    model: results
-
-                    title: {
-                        if (isFavoritesFeed) return i18n.tr("Home");
-                        else if (isAlsoInstalled) return i18n.tr("Also installed");
-                        else return name;
-                    }
-
-                    editMode: root.state == "edit"
-                    scopeStyle: root.scopeStyle
-                    isFavoritesFeed: categoryId == "favorites"
-                    isAlsoInstalled: categoryId == "other"
-
-                    onItemDragging: autoscroll(dragging, dragItem);
-                    onRequestFavorite: root.requestFavorite(scopeId, favorite);
-                    onRequestEditMode: root.state = "edit";
-                    onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
-                    onRequestActivate: root.scope.activate(result, categoryId);
-                    onRequestRestore: root.requestRestore(scopeId);
+        delegate: Loader {
+            asynchronous: true
+            width: root.width
+            active: results.count > 0
+            visible: active
+            sourceComponent: ScopesListCategory {
+                objectName: "scopesListCategory" + categoryId
+
+                model: results
+
+                title: {
+                    if (isFavoritesFeed) return i18n.tr("Home");
+                    else if (isAlsoInstalled) return i18n.tr("Also installed");
+                    else return name;
+                }
+
+                editMode: root.state == "edit"
+                scopeStyle: root.scopeStyle
+                isFavoritesFeed: categoryId == "favorites"
+                isAlsoInstalled: categoryId == "other"
+
+                onItemDragging: autoscroller.autoscroll(dragging, dragItem);
+                onRequestFavorite: root.requestFavorite(scopeId, favorite);
+                onRequestEditMode: root.state = "edit";
+                onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
+                onRequestActivate: root.scope.activate(result, categoryId);
+                onRequestRestore: root.requestRestore(scopeId);
             }
         }
     }

=== modified file 'qml/Greeter/ShimGreeter.qml'
--- qml/Greeter/ShimGreeter.qml	2015-07-15 15:07:19 +0000
+++ qml/Greeter/ShimGreeter.qml	2017-02-10 14:04:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)  2015 Canonical, Ltd.
+ * Copyright (C) 2015-2017 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
@@ -22,7 +22,7 @@
  *
  */
 
-/* FIXME: this shuld be fine as a QtObject, but bug lp:1447391
+/* FIXME: this should be fine as a QtObject, but bug lp:1447391
  * dictates wrapping as an item instead
  */
 Item {
@@ -41,5 +41,6 @@
     property var notifyAboutToFocusApp: (function(appId) { return; })
     property var notifyAppFocused: (function(appId) { return; })
     property var notifyShowingDashFromDrag: (function(appId) { return false; })
-
+    property var notifyUserRequestedApp: (function() { return; })
+    property var notifyAppFocusRequested: (function() { return; })
 }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-01-24 07:43:54 +0000
+++ qml/Shell.qml	2017-02-10 14:04:06 +0000
@@ -44,6 +44,7 @@
 import Unity.Indicators 0.1 as Indicators
 import Cursor 1.1
 import WindowManager 1.0
+import Wizard 0.1
 
 
 StyledItem {
@@ -319,6 +320,12 @@
                 panel.indicators.hide();
                 panel.applicationMenus.hide();
             }
+
+            Binding {
+                target: stage.dashboard
+                property: "available"
+                value: !panel.focusedSurfaceIsFullscreen && !greeter.shown && !wizard.active
+            }
         }
 
         TouchGestureArea {

=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2017-01-26 11:10:01 +0000
+++ qml/Stage/DecoratedWindow.qml	2017-02-10 14:04:06 +0000
@@ -197,7 +197,6 @@
 
     WindowDecoration {
         id: decoration
-        closeButtonVisible: root.application.appId !== "unity8-dash"
         objectName: "appWindowDecoration"
 
         anchors { left: parent.left; top: parent.top; right: parent.right }

=== modified file 'qml/Stage/Spread/Spread.qml'
--- qml/Stage/Spread/Spread.qml	2016-11-07 12:37:56 +0000
+++ qml/Stage/Spread/Spread.qml	2017-02-10 14:04:06 +0000
@@ -43,6 +43,12 @@
 
     // Calculated stuff
     readonly property int totalItemCount: model.count
+    onTotalItemCountChanged: {
+        if (totalItemCount == 0) {
+            root.leaveSpread();
+        }
+    }
+
     readonly property real leftStackXPos: 0.03 * root.width + leftMargin
     readonly property real rightStackXPos: root.width - 1.5 * leftStackXPos + leftMargin
 

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-01-26 11:10:01 +0000
+++ qml/Stage/Stage.qml	2017-02-10 14:04:06 +0000
@@ -25,6 +25,7 @@
 import GSettings 1.0
 import "Spread"
 import "Spread/MathUtils.js" as MathUtils
+import "../Dash/Dashboard"
 
 FocusScope {
     id: root
@@ -56,6 +57,9 @@
     // used by the snap windows (edge maximize) feature
     readonly property alias previewRectangle: fakeRectangle
 
+    // for shell & dash
+    readonly property alias dashboard: dashboard
+
     readonly property bool spreadShown: state == "spread"
     readonly property var mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
 
@@ -160,7 +164,7 @@
         id: closeFocusedShortcut
         shortcut: Qt.AltModifier|Qt.Key_F4
         onTriggered: {
-            if (priv.focusedAppDelegate && !priv.focusedAppDelegate.isDash) {
+            if (priv.focusedAppDelegate) {
                 priv.focusedAppDelegate.close();
             }
         }
@@ -327,7 +331,7 @@
             }
         }
 
-        property int nextInStack: {
+        readonly property int nextInStack: {
             var mainStageIndex = priv.mainStageDelegate ? priv.mainStageDelegate.itemIndex : -1;
             var sideStageIndex = priv.sideStageDelegate ? priv.sideStageDelegate.itemIndex : -1;
             if (sideStageIndex == -1) {
@@ -398,7 +402,7 @@
     Binding {
         target: PanelState
         property: "closeButtonShown"
-        value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && !priv.focusedAppDelegate.isDash
+        value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized
     }
 
     Component.onDestruction: {
@@ -411,7 +415,6 @@
         model: root.applicationManager
         delegate: QtObject {
             property var stateBinding: Binding {
-                readonly property bool isDash: model.application ? model.application.appId == "unity8-dash" : false
                 target: model.application
                 property: "requestedState"
 
@@ -421,7 +424,6 @@
                 //       in staged mode, when it switches to Windowed mode it will suddenly
                 //       resume all those apps at once. We might want to avoid that.
                 value: root.mode === "windowed"
-                       || isDash
                        || (!root.suspended && model.application && priv.focusedAppDelegate &&
                            (priv.focusedAppDelegate.appId === model.application.appId ||
                             priv.mainStageAppId === model.application.appId ||
@@ -450,6 +452,7 @@
             PropertyChanges { target: cancelSpreadMouseArea; enabled: true }
             PropertyChanges { target: blurLayer; visible: true; blurRadius: 32; brightness: .65; opacity: 1 }
             PropertyChanges { target: wallpaper; visible: false }
+            PropertyChanges { target: dashboard; available: false }
         },
         State {
             name: "stagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "staged"
@@ -460,13 +463,14 @@
                 brightness: .65
                 opacity: 1
             }
+            PropertyChanges { target: dashboard; available: false }
         },
         State {
             name: "sideStagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "stagedWithSideStage"
             extend: "stagedRightEdge"
             PropertyChanges {
                 target: sideStage
-                opacity: priv.sideStageDelegate.x === sideStage.x ? 1 : 0
+                opacity: priv.sideStageDelegate && priv.sideStageDelegate.x === sideStage.x ? 1 : 0
                 visible: true
             }
         },
@@ -479,18 +483,21 @@
                 brightness: .65
                 opacity: MathUtils.linearAnimation(spreadItem.rightEdgeBreakPoint, 1, 0, 1, Math.max(rightEdgeDragArea.dragging ? rightEdgeDragArea.progress : 0, edgeBarrier.progress))
             }
+            PropertyChanges { target: dashboard; available: false }
         },
         State {
             name: "staged"; when: root.mode === "staged"
-            PropertyChanges { target: wallpaper; visible: false }
+            PropertyChanges { target: dashboard; available: true; columnCount: 1 }
         },
         State {
             name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
             PropertyChanges { target: triGestureArea; enabled: priv.sideStageEnabled }
             PropertyChanges { target: sideStage; visible: true }
+            PropertyChanges { target: dashboard; available: true; columnCount: 3 }
         },
         State {
             name: "windowed"; when: root.mode === "windowed"
+            PropertyChanges { target: dashboard; available: true; columnCount: 5 }
         }
     ]
     transitions: [
@@ -510,6 +517,7 @@
                 ScriptAction {
                     script: {
                         var item = appRepeater.itemAt(Math.max(0, spreadItem.highlightedIndex));
+                        if (!item) return;
                         if (item.stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
                             sideStage.show();
                         }
@@ -527,7 +535,6 @@
             to: "stagedWithSideStage"
             ScriptAction { script: priv.updateMainAndSideStageIndexes(); }
         }
-
     ]
 
     MouseArea {
@@ -552,6 +559,13 @@
             z: -2
         }
 
+        Dashboard {
+            id: dashboard
+            anchors.fill: parent
+            anchors.leftMargin: root.leftMargin
+            anchors.topMargin: PanelState.panelHeight
+        }
+
         BlurLayer {
             id: blurLayer
             anchors.fill: parent
@@ -578,7 +592,6 @@
             onListChanged: priv.updateMainAndSideStageIndexes()
         }
 
-
         DropArea {
             objectName: "MainStageDropArea"
             anchors {
@@ -1643,7 +1656,6 @@
                     objectName: "dragArea"
                     anchors.fill: decoratedWindow
                     enabled: false
-                    closeable: !appDelegate.isDash
 
                     onClicked: {
                         spreadItem.highlightedIndex = index;
@@ -1687,7 +1699,7 @@
                     objectName: "closeMouseArea"
                     anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset }
                     readonly property var mousePos: hoverMouseArea.mapToItem(appDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
-                    visible: !appDelegate.isDash && dragArea.distance == 0
+                    visible: dragArea.distance == 0
                              && index == spreadItem.highlightedIndex
                              && mousePos.y < (decoratedWindow.height / 3)
                              && mousePos.y > -units.gu(4)

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2017-01-26 11:10:01 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2017-02-10 14:04:06 +0000
@@ -125,7 +125,7 @@
     return nullptr;
 }
 
-QModelIndex ApplicationManager::findIndex(ApplicationInfo* application)
+QModelIndex ApplicationManager::findIndex(ApplicationInfo* application) const
 {
     for (int i = 0; i < m_runningApplications.size(); ++i) {
         if (m_runningApplications.at(i) == application) {
@@ -253,7 +253,7 @@
     return application;
 }
 
-ApplicationInfo* ApplicationManager::add(QString appId)
+ApplicationInfo* ApplicationManager::add(const QString &appId)
 {
     ApplicationInfo *application = nullptr;
 
@@ -492,7 +492,7 @@
 }
 
 
-QStringList ApplicationManager::availableApplications()
+QStringList ApplicationManager::availableApplications() const
 {
     QStringList appIds;
     Q_FOREACH(ApplicationInfo *app, m_availableApplications) {
@@ -506,7 +506,7 @@
     return m_runningApplications.isEmpty();
 }
 
-ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)
+ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface) const
 {
     for (ApplicationInfo *app : m_runningApplications) {
         auto surfaceList = static_cast<MirSurfaceListModel*>(app->surfaceList());
@@ -517,13 +517,13 @@
     return nullptr;
 }
 
-QString ApplicationManager::toString()
+QString ApplicationManager::toString() const
 {
     QString str;
     for (int i = 0; i < m_runningApplications.count(); ++i) {
         auto *application = m_runningApplications.at(i);
 
-        QString itemStr = QString("(index=%1,appId=%2)")
+        QString itemStr = QStringLiteral("(index=%1,appId=%2)")
             .arg(i)
             .arg(application->appId());
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2016-12-07 11:19:17 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2017-02-10 14:04:06 +0000
@@ -66,10 +66,10 @@
     QString focusedApplicationId() const override;
 
     // Only for testing
-    QStringList availableApplications();
-    Q_INVOKABLE ApplicationInfo* add(QString appId);
+    QStringList availableApplications() const;
+    Q_INVOKABLE ApplicationInfo* add(const QString &appId);
 
-    QModelIndex findIndex(ApplicationInfo* application);
+    QModelIndex findIndex(ApplicationInfo* application) const;
 
     bool isEmpty() const;
 
@@ -85,8 +85,8 @@
     bool add(ApplicationInfo *application);
     void remove(ApplicationInfo* application);
     void buildListOfAvailableApplications();
-    QString toString();
-    ApplicationInfo *findApplication(MirSurface* surface);
+    QString toString() const;
+    ApplicationInfo *findApplication(MirSurface* surface) const;
     QList<ApplicationInfo*> m_runningApplications;
     QList<ApplicationInfo*> m_availableApplications;
     bool m_modelBusy{false};

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2017-01-18 14:31:42 +0000
+++ tests/qmltests/CMakeLists.txt	2017-02-10 14:04:06 +0000
@@ -29,6 +29,7 @@
 add_unity8_qmltest(Components WallpaperResolver)
 add_unity8_qmltest(Components ZoomableImage)
 add_unity8_qmltest(Dash Dash)
+add_unity8_qmltest(Dash Dashboard)
 add_unity8_qmltest(Dash DashContent)
 add_unity8_qmltest(Dash DashShell)
 add_unity8_qmltest(Dash Card)

=== added file 'tests/qmltests/Dash/tst_Dashboard.qml'
--- tests/qmltests/Dash/tst_Dashboard.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/tst_Dashboard.qml	2017-02-10 14:04:06 +0000
@@ -0,0 +1,433 @@
+/*
+ * Copyright (C) 2013-2016 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.4
+import QtTest 1.0
+import AccountsService 0.1
+import GSettings 1.0
+import LightDM.IntegratedLightDM 0.1 as LightDM
+import SessionBroadcast 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Unity.Application 0.1
+import Unity.ApplicationMenu 0.1
+import Unity.Launcher 0.1
+import Unity.Test 0.1
+import Powerd 0.1
+import Wizard 0.1 as Wizard
+import Utils 0.1
+
+import "../../../qml"
+import "../../../qml/Components"
+import "../../../qml/Components/PanelState"
+import "../Stage"
+import ".."
+
+Rectangle {
+    id: root
+    color: "grey"
+    width: units.gu(100) + controls.width
+    height: units.gu(71)
+
+    Component.onCompleted: {
+        // must set the mock mode before loading the Shell
+        LightDM.Greeter.mockMode = "single";
+        LightDM.Users.mockMode = "single";
+        shellLoader.active = true;
+    }
+
+    ApplicationMenuDataLoader {
+        id: appMenuData
+    }
+
+    property var shell: shellLoader.item ? shellLoader.item : null
+    onShellChanged: {
+        if (shell) {
+            topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");
+            appMenuData.surfaceManager = testCase.findInvisibleChild(shell, "surfaceManager");
+            dashboard = testCase.findChild(shell, "dashboard");
+        } else {
+            topLevelSurfaceList = null;
+            appMenuData.surfaceManager = null;
+            dashboard = null;
+        }
+    }
+
+    property var topLevelSurfaceList: null
+    property var dashboard: null
+
+    Item {
+        id: shellContainer
+        anchors.left: root.left
+        anchors.right: controls.left
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        Loader {
+            id: shellLoader
+            focus: true
+
+            anchors.centerIn: parent
+
+            property int shellOrientation: Qt.PortraitOrientation
+            property int nativeOrientation: Qt.PortraitOrientation
+            property int primaryOrientation: Qt.PortraitOrientation
+            property string mode: "shell"
+
+            state: "phone"
+            states: [
+                State {
+                    name: "phone"
+                    PropertyChanges {
+                        target: shellLoader
+                        width: units.gu(40)
+                        height: units.gu(71)
+                    }
+                },
+                State {
+                    name: "tablet"
+                    PropertyChanges {
+                        target: shellLoader
+                        width: units.gu(100)
+                        height: units.gu(71)
+                        shellOrientation: Qt.LandscapeOrientation
+                        nativeOrientation: Qt.LandscapeOrientation
+                        primaryOrientation: Qt.LandscapeOrientation
+                    }
+                },
+                State {
+                    name: "desktop"
+                    PropertyChanges {
+                        target: shellLoader
+                        width: shellContainer.width
+                        height: shellContainer.height
+                    }
+                    PropertyChanges {
+                        target: mouseEmulation
+                        checked: false
+                    }
+                }
+            ]
+
+            active: false
+            property bool itemDestroyed: false
+            sourceComponent: Shell {
+                id: __shell
+                objectName: "shell"
+                usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
+                onUsageScenarioChanged: columnCountSelector.selectedIndex = usageScenarioSelector.selectedIndex;
+                nativeWidth: width
+                nativeHeight: height
+                orientation: shellLoader.shellOrientation
+                orientations: Orientations {
+                    native_: shellLoader.nativeOrientation
+                    primary: shellLoader.primaryOrientation
+                }
+                mode: "shell"
+
+                Component.onDestruction: {
+                    shellLoader.itemDestroyed = true;
+                }
+            }
+        }
+    }
+
+    Flickable {
+        id: controls
+        contentHeight: controlRect.height
+
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        anchors.right: root.right
+        width: units.gu(30)
+
+        Rectangle {
+            id: controlRect
+            anchors { left: parent.left; right: parent.right }
+            color: "darkgrey"
+            height: childrenRect.height + units.gu(2)
+
+            Column {
+                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+                spacing: units.gu(1)
+
+                Flow {
+                    spacing: units.gu(1)
+                    anchors { left: parent.left; right: parent.right }
+
+                    Button {
+                        text: "Show Launcher"
+                        activeFocusOnPress: false
+                        activeFocusOnTab: false
+                        enabled: !autohideLauncherCheckbox.checked
+                        onClicked: {
+                            if (shellLoader.status !== Loader.Ready)
+                                return;
+
+                            var launcher = testCase.findChild(shell, "launcher");
+                            launcher.state = "visible";
+                        }
+                    }
+                    Button {
+                        text: "Print focused"
+                        activeFocusOnPress: false
+                        activeFocusOnTab: false
+                        onClicked: {
+                            var childs = [];
+                            childs.push(shell)
+                            while (childs.length > 0) {
+                                if (childs[0].activeFocus && childs[0].focus && childs[0].objectName != "shell") {
+                                    console.log("Active focus is on item:", childs[0]);
+                                    return;
+                                }
+                                for (var i in childs[0].children) {
+                                    childs.push(childs[0].children[i])
+                                }
+                                childs.splice(0, 1);
+                            }
+                            console.log("No active focused item found within shell.")
+                        }
+                    }
+                }
+
+                ListItem.ItemSelector {
+                    id: columnCountSelector
+                    anchors { left: parent.left; right: parent.right }
+                    activeFocusOnPress: false
+                    text: "Dashboard column count"
+                    model: [1, 3, 5]
+                    onSelectedIndexChanged: {
+                        if (dashboard) dashboard.columnCount = model[selectedIndex];
+                    }
+                }
+
+                ListItem.ItemSelector {
+                    id: sizeSelector
+                    anchors { left: parent.left; right: parent.right }
+                    activeFocusOnPress: false
+                    text: "Size"
+                    model: ["phone", "tablet", "desktop"]
+                    selectedIndex: 2
+                    onSelectedIndexChanged: {
+                        shellLoader.state = model[selectedIndex];
+                    }
+                }
+
+                ListItem.ItemSelector {
+                    id: usageScenarioSelector
+                    anchors { left: parent.left; right: parent.right }
+                    activeFocusOnPress: false
+                    text: "Usage scenario"
+                    selectedIndex: 2
+                    model: ["phone", "tablet", "desktop"]
+                }
+
+                MouseTouchEmulationCheckbox {
+                    id: mouseEmulation
+                    checked: true
+                }
+
+                ListItem.ItemSelector {
+                    id: ctrlModifier
+                    anchors { left: parent.left; right: parent.right }
+                    activeFocusOnPress: false
+                    text: "Ctrl key as"
+                    model: ["Ctrl", "Alt", "Super"]
+                    onSelectedIndexChanged: {
+                        var keyMapper = testCase.findChild(shellContainer, "physicalKeysMapper");
+                        keyMapper.controlInsteadOfAlt = selectedIndex == 1;
+                        keyMapper.controlInsteadOfSuper = selectedIndex == 2;
+                    }
+                }
+
+                Row {
+                    anchors { left: parent.left; right: parent.right }
+                    CheckBox {
+                        id: autohideLauncherCheckbox
+                        activeFocusOnPress: false
+                        activeFocusOnTab: false
+                        onCheckedChanged:  {
+                            GSettingsController.setAutohideLauncher(checked)
+                        }
+                    }
+                    Label {
+                        text: "Autohide launcher"
+                    }
+                }
+            }
+        }
+    }
+
+    SignalSpy {
+        id: launcherShowDashHomeSpy
+        signalName: "showDashHome"
+    }
+
+    SignalSpy {
+        id: sessionSpy
+        signalName: "sessionStarted"
+    }
+
+    SignalSpy {
+        id: dashCommunicatorSpy
+        signalName: "setCurrentScopeCalled"
+    }
+
+    SignalSpy {
+        id: broadcastUrlSpy
+        target: SessionBroadcast
+        signalName: "startUrl"
+    }
+
+    SignalSpy {
+        id: broadcastHomeSpy
+        target: SessionBroadcast
+        signalName: "showHome"
+    }
+
+    Item {
+        id: fakeDismissTimer
+        property bool running: false
+        signal triggered
+
+        function stop() {
+            running = false;
+        }
+
+        function restart() {
+            running = true;
+        }
+    }
+
+    StageTestCase {
+        id: testCase
+        name: "Shell"
+        when: windowShown
+
+        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
+
+        function init() {
+            if (shellLoader.active) {
+                // happens for the very first test function as shell
+                // is loaded by default
+                tearDown();
+            }
+        }
+
+        function cleanup() {
+            waitForRendering(shell);
+            mouseEmulation.checked = true;
+            tryCompare(shell, "waitingOnGreeter", false); // make sure greeter didn't leave us in disabled state
+            tearDown();
+            WindowStateStorage.clear();
+        }
+
+        function loadShell(formFactor) {
+            shellLoader.state = formFactor;
+            shellLoader.active = true;
+            tryCompare(shellLoader, "status", Loader.Ready);
+            removeTimeConstraintsFromSwipeAreas(shellLoader.item);
+            tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
+
+            sessionSpy.target = findChild(shell, "greeter")
+            dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");
+
+            var launcher = findChild(shell, "launcher");
+            launcherShowDashHomeSpy.target = launcher;
+
+            var panel = findChild(launcher, "launcherPanel");
+            verify(!!panel);
+
+            panel.dismissTimer = fakeDismissTimer;
+
+            waitForGreeterToStabilize();
+
+            // from StageTestCase
+            topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
+            verify(topLevelSurfaceList);
+            stage = findChild(shell, "stage");
+        }
+
+        function waitForGreeterToStabilize() {
+            var greeter = findChild(shell, "greeter");
+            verify(greeter);
+
+            var loginList = findChild(greeter, "loginList", 0 /* timeout */);
+            // Only present in WideView
+            if (loginList) {
+                var userList = findChild(loginList, "userList");
+                verify(userList);
+                tryCompare(userList, "movingInternally", false);
+            }
+        }
+
+        function tearDown() {
+            launcherShowDashHomeSpy.target = null;
+
+            shellLoader.itemDestroyed = false;
+
+            shellLoader.active = false;
+
+            tryCompare(shellLoader, "status", Loader.Null);
+            tryCompare(shellLoader, "item", null);
+            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
+            // item might still be alive. So if we set Loader.active back to true
+            // again right now we will get the very same Shell instance back. So no reload
+            // actually took place. Likely because Loader waits until the next event loop
+            // iteration to do its work. So to ensure the reload, we will wait until the
+            // Shell instance gets destroyed.
+            tryCompare(shellLoader, "itemDestroyed", true);
+
+            setLightDMMockMode("single"); // back to the default value
+
+            AccountsService.demoEdges = false;
+            AccountsService.demoEdgesCompleted = [];
+            AccountsService.backgroundFile = "";
+            Wizard.System.wizardEnabled = false;
+            shellLoader.mode = "shell";
+
+            // kill all (fake) running apps
+            killApps();
+
+            LightDM.Greeter.authenticate(""); // reset greeter
+
+            sessionSpy.clear();
+            broadcastUrlSpy.clear();
+            broadcastHomeSpy.clear();
+
+            GSettingsController.setLifecycleExemptAppids([]);
+            GSettingsController.setPictureUri("");
+        }
+
+        function setLightDMMockMode(mode) {
+            LightDM.Greeter.mockMode = mode;
+            LightDM.Users.mockMode = mode;
+        }
+
+        function showGreeter() {
+            var greeter = findChild(shell, "greeter");
+            LightDM.Greeter.showGreeter();
+            waitForRendering(greeter);
+            tryCompare(greeter, "fullyShown", true);
+
+            // greeter unloads its internal components when hidden
+            // and reloads them when shown. Thus we have to do this
+            // again before interacting with it otherwise any
+            // SwipeAreas in there won't be easily fooled by
+            // fake swipes.
+            removeTimeConstraintsFromSwipeAreas(greeter);
+        }
+    }
+}

=== modified file 'tests/qmltests/Stage/ApplicationCheckBox.qml'
--- tests/qmltests/Stage/ApplicationCheckBox.qml	2017-01-26 11:10:01 +0000
+++ tests/qmltests/Stage/ApplicationCheckBox.qml	2017-02-10 14:04:06 +0000
@@ -30,8 +30,6 @@
         }
     }
 
-    enabled: appId !== "unity8-dash"
-
     onCheckedChanged: {
         if (d.bindGuard) { return; }
         d.bindGuard = true;

=== modified file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2016-10-28 13:11:53 +0000
+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2017-02-10 14:04:06 +0000
@@ -35,6 +35,7 @@
         id: checkbox
         checked: true
         activeFocusOnPress: false
+        activeFocusOnTab: false
     }
     Label {
         id: label
@@ -42,6 +43,8 @@
         anchors.verticalCenter: parent.verticalCenter
         AbstractButton {
             anchors.fill: parent
+            activeFocusOnPress: false
+            activeFocusOnTab: false
             onClicked: checkbox.checked = !checkbox.checked
         }
     }