Merge lp:~mzanetti/unity8/quicklists into lp:unity8

[Michael Zanetti]

initial support for quicklists

For now they support pinning and removing of items

[lp:~mzanetti/unity8/quicklists]

140. By Michael Zanetti on 2013-08-19

remove obsolete check for non-clickable item

141. By Michael Zanetti on 2013-08-19

hasAction -> clickable to reflect changes in unity-api

142. By Michael Zanetti on 2013-08-19

remove unrelated whitespace change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/unity8-ci/674/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2370
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/675
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/675/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2376
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2012

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity8-ci/675/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2372
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/676
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/676/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2014

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity8-ci/680/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/681
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2390
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2390/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2023

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-08-15 22:41:41 +0000
+++ Launcher/Launcher.qml	2013-08-19 15:20:54 +0000
@@ -73,7 +73,7 @@
         id: dismissTimer
         interval: 5000
         onTriggered: {
-            if (!panel.moving) {
+            if (!panel.preventHiding) {
                 root.state = ""
             } else {
                 dismissTimer.restart()
@@ -162,7 +162,7 @@
             root.dashItemSelected(index)
         }
 
-        onMovingChanged: {
+        onPreventHidingChanged: {
             if (dismissTimer.running) {
                 dismissTimer.restart();
             }

=== modified file 'Launcher/LauncherPanel.qml'
--- Launcher/LauncherPanel.qml	2013-08-19 11:47:29 +0000
+++ Launcher/LauncherPanel.qml	2013-08-19 15:20:54 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components.ListItems 0.1 as ListItems
 import Unity 0.1
 import Unity.Launcher 0.1
+import Ubuntu.Components.Popups 0.1
 import "../Components/ListItems"
 
 Item {
@@ -29,7 +30,8 @@
     property var model
     property bool inverted: true
     property bool dragging: false
-    property bool moving: launcherListView.moving || launcherListView.flicking || dndArea.draggedIndex >= 0
+    property bool moving: launcherListView.moving || launcherListView.flicking
+    property bool preventHiding: moving || dndArea.draggedIndex >= 0 || dndArea.quickListPopover !== null || dndArea.pressed
     property int highlightIndex: -1
 
     signal applicationSelected(string desktopFile)
@@ -219,6 +221,7 @@
 
                     MouseArea {
                         id: dndArea
+                        objectName: "dndArea"
                         anchors {
                             fill: parent
                             topMargin: launcherListView.topMargin
@@ -234,6 +237,7 @@
                         property bool postDragging: false
                         property int startX
                         property int startY
+                        property var quickListPopover: null
 
                         onPressed: {
                             selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)
@@ -302,6 +306,13 @@
 
                             draggedIndex = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);
 
+                            // Opening QuickList
+                            var quickListModel = launcherListView.model.get(draggedIndex).quickList
+                            var quickListAppId = launcherListView.model.get(draggedIndex).appId
+
+                            quickListPopover = PopupUtils.open(popoverComponent, selectedItem,
+                                                               {model: quickListModel, appId: quickListAppId})
+
                             launcherListView.interactive = false
 
                             var yOffset = draggedIndex > 0 ? (mouseY + launcherListView.realContentY) % (draggedIndex * launcherListView.realItemHeight) : mouseY + launcherListView.realContentY
@@ -324,6 +335,7 @@
                                     var distance = Math.max(Math.abs(mouseX - startX), Math.abs(mouseY - startY))
                                     if (!preDragging && distance > units.gu(1.5)) {
                                         preDragging = true;
+                                        PopupUtils.close(quickListPopover)
                                     }
                                     if (distance > launcherListView.itemHeight) {
                                         selectedItem.dragging = true
@@ -414,4 +426,46 @@
             }
         }
     }
+
+    Component {
+        id: popoverComponent
+
+        Popover {
+            id: popover
+            property var model
+            property string appId
+            contentWidth: quickListColumn.width
+
+            // FIXME: There's a bug in the Popover positioning that it covers the item in case it is rotated.
+            // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1204470
+            // For now, let's move the Popover around with callerMargin.
+            // Remove popupMargin once the bug is fixed.
+            property int popupMargin: root.inverted ? launcherListView.itemHeight : 0;
+
+            callerMargin: units.gu(1) + popupMargin
+
+            Column {
+                id: quickListColumn
+                width: units.gu(30)
+                height: childrenRect.height
+
+                Repeater {
+                    model: popover.model
+
+                    ListItems.Standard {
+                        objectName: "quickListEntry" + index
+                        text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
+                        highlightWhenPressed: model.clickable
+                        onClicked: {
+                            if (!model.clickable) {
+                                return;
+                            }
+                            LauncherModel.quickListActionInvoked(appId, index);
+                            PopupUtils.close(popover);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

=== modified file 'plugins/Unity/Launcher/common/quicklistentry.cpp'
--- plugins/Unity/Launcher/common/quicklistentry.cpp	2013-07-05 11:25:54 +0000
+++ plugins/Unity/Launcher/common/quicklistentry.cpp	2013-08-19 15:20:54 +0000
@@ -52,3 +52,8 @@
 {
     m_icon = icon;
 }
+
+bool QuickListEntry::clickable() const
+{
+    return !m_actionId.isEmpty();
+}

=== modified file 'plugins/Unity/Launcher/common/quicklistentry.h'
--- plugins/Unity/Launcher/common/quicklistentry.h	2013-07-05 11:25:54 +0000
+++ plugins/Unity/Launcher/common/quicklistentry.h	2013-08-19 15:20:54 +0000
@@ -35,6 +35,8 @@
     QString icon() const;
     void setIcon(const QString &icon);
 
+    bool clickable() const;
+
 private:
     QString m_actionId;
     QString m_text;

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2013-07-24 10:42:00 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2013-08-19 15:20:54 +0000
@@ -33,6 +33,9 @@
     m_count(0),
     m_quickList(new QuickListModel(this))
 {
+    QuickListEntry nameAction;
+    nameAction.setText(m_name);
+    m_quickList->appendAction(nameAction);
     QuickListEntry pinningAction;
     pinningAction.setActionId("pin_item");
     pinningAction.setText("Pin to Launcher");

=== modified file 'plugins/Unity/Launcher/quicklistmodel.cpp'
--- plugins/Unity/Launcher/quicklistmodel.cpp	2013-07-24 10:42:00 +0000
+++ plugins/Unity/Launcher/quicklistmodel.cpp	2013-08-19 15:20:54 +0000
@@ -66,6 +66,8 @@
         return m_list.at(index.row()).text();
     case RoleIcon:
         return m_list.at(index.row()).icon();
+    case RoleClickable:
+        return m_list.at(index.row()).clickable();
     }
     return QVariant();
 }

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2013-08-14 23:00:28 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2013-08-19 15:20:54 +0000
@@ -131,9 +131,7 @@
 
 void MockLauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)
 {
-    Q_UNUSED(appId)
-    Q_UNUSED(actionIndex)
-    // Nothing to mock yet...
+    Q_EMIT quickListTriggered(appId, actionIndex);
 }
 
 int MockLauncherModel::findApp(const QString &appId)

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.h'
--- tests/mocks/Unity/Launcher/MockLauncherModel.h	2013-07-08 12:57:39 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2013-08-19 15:20:54 +0000
@@ -44,6 +44,9 @@
     Q_INVOKABLE void requestRemove(const QString &appId);
     Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
 
+Q_SIGNALS:
+    void quickListTriggered(const QString &appId, int index);
+
 private:
     int findApp(const QString &appId);
 

=== modified file 'tests/mocks/Unity/Launcher/MockQuickListModel.cpp'
--- tests/mocks/Unity/Launcher/MockQuickListModel.cpp	2013-07-05 11:25:54 +0000
+++ tests/mocks/Unity/Launcher/MockQuickListModel.cpp	2013-08-19 15:20:54 +0000
@@ -35,6 +35,8 @@
         return QLatin1String("test menu entry ") + QString::number(index.row());
     case RoleIcon:
         return QLatin1String("copy.png");
+    case RoleClickable:
+        return index.row() == 1 ? false : true;
     }
     return QVariant();
 }

=== modified file 'tests/mocks/Unity/Launcher/plugin.cpp'
--- tests/mocks/Unity/Launcher/plugin.cpp	2013-07-05 11:25:54 +0000
+++ tests/mocks/Unity/Launcher/plugin.cpp	2013-08-19 15:20:54 +0000
@@ -20,6 +20,7 @@
 #include "plugin.h"
 #include "MockLauncherModel.h"
 #include "MockLauncherItem.h"
+#include "MockQuickListModel.h"
 
 #include <unity/shell/launcher/LauncherModelInterface.h>
 #include <unity/shell/launcher/LauncherItemInterface.h>
@@ -39,7 +40,9 @@
     // @uri Unity.Launcher
     qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");
     qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");
+    qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListModelInterface", "Abstract Interface. Cannot be instantiated.");
 
     qmlRegisterSingletonType<MockLauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
     qmlRegisterUncreatableType<MockLauncherItem>(uri, 0, 1, "LauncherItem", "Can't create LauncherItems in QML. Get them from the LauncherModel");
+    qmlRegisterUncreatableType<MockQuickListModel>(uri, 0, 1, "QuickListModel", "Can't create QuickLists in QML. Get them from the LauncherItems");
 }

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-08-16 21:57:18 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-08-19 15:20:54 +0000
@@ -49,6 +49,11 @@
         property int maxPanelX: 0
     }
 
+    SignalSpy {
+        id: signalSpy
+        target: LauncherModel
+    }
+
     Connections {
         target: testCase.findChild(launcher, "launcherPanel")
 
@@ -306,5 +311,79 @@
             tryCompare(draggedItem, "itemOpacity", 1)
             tryCompare(fakeDragItem, "visible", false)
         }
+
+        function test_quicklist_dismiss() {
+            revealer.dragLauncherIntoView();
+            var draggedItem = findChild(launcher, "launcherDelegate5")
+            var item0 = findChild(launcher, "launcherDelegate0")
+            var fakeDragItem = findChild(launcher, "fakeDragItem")
+            var dndArea = findChild(launcher, "dndArea")
+
+            // Initial state
+            compare(dndArea.quickListPopover, null)
+
+            // Doing longpress
+            mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
+            tryCompare(fakeDragItem, "visible", true) // Wait longpress happening
+            verify(dndArea.quickListPopover != null)
+
+            // Dragging a bit (> 1.5 gu)
+            mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)
+
+            // QuickList needs to be closed when a drag operation starts
+            tryCompare(dndArea, "quickListPopover", null)
+
+            mouseRelease(draggedItem);
+        }
+
+        function test_quicklist_click_data() {
+            return [
+                {tag: "non-clickable", index: 1, clickable: false },
+                {tag: "clickable", index: 2, clickable: true },
+            ];
+        }
+
+        function test_quicklist_click(data) {
+            revealer.dragLauncherIntoView();
+            var clickedItem = findChild(launcher, "launcherDelegate5")
+            var dndArea = findChild(launcher, "dndArea")
+
+            // Initial state
+            compare(dndArea.quickListPopover, null)
+
+            // Doing longpress
+            mousePress(clickedItem, clickedItem.width / 2, clickedItem.height / 2)
+            tryCompare(clickedItem, "itemOpacity", 0) // Wait for longpress to happen
+            verify(dndArea.quickListPopover != null)
+
+            mouseRelease(clickedItem);
+
+            var quickListEntry = findChild(dndArea.quickListPopover, "quickListEntry" + data.index)
+
+            signalSpy.clear();
+            signalSpy.signalName = "quickListTriggered"
+
+            mouseClick(quickListEntry, quickListEntry.width / 2, quickListEntry.height / 2)
+
+            if (data.clickable) {
+                // QuickList needs to be closed when some clickable item is clicked
+                tryCompare(dndArea, "quickListPopover", null)
+
+                compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
+                compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId)
+                compare(signalSpy.signalArguments[0][1], 2)
+
+            } else {
+
+                // QuickList must not be closed when a non-clickable item is clicked
+                verify(dndArea.quickListPopover != null)
+
+                compare(signalSpy.count, 0, "Quicklist signal must NOT be triggered when clicking a non-clickable item")
+
+                // Click somewhere in the empty space to dismiss the quicklist
+                mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
+                tryCompare(dndArea, "quickListPopover", null)
+            }
+        }
     }
 }