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

[Lukáš Tinkl]

launcher parity: close apps from quicklist

launcher parity: close apps from quicklist

- adds a Quit item to the launcher quicklist
- partially reverts the visual appearance to the old design of popup menus
- invokes the popup menu also on the right mouse click

 * Are there any related MPs required for this MP to build/function as expected? Please list.

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * Did you make sure that your branch does not contain spurious tags?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

No (however, there is a revert to the old design)

 * Did you have a look at the warnings when running tests? Can they be reduced?

Yes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1810
http://jenkins.qa.ubuntu.com/job/unity8-ci/5803/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/94
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21099

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

I see you have lp:~lukas-kde/unity8/highdpi-mousetouchadaptor in this branch. Either remove those changes or make lp:~lukas-kde/unity8/highdpi-mousetouchadaptor a prerequisite.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

In qml/Launcher/LauncherPanel.qml

"""
- __foregroundColor: "black"
+ __foregroundColor: Theme.palette.selected.backgroundText
"""

"Theme" is deprecated. Please use the context variable "theme" instead. We have tons of warnings on this already. See https://code.launchpad.net/~dandrader/unity8/deprecatedTheme/+merge/262216

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

I would like to see a qml test launches an app and then closes it using this "quit" quick list menu entry.

I should also be able to manually test this feature or try it out (eg, via "make tryShell"), without having to flash a device for that.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> I would like to see a qml test launches an app and then closes it using this
> "quit" quick list menu entry.

There is already a test for this, albeit not a QML one: launchermodeltest.cp, void testQuitMenuItem()

> I should also be able to manually test this feature or try it out (eg, via
> "make tryShell"), without having to flash a device for that.

Right, I'll see what I can do with that but I'd prefer doing that in a separate MP; it goes a bit beyond the scope of this review, none of the current quick list actions are testable from QML yet (Pin/Unpin etc).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1811
http://jenkins.qa.ubuntu.com/job/unity8-ci/5830/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/111
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/124
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21295

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Some inline comments.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> Some inline comments.

Should be fixed by r. 1812

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1813
http://jenkins.qa.ubuntu.com/job/unity8-ci/5882/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/190/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/190
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21455

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Hmm... testing it, the quicklist visuals seem to be the expected ones any more. Sorry if I gave bad advice on reverting the complete commit. We should only revert the positioning to what it was before, but not the coloring. Also the arrow points to the wrong direction. It should point from the menu box towards the clicked launcher item, not the other way round.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

Ack, will fix

[Michael Zanetti (mzanetti)]

http://i.imgur.com/bGXaemm.png

Font is white on white, also I'm missing the close entry.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1814
http://jenkins.qa.ubuntu.com/job/unity8-ci/5925/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/206
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21627

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1815
http://jenkins.qa.ubuntu.com/job/unity8-ci/5929/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/251/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/210
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/171/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/251
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21632

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1823
http://jenkins.qa.ubuntu.com/job/unity8-ci/5993/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/281/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/232
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/193/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21696

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Launcher/LauncherPanel.qml
1 conflicts encountered.

review: Needs Fixing

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

1824. By Lukáš Tinkl on 2015-07-21

merge and fix conflict

[Albert Astals Cid (aacid)]

review: Abstain (tags clean & merges fine)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1824
http://jenkins.qa.ubuntu.com/job/unity8-ci/6098/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/406/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/337
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/296/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/406
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/406/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22014

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Looks ok and works, except the dbusinterface changes are not needed. Please drop them.

review: Needs Fixing

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

1825. By Lukáš Tinkl on 2015-07-21

drop dbusinterface changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1825
http://jenkins.qa.ubuntu.com/job/unity8-ci/6105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/415/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/344
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/303/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22032

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

as much as it can, yes

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

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

1826. By Lukáš Tinkl on 2015-07-23

rebase on top of lp:~macslow/unity8/use-set-progress-api

1827. By Lukáš Tinkl on 2015-07-29

re-merge again on top of use-set-progress-api to fix failing QML tests

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2015-07-09 20:22:36 +0000
+++ debian/control	2015-07-23 14:15:26 +0000
@@ -30,7 +30,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.97),
+               libunity-api-dev (>= 7.98),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
@@ -101,7 +101,7 @@
          qtdeclarative5-ubuntu-telephony0.1,
          qtdeclarative5-ubuntu-web-plugin,
          ubuntu-system-settings,
-         unity-launcher-impl-4,
+         unity-launcher-impl-7,
          unity8-common (= ${source:Version}),
          unity8-private (= ${binary:Version}),
          unity8-private | unity-launcher-impl,
@@ -191,7 +191,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-launcher-impl,
-          unity-launcher-impl-4,
+          unity-launcher-impl-7,
 Description: Unity 8 private libs
  The Unity 8 shell is the primary user interface for Ubuntu devices.
  .

=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
--- plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-04-24 09:53:37 +0000
+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-07-23 14:15:26 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 

=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.cpp'
--- plugins/Greeter/Unity/Launcher/launcheritem.cpp	2015-02-11 14:02:24 +0000
+++ plugins/Greeter/Unity/Launcher/launcheritem.cpp	2015-07-23 14:15:26 +0000
@@ -31,6 +31,7 @@
     m_count(0),
     m_countVisible(false),
     m_focused(false),
+    m_alerting(false),
     m_quickList(new QuickListModel(this))
 {
     QuickListEntry nameAction;
@@ -165,6 +166,19 @@
     }
 }
 
+bool LauncherItem::alerting() const
+{
+    return m_alerting;
+}
+
+void LauncherItem::setAlerting(bool alerting)
+{
+    if (m_alerting != alerting) {
+        m_alerting = alerting;
+        Q_EMIT alertingChanged(alerting);
+    }
+}
+
 unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
 {
     return m_quickList;

=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.h'
--- plugins/Greeter/Unity/Launcher/launcheritem.h	2015-02-11 14:02:24 +0000
+++ plugins/Greeter/Unity/Launcher/launcheritem.h	2015-07-23 14:15:26 +0000
@@ -41,6 +41,7 @@
     int count() const override;
     bool countVisible() const override;
     bool focused() const override;
+    bool alerting() const override;
 
     unity::shell::launcher::QuickListModelInterface *quickList() const override;
 
@@ -54,6 +55,8 @@
     void setCount(int count);
     void setCountVisible(bool countVisible);
     void setFocused(bool focused);
+    void setAlerting(bool alerting);
+
 
 private:
     QString m_appId;
@@ -66,6 +69,7 @@
     int m_count;
     bool m_countVisible;
     bool m_focused;
+    bool m_alerting;
     QuickListModel *m_quickList;
 
     friend class LauncherModel;

=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.cpp'
--- plugins/Greeter/Unity/Launcher/launchermodelas.cpp	2015-02-11 14:02:24 +0000
+++ plugins/Greeter/Unity/Launcher/launchermodelas.cpp	2015-07-23 14:15:26 +0000
@@ -67,11 +67,20 @@
             return item->progress();
         case RoleFocused:
             return item->focused();
+        case RoleRunning:
+            return item->running();
     }
 
     return QVariant();
 }
 
+void LauncherModel::setAlerting(const QString &appId, bool alerting)
+{
+    Q_UNUSED(appId)
+    Q_UNUSED(alerting)
+    qWarning() << "This is a read only implementation. Cannot set alert-state of items.";
+}
+
 unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
 {
     if (index < 0 || index >= m_list.count()) {
@@ -200,16 +209,20 @@
     Q_FOREACH (LauncherItem* item, m_list) {
         bool found = false;
         Q_FOREACH(const QVariant &asItem, items) {
-            if (asItem.toMap().value("id").toString() == item->appId()) {
+            QVariantMap cachedMap = asItem.toMap();
+            if (cachedMap.value("id").toString() == item->appId()) {
                 // Only keep and update it if we either show unpinned or it is pinned
-                if (!m_onlyPinned || asItem.toMap().value("pinned").toBool()) {
+                if (!m_onlyPinned || cachedMap.value("pinned").toBool()) {
                     found = true;
-                    item->setName(asItem.toMap().value("name").toString());
-                    item->setIcon(asItem.toMap().value("icon").toString());
-                    item->setCount(asItem.toMap().value("count").toInt());
-                    item->setCountVisible(asItem.toMap().value("countVisible").toBool());
+                    item->setName(cachedMap.value("name").toString());
+                    item->setIcon(cachedMap.value("icon").toString());
+                    item->setCount(cachedMap.value("count").toInt());
+                    item->setCountVisible(cachedMap.value("countVisible").toBool());
+                    item->setProgress(cachedMap.value("progress").toInt());
+                    item->setRunning(cachedMap.value("running").toBool());
+
                     int idx = m_list.indexOf(item);
-                    Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
+                    Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleCount, RoleCountVisible, RoleRunning, RoleProgress});
                 }
                 break;
             }
@@ -247,14 +260,17 @@
         }
 
         if (itemIndex == -1) {
+            QVariantMap cachedMap = entry.toMap();
             // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
-            LauncherItem *item = new LauncherItem(entry.toMap().value("id").toString(),
-                                                  entry.toMap().value("name").toString(),
-                                                  entry.toMap().value("icon").toString(),
+            LauncherItem *item = new LauncherItem(cachedMap.value("id").toString(),
+                                                  cachedMap.value("name").toString(),
+                                                  cachedMap.value("icon").toString(),
                                                   this);
             item->setPinned(true);
-            item->setCount(entry.toMap().value("count").toInt());
-            item->setCountVisible(entry.toMap().value("countVisible").toBool());
+            item->setCount(cachedMap.value("count").toInt());
+            item->setCountVisible(cachedMap.value("countVisible").toBool());
+            item->setProgress(cachedMap.value("progress").toInt());
+            item->setRunning(cachedMap.value("running").toBool());
             beginInsertRows(QModelIndex(), newPosition, newPosition);
             m_list.insert(newPosition, item);
             endInsertRows();

=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.h'
--- plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-04-30 09:31:51 +0000
+++ plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-07-23 14:15:26 +0000
@@ -41,6 +41,7 @@
 
     QVariant data(const QModelIndex &index, int role) const override;
 
+    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
     Q_INVOKABLE void move(int oldIndex, int newIndex) override;
     Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2015-04-24 09:53:37 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2015-07-23 14:15:26 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 

=== modified file 'plugins/Unity/Launcher/asadapter.cpp'
--- plugins/Unity/Launcher/asadapter.cpp	2015-02-11 14:13:26 +0000
+++ plugins/Unity/Launcher/asadapter.cpp	2015-07-23 14:15:26 +0000
@@ -34,12 +34,12 @@
     m_accounts->deleteLater();
 }
 
-void ASAdapter::syncItems(QList<LauncherItem *> m_list)
+void ASAdapter::syncItems(const QList<LauncherItem*> &list)
 {
     if (m_accounts && !m_user.isEmpty()) {
         QList<QVariantMap> items;
 
-        Q_FOREACH(LauncherItem *item, m_list) {
+        Q_FOREACH(LauncherItem *item, list) {
             items << itemToVariant(item);
         }
 
@@ -56,5 +56,7 @@
     details.insert("count", item->count());
     details.insert("countVisible", item->countVisible());
     details.insert("pinned", item->pinned());
+    details.insert("running", item->running());
+    details.insert("progress", item->progress());
     return details;
 }

=== modified file 'plugins/Unity/Launcher/asadapter.h'
--- plugins/Unity/Launcher/asadapter.h	2015-02-11 14:13:26 +0000
+++ plugins/Unity/Launcher/asadapter.h	2015-07-23 14:15:26 +0000
@@ -21,7 +21,6 @@
 
 class LauncherItem;
 class AccountsServiceDBusAdaptor;
-class QDBusInterface;
 
 class ASAdapter
 {
@@ -29,7 +28,7 @@
     ASAdapter();
     ~ASAdapter();
 
-    void syncItems(QList<LauncherItem*> m_list);
+    void syncItems(const QList<LauncherItem*> &list);
 
 private:
     QVariantMap itemToVariant(LauncherItem *item) const;
@@ -38,8 +37,6 @@
     AccountsServiceDBusAdaptor *m_accounts;
     QString m_user;
 
-    QDBusInterface *m_userInterface;
-
     friend class LauncherModelTest;
 };
 

=== modified file 'plugins/Unity/Launcher/dbusinterface.cpp'
--- plugins/Unity/Launcher/dbusinterface.cpp	2015-06-11 23:45:12 +0000
+++ plugins/Unity/Launcher/dbusinterface.cpp	2015-07-23 14:15:26 +0000
@@ -62,6 +62,8 @@
         "<interface name=\"com.canonical.Unity.Launcher.Item\">"
             "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
             "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
+            "<property name=\"progress\" type=\"i\" access=\"readwrite\" />"
+            "<method name=\"Alert\" />"
         "</interface>";
     return nodeiface;
 }
@@ -122,6 +124,20 @@
         return false;
     }
 
+    /* Break down the path to just the app id */
+    bool validpath = true;
+    QString pathtemp = message.path();
+    if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
+        validpath = false;
+    }
+    pathtemp.remove("/com/canonical/Unity/Launcher/");
+    if (pathtemp.indexOf('/') >= 0) {
+        validpath = false;
+    }
+
+    /* Find ourselves an appid */
+    QString appid = decodeAppId(pathtemp);
+
     // First handle methods of the Launcher interface
     if (message.interface() == "com.canonical.Unity.Launcher") {
         if (message.member() == "Refresh") {
@@ -129,6 +145,13 @@
             Q_EMIT refreshCalled();
             return connection.send(reply);
         }
+    } else if (message.interface() == "com.canonical.Unity.Launcher.Item") {
+        // Handle methods of the Launcher-Item interface
+        if (message.member() == "Alert" && validpath) {
+            QDBusMessage reply = message.createReply();
+            Q_EMIT alertCalled(appid);
+            return connection.send(reply);
+        }
     }
 
     // Now handle dynamic properties (for launcher emblems)
@@ -140,50 +163,53 @@
         return false;
     }
 
-    /* Break down the path to just the app id */
-    QString pathtemp = message.path();
-    if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
-        return false;
-    }
-    pathtemp.remove("/com/canonical/Unity/Launcher/");
-    if (pathtemp.indexOf('/') >= 0) {
+    if (!validpath) {
         return false;
     }
 
-    /* Find ourselves an appid */
-    QString appid = decodeAppId(pathtemp);
     int index = m_launcherModel->findApplication(appid);
     LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
 
     QVariantList retval;
     if (message.member() == "Get") {
+        QString cachedString = message.arguments()[1].toString();
         if (!item) {
             return false;
         }
-        if (message.arguments()[1].toString() == "count") {
+        if (cachedString == "count") {
             retval.append(QVariant::fromValue(QDBusVariant(item->count())));
-        } else if (message.arguments()[1].toString() == "countVisible") {
+        } else if (cachedString == "countVisible") {
             retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
+        } else if (cachedString == "progress") {
+            retval.append(QVariant::fromValue(QDBusVariant(item->progress())));
         }
     } else if (message.member() == "Set") {
-        if (message.arguments()[1].toString() == "count") {
+        QString cachedString = message.arguments()[1].toString();
+        if (cachedString == "count") {
             int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
             if (!item || newCount != item->count()) {
                 Q_EMIT countChanged(appid, newCount);
                 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
             }
-        } else if (message.arguments()[1].toString() == "countVisible") {
+        } else if (cachedString == "countVisible") {
             bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
             if (!item || newVisible != item->countVisible()) {
                 Q_EMIT countVisibleChanged(appid, newVisible);
                 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
             }
+        } else if (cachedString == "progress") {
+            int newProgress = message.arguments()[2].value<QDBusVariant>().variant().toInt();
+            if (!item || newProgress != item->progress()) {
+                Q_EMIT progressChanged(appid, newProgress);
+                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "progress", QVariant(newProgress));
+            }
         }
     } else if (message.member() == "GetAll") {
         if (item) {
             QVariantMap all;
             all.insert("count", item->count());
             all.insert("countVisible", item->countVisible());
+            all.insert("progress", item->progress());
             retval.append(all);
         }
     } else {

=== modified file 'plugins/Unity/Launcher/dbusinterface.h'
--- plugins/Unity/Launcher/dbusinterface.h	2015-06-11 23:45:12 +0000
+++ plugins/Unity/Launcher/dbusinterface.h	2015-07-23 14:15:26 +0000
@@ -36,7 +36,9 @@
 Q_SIGNALS:
     void countChanged(const QString &appId, int count);
     void countVisibleChanged(const QString &appId, bool countVisible);
+    void progressChanged(const QString &appId, int progress);
     void refreshCalled();
+    void alertCalled(const QString &appId);
 
 private:
     static QString decodeAppId(const QString& path);

=== modified file 'plugins/Unity/Launcher/gsettings.cpp'
--- plugins/Unity/Launcher/gsettings.cpp	2015-03-04 08:54:12 +0000
+++ plugins/Unity/Launcher/gsettings.cpp	2015-07-23 14:15:26 +0000
@@ -68,7 +68,7 @@
 void GSettings::onSettingsChanged(const QString &key)
 {
     if (key == "items") {
-        QStringList cachedItems = m_gSettings->get("items").toStringList();
+        const QStringList cachedItems = m_gSettings->get("items").toStringList();
         if (m_cachedItems != cachedItems) {
             m_cachedItems = cachedItems;
             Q_EMIT changed();

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-11-19 17:43:09 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2015-07-23 14:15:26 +0000
@@ -34,16 +34,22 @@
     m_count(0),
     m_countVisible(false),
     m_focused(false),
+    m_alerting(false),
     m_quickList(new QuickListModel(this))
 {
     QuickListEntry nameAction;
     nameAction.setActionId("launch_item");
     nameAction.setText(m_name);
     m_quickList->appendAction(nameAction);
+
     QuickListEntry pinningAction;
     pinningAction.setActionId("pin_item");
     pinningAction.setText(gettext("Pin shortcut"));
     m_quickList->appendAction(pinningAction);
+
+    m_quitAction.setActionId("stop_item");
+    m_quitAction.setIcon("application-exit");
+    m_quitAction.setText(gettext("Quit"));
 }
 
 QString LauncherItem::appId() const
@@ -110,6 +116,11 @@
 {
     if (m_running != running) {
         m_running = running;
+        if (m_running) { // add the quit action
+            m_quickList->appendAction(m_quitAction);
+        } else { // remove the quit action
+            m_quickList->removeAction(m_quitAction);
+        }
         Q_EMIT runningChanged(running);
     }
 }
@@ -150,6 +161,9 @@
     if (m_count != count) {
         m_count = count;
         Q_EMIT countChanged(count);
+        if (m_countVisible) {
+            setAlerting(true);
+        }
     }
 }
 
@@ -163,6 +177,9 @@
     if (m_countVisible != countVisible) {
         m_countVisible = countVisible;
         Q_EMIT countVisibleChanged(countVisible);
+        if (countVisible) {
+            setAlerting(true);
+        }
     }
 }
 
@@ -175,10 +192,26 @@
 {
     if (m_focused != focused) {
         m_focused = focused;
+        if (focused) {
+            setAlerting(false);
+        }
         Q_EMIT focusedChanged(focused);
     }
 }
 
+bool LauncherItem::alerting() const
+{
+    return m_alerting;
+}
+
+void LauncherItem::setAlerting(bool alerting)
+{
+    if (m_alerting != alerting) {
+        m_alerting = alerting;
+        Q_EMIT alertingChanged(alerting);
+    }
+}
+
 unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
 {
     return m_quickList;

=== modified file 'plugins/Unity/Launcher/launcheritem.h'
--- plugins/Unity/Launcher/launcheritem.h	2014-09-02 18:22:37 +0000
+++ plugins/Unity/Launcher/launcheritem.h	2015-07-23 14:15:26 +0000
@@ -44,6 +44,7 @@
     int count() const override;
     bool countVisible() const override;
     bool focused() const override;
+    bool alerting() const override;
 
     unity::shell::launcher::QuickListModelInterface *quickList() const override;
 
@@ -57,6 +58,7 @@
     void setCount(int count);
     void setCountVisible(bool countVisible);
     void setFocused(bool focused);
+    void setAlerting(bool alerting);
 
 private:
     QString m_appId;
@@ -69,7 +71,9 @@
     int m_count;
     bool m_countVisible;
     bool m_focused;
+    bool m_alerting;
     QuickListModel *m_quickList;
+    QuickListEntry m_quitAction;
 
     friend class LauncherModel;
 };

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2015-03-30 17:36:42 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2015-07-23 14:15:26 +0000
@@ -36,11 +36,13 @@
     m_settings(new GSettings(this)),
     m_dbusIface(new DBusInterface(this)),
     m_asAdapter(new ASAdapter()),
-    m_appManager(0)
+    m_appManager(nullptr)
 {
     connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
     connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
+    connect(m_dbusIface, &DBusInterface::progressChanged, this, &LauncherModel::progressChanged);
     connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
+    connect(m_dbusIface, &DBusInterface::alertCalled, this, &LauncherModel::alert);
 
     connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
 
@@ -82,11 +84,30 @@
             return item->progress();
         case RoleFocused:
             return item->focused();
+        case RoleAlerting:
+            return item->alerting();
+        case RoleRunning:
+            return item->running();
+        default:
+            qWarning() << Q_FUNC_INFO << "missing role, implement me";
+            return QVariant();
     }
 
     return QVariant();
 }
 
+void LauncherModel::setAlerting(const QString &appId, bool alerting) {
+    int index = findApplication(appId);
+    if (index >= 0) {
+        QModelIndex modelIndex = this->index(index);
+        LauncherItem *item = m_list.at(index);
+        if (!item->focused()) {
+            item->setAlerting(alerting);
+            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
+        }
+    }
+}
+
 unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
 {
     if (index < 0 || index >= m_list.count()) {
@@ -134,7 +155,7 @@
         if (index == -1 || index == currentIndex) {
             m_list.at(currentIndex)->setPinned(true);
             QModelIndex modelIndex = this->index(currentIndex);
-            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
+            Q_EMIT dataChanged(modelIndex, modelIndex, {RolePinned});
         } else {
             move(currentIndex, index);
             // move() will store the list to the backend itself, so just exit at this point.
@@ -147,7 +168,7 @@
 
         DesktopFileHandler desktopFile(appId);
         if (!desktopFile.isValid()) {
-            qWarning() << "Can't pin this application, there is no .destkop file available.";
+            qWarning() << "Can't pin this application, there is no .desktop file available.";
             return;
         }
 
@@ -172,7 +193,7 @@
 
 void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)
 {
-    int index = findApplication(appId);
+    const int index = findApplication(appId);
     if (index < 0) {
         return;
     }
@@ -180,7 +201,7 @@
     LauncherItem *item = m_list.at(index);
     QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());
     if (model) {
-        QString actionId = model->get(actionIndex).actionId();
+        const QString actionId = model->get(actionIndex).actionId();
 
         // Check if this is one of the launcher actions we handle ourselves
         if (actionId == "pin_item") {
@@ -191,7 +212,10 @@
             }
         } else if (actionId == "launch_item") {
             QDesktopServices::openUrl(getUrlForAppId(appId));
-
+        } else if (actionId == "stop_item") { // Quit
+            if (m_appManager) {
+                m_appManager->stopApplication(appId);
+            }
         // Nope, we don't know this action, let the backend forward it to the application
         } else {
             // TODO: forward quicklist action to app, possibly via m_dbusIface
@@ -289,7 +313,7 @@
 
 void LauncherModel::unpin(const QString &appId)
 {
-    int index = findApplication(appId);
+    const int index = findApplication(appId);
     if (index < 0) {
         return;
     }
@@ -298,7 +322,7 @@
         if (m_list.at(index)->pinned()) {
             m_list.at(index)->setPinned(false);
             QModelIndex modelIndex = this->index(index);
-            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
+            Q_EMIT dataChanged(modelIndex, modelIndex, {RolePinned});
         }
     } else {
         beginRemoveRows(QModelIndex(), index, index);
@@ -320,22 +344,25 @@
 
 void LauncherModel::progressChanged(const QString &appId, int progress)
 {
-    int idx = findApplication(appId);
+    const int idx = findApplication(appId);
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setProgress(progress);
-        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleProgress);
+        Q_EMIT dataChanged(index(idx), index(idx), {RoleProgress});
     }
 }
 
 void LauncherModel::countChanged(const QString &appId, int count)
 {
-    int idx = findApplication(appId);
+    const int idx = findApplication(appId);
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCount(count);
-        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);
+        if (item->countVisible()) {
+            setAlerting(item->appId(), true);
+        }
         m_asAdapter->syncItems(m_list);
+        Q_EMIT dataChanged(index(idx), index(idx), {RoleCount});
     }
 }
 
@@ -345,7 +372,10 @@
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCountVisible(countVisible);
-        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
+        if (countVisible) {
+            setAlerting(item->appId(), true);
+        }
+        Q_EMIT dataChanged(index(idx), index(idx), {RoleCountVisible});
 
         // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
         if (!countVisible && !item->pinned() && !item->recent()) {
@@ -387,7 +417,8 @@
             item->setName(desktopFile.displayName());
             item->setIcon(desktopFile.icon());
             item->setPinned(item->pinned()); // update pinned text if needed
-            Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
+            item->setRunning(item->running());
+            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleRunning});
         }
     }
 
@@ -405,7 +436,7 @@
 
     // Now walk through settings and see if we need to add something
     for (int settingsIndex = 0; settingsIndex < m_settings->storedApplications().count(); ++settingsIndex) {
-        QString entry = m_settings->storedApplications().at(settingsIndex);
+        const QString entry = m_settings->storedApplications().at(settingsIndex);
         int itemIndex = -1;
         for (int i = 0; i < m_list.count(); ++i) {
             if (m_list.at(i)->appId() == entry) {
@@ -453,6 +484,16 @@
     m_asAdapter->syncItems(m_list);
 }
 
+void LauncherModel::alert(const QString &appId)
+{
+    int idx = findApplication(appId);
+    if (idx >= 0) {
+        LauncherItem *item = m_list.at(idx);
+        setAlerting(item->appId(), true);
+        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleAlerting);
+    }
+}
+
 void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
 {
     Q_UNUSED(parent);
@@ -468,25 +509,27 @@
         return;
     }
 
-    int itemIndex = findApplication(app->appId());
+    const int itemIndex = findApplication(app->appId());
     if (itemIndex != -1) {
         LauncherItem *item = m_list.at(itemIndex);
         if (!item->recent()) {
             item->setRecent(true);
-            m_asAdapter->syncItems(m_list);
-            Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);
+            Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});
         }
-        // Shall we paint some running/recent app highlight? If yes, do it here.
+        item->setRunning(true);
+        // TODO Shall we paint some running/recent app highlight? If yes, do it here.
     } else {
         LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
         item->setRecent(true);
+        item->setRunning(true);
         item->setFocused(app->focused());
 
         beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
         m_list.append(item);
         endInsertRows();
-        m_asAdapter->syncItems(m_list);
     }
+    m_asAdapter->syncItems(m_list);
+    Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRunning});
 }
 
 void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
@@ -501,25 +544,35 @@
         }
     }
 
-    if (appIndex > -1 && !m_list.at(appIndex)->pinned()) {
+    if (appIndex < 0) {
+        qWarning() << Q_FUNC_INFO << "appIndex not found";
+        return;
+    }
+
+    LauncherItem * item = m_list.at(appIndex);
+    item->setRunning(false);
+
+    if (!item->pinned()) {
         beginRemoveRows(QModelIndex(), appIndex, appIndex);
         m_list.takeAt(appIndex)->deleteLater();
         endRemoveRows();
         m_asAdapter->syncItems(m_list);
+        Q_EMIT dataChanged(index(appIndex), index(appIndex), {RolePinned});
     }
+    Q_EMIT dataChanged(index(appIndex), index(appIndex), {RoleRunning});
 }
 
 void LauncherModel::focusedAppIdChanged()
 {
-    QString appId = m_appManager->focusedApplicationId();
+    const QString appId = m_appManager->focusedApplicationId();
     for (int i = 0; i < m_list.count(); ++i) {
         LauncherItem *item = m_list.at(i);
         if (!item->focused() && item->appId() == appId) {
             item->setFocused(true);
-            Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);
+            Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
         } else if (item->focused() && item->appId() != appId) {
             item->setFocused(false);
-            Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);
+            Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
         }
     }
 }

=== modified file 'plugins/Unity/Launcher/launchermodel.h'
--- plugins/Unity/Launcher/launchermodel.h	2015-04-30 09:31:51 +0000
+++ plugins/Unity/Launcher/launchermodel.h	2015-07-23 14:15:26 +0000
@@ -45,6 +45,7 @@
 
     QVariant data(const QModelIndex &index, int role) const override;
 
+    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
     Q_INVOKABLE void move(int oldIndex, int newIndex) override;
     Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
@@ -63,6 +64,7 @@
 public Q_SLOTS:
     void requestRemove(const QString &appId) override;
     Q_INVOKABLE void refresh();
+    Q_INVOKABLE void alert(const QString &appId);
 
 private:
     void storeAppList();

=== modified file 'plugins/Unity/Launcher/quicklistentry.cpp'
--- plugins/Unity/Launcher/quicklistentry.cpp	2014-08-26 11:34:22 +0000
+++ plugins/Unity/Launcher/quicklistentry.cpp	2015-07-23 14:15:26 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Canonical, Ltd.
+/* Copyright (C) 2013, 2015 Canonical, Ltd.
  *
  * Authors:
  *  Michael Zanetti <[e-mail]>
@@ -20,7 +20,6 @@
 
 QuickListEntry::QuickListEntry()
 {
-
 }
 
 QString QuickListEntry::actionId() const
@@ -57,3 +56,8 @@
 {
     return !m_actionId.isEmpty();
 }
+
+bool QuickListEntry::operator==(const QuickListEntry &other)
+{
+    return !other.actionId().isEmpty() && other.actionId() == m_actionId;
+}

=== modified file 'plugins/Unity/Launcher/quicklistentry.h'
--- plugins/Unity/Launcher/quicklistentry.h	2014-08-26 11:34:22 +0000
+++ plugins/Unity/Launcher/quicklistentry.h	2015-07-23 14:15:26 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Canonical, Ltd.
+/* Copyright (C) 2013, 2015 Canonical, Ltd.
  *
  * Authors:
  *  Michael Zanetti <[e-mail]>
@@ -37,6 +37,8 @@
 
     bool clickable() const;
 
+    bool operator==(const QuickListEntry & other);
+
 private:
     QString m_actionId;
     QString m_text;

=== modified file 'plugins/Unity/Launcher/quicklistmodel.cpp'
--- plugins/Unity/Launcher/quicklistmodel.cpp	2013-10-02 11:00:53 +0000
+++ plugins/Unity/Launcher/quicklistmodel.cpp	2015-07-23 14:15:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013, 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -48,6 +48,17 @@
     }
 }
 
+void QuickListModel::removeAction(const QuickListEntry &entry)
+{
+    const int start = m_list.indexOf(entry);
+    if (start > -1) {
+        beginRemoveRows(QModelIndex(), start, start);
+        m_list.removeOne(entry);
+        Q_EMIT dataChanged(index(start), index(start));
+        endRemoveRows();
+    }
+}
+
 QuickListEntry QuickListModel::get(int index) const
 {
     return m_list.at(index);

=== modified file 'plugins/Unity/Launcher/quicklistmodel.h'
--- plugins/Unity/Launcher/quicklistmodel.h	2015-04-30 09:31:51 +0000
+++ plugins/Unity/Launcher/quicklistmodel.h	2015-07-23 14:15:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 201, 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -46,6 +46,8 @@
      */
     void updateAction(const QuickListEntry &entry);
 
+    void removeAction(const QuickListEntry &entry);
+
     QuickListEntry get(int index) const;
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2014-10-14 12:28:07 +0000
+++ qml/Launcher/LauncherDelegate.qml	2015-07-23 14:15:26 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: root
@@ -27,6 +27,8 @@
     property bool itemFocused: false
     property real maxAngle: 0
     property bool inverted: false
+    property bool alerting: false
+    readonly property alias wiggling: wiggleAnim.running
 
     readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
     readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
@@ -39,6 +41,82 @@
     property real offset: 0
     property real itemOpacity: 1
     property real brightness: 0
+    property double maxWiggleAngle: 5.0
+
+    QtObject {
+        id: priv
+
+        readonly property int wiggleDuration: UbuntuAnimation.SnapDuration
+        property real wiggleAngle: 0
+    }
+
+    SequentialAnimation {
+        id: wiggleAnim
+
+        running: alerting
+        loops: 1
+        alwaysRunToEnd: true
+
+        NumberAnimation {
+            target: priv
+            property: "wiggleAngle"
+            from: 0
+            to: maxWiggleAngle
+            duration: priv.wiggleDuration
+            easing.type: Easing.InQuad
+        }
+
+        NumberAnimation {
+            target: priv
+            property: "wiggleAngle"
+            from: maxWiggleAngle
+            to: -maxWiggleAngle
+            duration: priv.wiggleDuration
+            easing.type: Easing.InOutQuad
+        }
+
+        NumberAnimation {
+            target: priv
+            property: "wiggleAngle"
+            from: -maxWiggleAngle
+            to: maxWiggleAngle
+            duration: priv.wiggleDuration
+            easing.type: Easing.InOutQuad
+        }
+
+        NumberAnimation {
+            target: priv
+            property: "wiggleAngle"
+            from: maxWiggleAngle
+            to: -maxWiggleAngle
+            duration: priv.wiggleDuration
+            easing.type: Easing.InOutQuad
+        }
+
+        NumberAnimation {
+            target: priv
+            property: "wiggleAngle"
+            from: -maxWiggleAngle
+            to: maxWiggleAngle
+            duration: priv.wiggleDuration
+            easing.type: Easing.InOutQuad
+        }
+
+        NumberAnimation {
+            target: priv
+            property: "wiggleAngle"
+            from: maxWiggleAngle
+            to: 0
+            duration: priv.wiggleDuration
+            easing.type: Easing.OutQuad
+        }
+
+        UbuntuNumberAnimation {
+            target: root
+            property: "alerting"
+            to: 0
+        }
+    }
 
     Item {
         id: iconItem
@@ -75,7 +153,7 @@
             objectName: "countEmblem"
             anchors {
                 right: parent.right
-                top: parent.top
+                bottom: parent.bottom
                 margins: units.dp(3)
             }
             width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
@@ -100,23 +178,21 @@
             }
         }
 
-        BorderImage {
+        UbuntuShape {
             id: progressOverlay
             objectName: "progressOverlay"
+
             anchors {
                 left: iconItem.left
                 right: iconItem.right
-                bottom: iconItem.bottom
-                leftMargin: units.gu(1)
-                rightMargin: units.gu(1)
-                bottomMargin: units.gu(1)
+                verticalCenter: parent.verticalCenter
+                leftMargin: units.gu(1.5)
+                rightMargin: units.gu(1.5)
             }
-            height: units.gu(1.5)
+            height: units.gu(1)
             visible: root.progress > -1
-            source: "graphics/progressbar-trough.sci"
-
-            // For fill calculation we need to remove the 2 units of border defined in .sci file
-            property int adjustedWidth: width - units.gu(2)
+            color: UbuntuColors.darkGrey
+            borderSource: "none"
 
             Item {
                 anchors {
@@ -124,20 +200,22 @@
                     top: parent.top
                     bottom: parent.bottom
                 }
-                width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
+                width: Math.min(100, root.progress) / 100 * parent.width
                 clip: true
 
-                BorderImage {
+                UbuntuShape {
                     anchors {
                         left: parent.left
                         top: parent.top
                         bottom: parent.bottom
                     }
+                    color: "white"
+                    borderSource: "none"
                     width: progressOverlay.width
-                    source: "graphics/progressbar-fill.sci"
                 }
             }
         }
+
         Image {
             objectName: "focusedHighlight"
             anchors {
@@ -167,6 +245,14 @@
         }
 
         transform: [
+            // The rotation about the icon's center/z-axis for the wiggle
+            // needs to happen here too, because there's no other way to
+            // align the wiggle with the icon-folding otherwise
+            Rotation {
+                axis { x: 0; y: 0; z: 1 }
+                origin { x: iconItem.width / 2; y: iconItem.height / 2; z: 0 }
+                angle: priv.wiggleAngle
+            },
             // Rotating 3 times at top/bottom because that increases the perspective.
             // This is a hack, but as QML does not support real 3D coordinates
             // getting a higher perspective can only be done by a hack. This is the most

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-07-01 11:39:49 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-07-23 14:15:26 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItems
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 0.1
@@ -86,6 +86,7 @@
             height: parent.height - dashItem.height - parent.spacing*2
 
             Item {
+                id: launcherListViewItem
                 anchors.fill: parent
                 clip: true
 
@@ -109,12 +110,21 @@
                     preferredHighlightBegin: (height - itemHeight) / 2
                     preferredHighlightEnd: (height + itemHeight) / 2
 
+                    // for the single peeking icon, when alert-state is set on delegate
+                    property int peekingIndex: -1
+
                     // The size of the area the ListView is extended to make sure items are not
                     // destroyed when dragging them outside the list. This needs to be at least
                     // itemHeight to prevent folded items from disappearing and DragArea limits
                     // need to be smaller than this size to avoid breakage.
                     property int extensionSize: 0
 
+                    // These properties are needed to facilitate implicitly unfolding the
+                    // launcher to the peeking icon, if it is not already fully flat
+                    // and in view for the user
+                    property real moveToIndexYFrom
+                    property real moveToIndexYTo
+
                     // Setting extensionSize after the list has been populated because it has
                     // the potential to mess up with the intial positioning in combination
                     // with snapping to the center of the list. This catches all the cases
@@ -128,6 +138,14 @@
                         flick(0, clickFlickSpeed)
                     }
 
+                    UbuntuNumberAnimation {
+                        id: moveToIndexAnimation
+                        target: launcherListView
+                        property: "contentY"
+                        from: launcherListView.moveToIndexYFrom
+                        to: launcherListView.moveToIndexYTo
+                    }
+
                     // The height of the area where icons start getting folded
                     property int foldingStartHeight: units.gu(6.5)
                     // The height of the area where the items reach the final folding angle
@@ -180,10 +198,63 @@
                         progress: model.progress
                         itemFocused: model.focused
                         inverted: root.inverted
+                        alerting: model.alerting
                         z: -Math.abs(offset)
                         maxAngle: 55
                         property bool dragging: false
 
+                        SequentialAnimation {
+                            id: peekingAnimation
+
+                            // revealing
+                            PropertyAction { target: root; property: "visible"; value: (launcher.visibleWidth === 0) ? 1 : 0 }
+                            PropertyAction { target: launcherListViewItem; property: "clip"; value: 0 }
+
+                            UbuntuNumberAnimation {
+                                target: launcherDelegate
+                                alwaysRunToEnd: true
+                                loops: 1
+                                properties: "x"
+                                to: (units.gu(.5) + launcherListView.width * .5) * (root.inverted ? -1 : 1)
+                                duration: UbuntuAnimation.BriskDuration
+                            }
+
+                            // hiding
+                            UbuntuNumberAnimation {
+                                target: launcherDelegate
+                                alwaysRunToEnd: true
+                                loops: 1
+                                properties: "x"
+                                to: 0
+                                duration: UbuntuAnimation.BriskDuration
+                            }
+
+                            PropertyAction { target: launcherListViewItem; property: "clip"; value: 1 }
+                            PropertyAction { target: root; property: "visible"; value: (launcher.visibleWidth === 0) ? 0 : 1 }
+                        }
+
+                        onAlertingChanged: {
+                            if(alerting) {
+                                if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
+                                    launcherListView.moveToIndexYFrom = launcherListView.contentY
+                                    launcherListView.positionViewAtIndex(index, ListView.Center)
+                                    launcherListView.moveToIndexYTo = launcherListView.contentY
+                                    moveToIndexAnimation.start()
+                                    if (!dragging && launcher.state !== "visible") {
+                                        peekingAnimation.start()
+                                    }
+                                }
+
+                                if (launcherListView.peekingIndex === -1) {
+                                    launcherListView.peekingIndex = index
+                                }
+                            } else {
+                                if (launcherListView.peekingIndex === index) {
+                                    launcherListView.peekingIndex = -1
+                                }
+                            }
+                        }
+
                         ThinDivider {
                             id: dropIndicator
                             objectName: "dropIndicator"
@@ -286,6 +357,7 @@
                     MouseArea {
                         id: dndArea
                         objectName: "dndArea"
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
                         anchors {
                             fill: parent
                             topMargin: launcherListView.topMargin
@@ -297,7 +369,7 @@
                         property int draggedIndex: -1
                         property var selectedItem
                         property bool preDragging: false
-                        property bool dragging: selectedItem !== undefined && selectedItem !== null && selectedItem.dragging
+                        property bool dragging: !!selectedItem && selectedItem.dragging
                         property bool postDragging: false
                         property int startX
                         property int startY
@@ -315,6 +387,15 @@
                                 return;
                             }
 
+                            if (mouse.button & Qt.RightButton) { // context menu
+                                // Opening QuickList
+                                quickList.item = clickedItem;
+                                quickList.model = launcherListView.model.get(index).quickList;
+                                quickList.appId = launcherListView.model.get(index).appId;
+                                quickList.state = "open";
+                                return
+                            }
+
                             // First/last item do the scrolling at more than 12 degrees
                             if (index == 0 || index == launcherListView.count - 1) {
                                 if (clickedItem.angle > 12) {
@@ -508,7 +589,7 @@
         id: quickListShape
         objectName: "quickListShape"
         anchors.fill: quickList
-        opacity: quickList.state === "open" ? 0.96 : 0
+        opacity: quickList.state === "open" ? 0.8 : 0
         visible: opacity > 0
         rotation: root.rotation
 
@@ -520,15 +601,15 @@
 
         Image {
             anchors {
-                left: parent.left
-                leftMargin: quickList.item ? (quickList.item.width - units.gu(1)) / 2 - width / 2 : 0
+                right: parent.left
+                rightMargin: -units.dp(4)
                 verticalCenter: parent.verticalCenter
-                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
+                verticalCenterOffset: -quickList.offset * (root.inverted ? -1 : 1)
             }
             height: units.gu(1)
             width: units.gu(2)
             source: "graphics/quicklist_tooltip.png"
-            rotation: (quickList.offset > 0 ? 0 : 180) + (root.inverted ? 0 : 180)
+            rotation: 90
         }
 
         InverseMouseArea {
@@ -551,11 +632,11 @@
         height: quickListColumn.height
         visible: quickListShape.visible
         anchors {
-            left: root.inverted ? undefined : parent.left
-            right: root.inverted ? parent.right : undefined
+            left: root.inverted ? undefined : parent.right
+            right: root.inverted ? parent.left : undefined
             margins: units.gu(1)
         }
-        y: itemCenter + offset
+        y: itemCenter - (height / 2) + offset
         rotation: root.rotation
 
         property var model
@@ -564,10 +645,8 @@
 
         // internal
         property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
-        property int offset: item ? itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
-                                 -(item.height/2) - height - units.gu(.5) :
-                                 (item.height/2) + units.gu(.5) :
-                                    0
+        property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
+                             itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
 
         Column {
             id: quickListColumn

=== removed file 'qml/Launcher/graphics/[e-mail]'
Binary files qml/Launcher/graphics/[e-mail]	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/Launcher/graphics/[e-mail]'
--- qml/Launcher/graphics/[e-mail]	2013-08-19 19:34:03 +0000
+++ qml/Launcher/graphics/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-border.left: 36
-border.top: 16
-border.bottom: 28
-border.right: 36
-source: [e-mail]
\ No newline at end of file

=== removed file 'qml/Launcher/graphics/[e-mail]'
Binary files qml/Launcher/graphics/[e-mail]	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/Launcher/graphics/[e-mail]'
--- qml/Launcher/graphics/[e-mail]	2013-08-19 19:34:03 +0000
+++ qml/Launcher/graphics/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-border.left: 36
-border.top: 16
-border.bottom: 26
-border.right: 36
-source: [e-mail]
\ No newline at end of file

=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
--- tests/mocks/Unity/Launcher/CMakeLists.txt	2015-04-13 09:33:28 +0000
+++ tests/mocks/Unity/Launcher/CMakeLists.txt	2015-07-23 14:15:26 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2014-09-03 13:30:52 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2015-07-23 14:15:26 +0000
@@ -37,9 +37,13 @@
     m_count(0),
     m_countVisible(false),
     m_focused(false),
+    m_alerting(false),
     m_quickList(new MockQuickListModel(this))
 {
+}
 
+MockLauncherItem::~MockLauncherItem()
+{
 }
 
 QString MockLauncherItem::appId() const
@@ -129,6 +133,9 @@
     {
         m_count = count;
         Q_EMIT countChanged(count);
+        if (m_countVisible) {
+            setAlerting(true);
+        }
     }
 }
 
@@ -142,6 +149,9 @@
     if (m_countVisible != countVisible) {
         m_countVisible = countVisible;
         Q_EMIT countVisibleChanged(countVisible);
+        if (countVisible) {
+            setAlerting(true);
+        }
     }
 }
 
@@ -159,6 +169,18 @@
     }
 }
 
+bool MockLauncherItem::alerting() const
+{
+    return m_alerting;
+}
+
+void MockLauncherItem::setAlerting(bool alerting)
+{
+    if (m_alerting != alerting) {
+        m_alerting = alerting;
+        Q_EMIT alertingChanged(alerting);
+    }
+}
 
 unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const
 {

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-04-30 09:31:51 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-07-23 14:15:26 +0000
@@ -31,6 +31,7 @@
     Q_OBJECT
 public:
     MockLauncherItem(const QString &appId, const QString& desktopFile, const QString& name, const QString& icon, QObject* parent = 0);
+    ~MockLauncherItem();
 
     QString appId() const override;
     QString desktopFile() const;
@@ -44,6 +45,7 @@
     int count() const override;
     bool countVisible() const override;
     bool focused() const override;
+    bool alerting() const override;
 
     unity::shell::launcher::QuickListModelInterface *quickList() const override;
 
@@ -55,6 +57,7 @@
     void setCount(int count);
     void setCountVisible(bool countVisible);
     void setFocused(bool focused);
+    void setAlerting(bool alerting);
 
     QString m_appId;
     QString m_desktopFile;
@@ -67,6 +70,7 @@
     int m_count;
     bool m_countVisible;
     bool m_focused;
+    bool m_alerting;
     MockQuickListModel *m_quickList;
 
     friend class MockLauncherModel;

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-03-06 04:44:11 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-07-23 14:15:26 +0000
@@ -34,6 +34,7 @@
     item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
     item->setProgress(50);
     item->setCountVisible(true);
+    item->setAlerting(false);
     m_list.append(item);
     item = new MockLauncherItem("music-app", "/usr/share/applications/music-app.desktop", "Music", "soundcloud", this);
     m_list.append(item);
@@ -43,25 +44,31 @@
     item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
     item->setCount(1);
     item->setCountVisible(true);
+    item->setRunning(true);
+    item->setAlerting(false);
     m_list.append(item);
     item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);
     item->setCount(12);
     item->setCountVisible(true);
+    item->setAlerting(false);
     item->setPinned(true);
     m_list.append(item);
     item = new MockLauncherItem("gmail-webapp", "/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail", this);
     item->setCount(123);
     item->setCountVisible(true);
+    item->setAlerting(false);
     m_list.append(item);
     item = new MockLauncherItem("ubuntu-weather-app", "/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather", this);
     item->setCount(1234567890);
     item->setCountVisible(true);
+    item->setAlerting(false);
     item->setPinned(true);
     m_list.append(item);
     item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);
     item->setProgress(50);
     item->setCount(5);
     item->setCountVisible(true);
+    item->setAlerting(false);
     item->setFocused(true);
     item->setPinned(true);
     m_list.append(item);
@@ -105,6 +112,8 @@
         return item->countVisible();
     case RoleFocused:
         return item->focused();
+    case RoleAlerting:
+        return item->alerting();
     }
 
     return QVariant();
@@ -119,6 +128,18 @@
     return m_list.at(index);
 }
 
+void MockLauncherModel::setAlerting(const QString &appId, bool alerting) {
+    int index = findApp(appId);
+    if (index >= 0) {
+        QModelIndex modelIndex = this->index(index);
+        MockLauncherItem *item = m_list.at(index);
+        if (!item->focused()) {
+            item->setAlerting(alerting);
+            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
+        }
+    }
+}
+
 void MockLauncherModel::move(int oldIndex, int newIndex)
 {
     // Make sure its not moved outside the lists
@@ -174,7 +195,9 @@
     int index = findApp(appId);
     if (index >= 0) {
         beginRemoveRows(QModelIndex(), index, 0);
-        m_list.takeAt(index)->deleteLater();
+        MockLauncherItem * item = m_list.takeAt(index);
+        item->setRunning(false);
+        item->deleteLater();
         endRemoveRows();
     }
 }
@@ -195,6 +218,16 @@
     return -1;
 }
 
+void MockLauncherModel::setProgress(const QString &appId, int progress)
+{
+    int index = findApp(appId);
+    if (index >= 0) {
+        m_list.at(index)->setProgress(progress);
+        QModelIndex modelIndex = this->index(index);
+        Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleProgress);
+    }
+}
+
 void MockLauncherModel::setUser(const QString &username)
 {
     Q_UNUSED(username)
@@ -226,6 +259,26 @@
     Q_EMIT hint();
 }
 
+void MockLauncherModel::setCount(const QString &appId, int count)
+{
+    int index = findApp(appId);
+    if (index >= 0) {
+        m_list.at(index)->setCount(count);
+        QModelIndex modelIndex = this->index(index);
+        Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleCount);
+    }
+}
+
+void MockLauncherModel::setCountVisible(const QString &appId, bool countVisible)
+{
+    int index = findApp(appId);
+    if (index >= 0) {
+        m_list.at(index)->setCountVisible(countVisible);
+        QModelIndex modelIndex = this->index(index);
+        Q_EMIT dataChanged(modelIndex, modelIndex);
+    }
+}
+
 unity::shell::application::ApplicationManagerInterface *MockLauncherModel::applicationManager() const
 {
     return nullptr;

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.h'
--- tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-04-30 09:31:51 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-07-23 14:15:26 +0000
@@ -38,6 +38,7 @@
 
     QVariant data(const QModelIndex& index, int role) const override;
 
+    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;
     Q_INVOKABLE void move(int oldIndex, int newIndex) override;
     Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
@@ -54,6 +55,9 @@
 
     // For testing
     Q_INVOKABLE void emitHint();
+    Q_INVOKABLE void setProgress(const QString &appId, int progress);
+    Q_INVOKABLE void setCount(const QString &appId, int count);
+    Q_INVOKABLE void setCountVisible(const QString &appId, bool countVisible);
 
 Q_SIGNALS:
     void quickListTriggered(const QString &appId, int index);

=== modified file 'tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-06-17 12:14:27 +0000
+++ tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-07-23 14:15:26 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
 
 include_directories(

=== modified file 'tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp'
--- tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2015-02-11 14:11:26 +0000
+++ tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2015-07-23 14:15:26 +0000
@@ -43,6 +43,7 @@
         item.insert("name", "Item 1");
         item.insert("icon", "fake.svg");
         item.insert("count", 0);
+        item.insert("progress", 0);
         item.insert("countVisible", false);
         item.insert("pinned", true);
         list.append(item);
@@ -67,6 +68,7 @@
             inSync &= model->get(i)->name() == list.at(i).value("name").toString();
             inSync &= model->get(i)->icon() == list.at(i).value("icon").toString();
             inSync &= model->get(i)->count() == list.at(i).value("count").toInt();
+            inSync &= model->get(i)->progress() == list.at(i).value("progress").toInt();
             inSync &= model->get(i)->countVisible() == list.at(i).value("countVisible").toBool();
         }
         return inSync;
@@ -111,6 +113,7 @@
         newEntry.insert("name", "New app");
         newEntry.insert("icon", "some-icon.svg");
         newEntry.insert("count", 0);
+        newEntry.insert("progress", 42);
         newEntry.insert("countVisible", false);
         newEntry.insert("pinned", true);
         newList.append(newEntry);

=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2015-06-17 12:14:27 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2015-07-23 14:15:26 +0000
@@ -1,5 +1,5 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-06-12 16:07:43 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-07-23 14:15:26 +0000
@@ -68,6 +68,7 @@
     Q_OBJECT
 public:
     MockAppManager(QObject *parent = 0): ApplicationManagerInterface(parent) {}
+    ~MockAppManager() {}
     int rowCount(const QModelIndex &) const override { return m_list.count(); }
     QVariant data(const QModelIndex &, int ) const override { return QVariant(); }
     QString focusedApplicationId() const override {
@@ -325,6 +326,46 @@
         QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));
     }
 
+    void testQuitMenuItem() {
+        // we have 2 apps running, both should have the Quit action in its quick list
+        QCOMPARE(launcherModel->rowCount(), 2);
+
+        // stop the second one keeping it pinned so that it doesn't go away
+        launcherModel->pin("no-icon");
+        appManager->stopApplication("no-icon");
+
+        // find the first Quit item, should be there
+        QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());
+        int quitActionIndex = -1;
+        for (int i = 0; i < model->rowCount(); ++i) {
+            if (model->get(i).actionId() == "stop_item") {
+                quitActionIndex = i;
+                break;
+            }
+        }
+        QVERIFY(quitActionIndex >= 0);
+
+        // find the second Quit item, should NOT be there, the app is stopped
+        QuickListModel *model2 = qobject_cast<QuickListModel*>(launcherModel->get(1)->quickList());
+        int quitActionIndex2 = -1;
+        for (int i = 0; i < model2->rowCount(); ++i) {
+            if (model2->get(i).actionId() == "stop_item") {
+                quitActionIndex2 = i;
+                break;
+            }
+        }
+        QVERIFY(quitActionIndex2 == -1);
+
+        // trigger the first quit item quicklist action
+        launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), quitActionIndex);
+        // first app should be gone...
+        QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
+        // ... the second app (now at index 0) should still be there, pinned and stopped
+        QCOMPARE(launcherModel->get(0)->appId(), QStringLiteral("no-icon"));
+        QCOMPARE(launcherModel->get(0)->pinned(), true);
+        QCOMPARE(launcherModel->get(0)->running(), false);
+    }
+
     void testGetUrlForAppId() {
         QCOMPARE(launcherModel->getUrlForAppId(QString()), QString());
         QCOMPARE(launcherModel->getUrlForAppId(""), QString());
@@ -368,11 +409,18 @@
     }
 
     void testCountEmblems() {
+        QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+
         // Call GetAll on abs-icon
         QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
         QDBusReply<QVariantMap> reply = interface.call("GetAll");
         QVariantMap map = reply.value();
 
+        // Check that the alerting-status is still false, and the item on the upper side of the API
+        int index = launcherModel->findApplication("abs-icon");
+        QCOMPARE(index >= 0, true);
+        QVERIFY(launcherModel->get(index)->alerting() == false);
+
         // Make sure GetAll returns a map with count and countVisible props
         QCOMPARE(map.contains("count"), true);
         QCOMPARE(map.contains("countVisible"), true);
@@ -393,13 +441,8 @@
         QCOMPARE(map.value("count").toInt(), 55);
         QCOMPARE(map.value("countVisible").toBool(), true);
 
-        // Now the item on the upper side of the API
-        int index = launcherModel->findApplication("abs-icon");
-        QCOMPARE(index >= 0, true);
-
-        // And make sure values have changed there as well
-        QCOMPARE(launcherModel->get(index)->countVisible(), true);
-        QCOMPARE(launcherModel->get(index)->count(), 55);
+        // Finally check, that the change to "count" implicitly also set the alerting-state to true
+        QVERIFY(launcherModel->get(index)->alerting() == true);
     }
 
     void testCountEmblemAddsRemovesItem_data() {
@@ -459,6 +502,20 @@
         QCOMPARE(index == -1, !isRunning && !isPinned && !startWhenVisible);
     }
 
+    void testAlert() {
+        // Check that the alerting-status is still false
+        int index = launcherModel->findApplication("abs-icon");
+        QCOMPARE(index >= 0, true);
+        QVERIFY(launcherModel->get(index)->alerting() == false);
+
+        // Call Alert() on "abs-icon"
+        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "com.canonical.Unity.Launcher.Item");
+        interface.call("Alert");
+
+        // Check that the alerting-status is now true
+        QVERIFY(launcherModel->get(index)->alerting() == true);
+    }
+
     void testRefreshAfterDeletedDesktopFiles_data() {
         QTest::addColumn<bool>("deleted");
         QTest::newRow("have .desktop files") << false;

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-04-24 09:53:37 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-07-23 14:15:26 +0000
@@ -93,6 +93,57 @@
             onClicked: launcherLoader.item.inverted = !launcherLoader.item.inverted
             Layout.fillWidth: true
         }
+
+        Row {
+            spacing: units.gu(1)
+
+            Button {
+                text: "35% bar"
+                onClicked: LauncherModel.setProgress(LauncherModel.get(parseInt(appIdEntryBar.displayText)).appId, 35)
+                Layout.fillWidth: true
+            }
+
+            TextArea {
+                id: appIdEntryBar
+                anchors.verticalCenter: parent.verticalCenter
+                width: units.gu(4)
+                height: units.gu(4)
+                autoSize: true
+                text: "2"
+                maximumLineCount: 1
+            }
+
+            Button {
+                text: "no bar"
+                onClicked: LauncherModel.setProgress(LauncherModel.get(parseInt(appIdEntryBar.displayText)).appId, -1)
+                Layout.fillWidth: true
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+
+            Button {
+                text: "set alert"
+                onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, true)
+            }
+
+            TextArea {
+                id: appIdEntryAlert
+                anchors.verticalCenter: parent.verticalCenter
+                width: units.gu(5)
+                height: units.gu(4)
+                autoSize: true
+                text: "2"
+                maximumLineCount: 1
+                Layout.fillWidth: true
+            }
+
+            Button {
+                text: "unset alert"
+                onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, false)
+            }
+        }
     }
 
     SignalSpy {
@@ -146,7 +197,7 @@
                        startX+units.gu(8), startY);
 
             var panel = findChild(launcher, "launcherPanel");
-            verify(panel != undefined);
+            verify(!!panel);
 
             // wait until it gets fully extended
             tryCompare(panel, "x", 0);
@@ -157,7 +208,7 @@
             mouseMove(root, 1, root.height / 2);
 
             var panel = findChild(launcher, "launcherPanel");
-            verify(panel != undefined);
+            verify(!!panel);
 
             // wait until it gets fully extended
             tryCompare(panel, "x", 0);
@@ -169,6 +220,16 @@
             tryCompare(panel, "x", -panel.width, 1000);
         }
 
+        function waitForWiggleToStart(appIcon) {
+            verify(appIcon != undefined)
+            tryCompare(appIcon, "wiggling", true, 1000, "wiggle-anim should not be in stopped state")
+        }
+
+        function waitForWiggleToStop(appIcon) {
+            verify(appIcon != undefined)
+            tryCompare(appIcon, "wiggling", false, 1000, "wiggle-anim should not be in running state")
+        }
+
         function positionLauncherListAtBeginning() {
             var listView = testCase.findChild(launcherLoader.item, "launcherListView");
             listView.contentY = -listView.topMargin;
@@ -187,7 +248,7 @@
             waitUntilLauncherDisappears();
 
             var panel = findChild(launcher, "launcherPanel")
-            verify(panel != undefined)
+            verify(!!panel)
 
             // it starts out hidden just left of the left launcher edge
             compare(panel.x, -panel.width)
@@ -225,7 +286,7 @@
 
             var appIcon = findChild(launcher, "launcherDelegate0");
 
-            verify(appIcon != undefined);
+            verify(!!appIcon);
 
             if (data.mouse) {
                 mouseClick(appIcon);
@@ -248,7 +309,7 @@
             dragLauncherIntoView()
 
             var dashIcon = findChild(launcher, "dashItem")
-            verify(dashIcon != undefined)
+            verify(!!dashIcon)
 
             mouseClick(dashIcon)
 
@@ -538,7 +599,7 @@
 
             // Doing longpress
             mousePress(draggedItem);
-            tryCompare(quickListShape, "opacity", 0.96);
+            tryCompare(quickListShape, "opacity", 0.8);
             mouseRelease(draggedItem);
 
             verify(quickList.y >= units.gu(1));
@@ -623,9 +684,31 @@
             tryCompare(quickList, "state", "");
         }
 
+        function test_quickListMenuOnRMB() {
+            dragLauncherIntoView();
+            var clickedItem = findChild(launcher, "launcherDelegate5")
+            var quickList = findChild(launcher, "quickList")
+            var quickListShape = findChild(launcher, "quickListShape")
+            var dndArea = findChild(launcher, "dndArea");
+
+            // Initial state
+            tryCompare(quickListShape, "visible", false)
+
+            // Doing RMB click
+            mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)
+            tryCompare(quickListShape, "visible", true)
+            verify(quickList, "state", "open")
+            verify(dndArea, "dragging", false)
+
+            // Click somewhere in the empty space to dismiss the quicklist
+            mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
+            tryCompare(quickListShape, "visible", false);
+            verify(quickList, "state", "")
+        }
+
         function test_revealByHover() {
             var panel = findChild(launcher, "launcherPanel");
-            verify(panel != undefined);
+            verify(!!panel);
 
             revealByHover();
             tryCompare(launcher, "state", "visibleTemporary");
@@ -636,5 +719,125 @@
             tryCompare(launcher, "state", "", 1000, "Launcher didn't hide after moving mouse away from it");
             waitUntilLauncherDisappears();
         }
+
+        function test_progressChangeViaModel() {
+            dragLauncherIntoView();
+            var item = findChild(launcher, "launcherDelegate0")
+            verify(item != undefined)
+            LauncherModel.setProgress(LauncherModel.get(0).appId, -1)
+            compare(findChild(item, "progressOverlay").visible, false)
+            LauncherModel.setProgress(LauncherModel.get(0).appId, 20)
+            compare(findChild(item, "progressOverlay").visible, true)
+            LauncherModel.setProgress(LauncherModel.get(0).appId, 0)
+        }
+
+        function test_alertPeekingIcon() {
+            var listView = findChild(launcher, "launcherListView")
+            verify(listView != undefined)
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
+            tryCompare(listView, "peekingIndex", 5, 1000, "Wrong appId set as peeking-index")
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
+            tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
+        }
+
+        function test_alertHidingIcon() {
+            var listView = findChild(launcher, "launcherListView")
+            verify(listView != undefined)
+            var appIcon6 = findChild(launcher, "launcherDelegate6")
+            verify(appIcon6 != undefined)
+            LauncherModel.setAlerting(LauncherModel.get(6).appId, true)
+            waitForWiggleToStart(appIcon6)
+            LauncherModel.setAlerting(LauncherModel.get(6).appId, false)
+            waitForWiggleToStop(appIcon6)
+            tryCompare(appIcon6, "x", 0, 1000, "x-value of appId #6 should not be non-zero")
+            waitForRendering(listView)
+        }
+
+        function test_alertIgnoreFocusedApp() {
+            LauncherModel.setAlerting(LauncherModel.get(0).appId, true)
+            compare(LauncherModel.get(0).alerting, false, "Focused app should not have the alert-state set")
+        }
+
+        function test_alertOnlyOnePeekingIcon() {
+            var listView = findChild(launcher, "launcherListView")
+            verify(listView != undefined)
+            LauncherModel.setAlerting(LauncherModel.get(3).appId, true)
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, true)
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
+            tryCompare(listView, "peekingIndex", 3, 1000, "Wrong appId set as peeking-index")
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
+            LauncherModel.setAlerting(LauncherModel.get(3).appId, false)
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
+            tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
+            waitForRendering(listView)
+        }
+
+        function test_alertMultipleApps() {
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, true)
+            LauncherModel.setAlerting(LauncherModel.get(3).appId, true)
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
+            LauncherModel.setAlerting(LauncherModel.get(7).appId, true)
+            compare(LauncherModel.get(1).alerting, true, "Alert-state of appId #1 should not be false")
+            compare(LauncherModel.get(3).alerting, true, "Alert-state of appId #3 should not be false")
+            compare(LauncherModel.get(5).alerting, true, "Alert-state of appId #5 should not be false")
+            compare(LauncherModel.get(7).alerting, true, "Alert-state of appId #7 should not be false")
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
+            LauncherModel.setAlerting(LauncherModel.get(3).appId, false)
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
+            LauncherModel.setAlerting(LauncherModel.get(7).appId, false)
+            compare(LauncherModel.get(1).alerting, false, "Alert-state of appId #1 should not be true")
+            compare(LauncherModel.get(3).alerting, false, "Alert-state of appId #1 should not be true")
+            compare(LauncherModel.get(5).alerting, false, "Alert-state of appId #1 should not be true")
+            compare(LauncherModel.get(7).alerting, false, "Alert-state of appId #1 should not be true")
+        }
+
+        function test_alertMoveIconIntoView() {
+            dragLauncherIntoView();
+            var appIcon1 = findChild(launcher, "launcherDelegate1");
+            var appIcon7 = findChild(launcher, "launcherDelegate7");
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, true)
+            tryCompare(appIcon1, "angle", 0, 1000, "angle of appId #1 should not be non-zero")
+            waitForWiggleToStart(appIcon1)
+            LauncherModel.setAlerting(LauncherModel.get(7).appId, true)
+            tryCompare(appIcon7, "angle", 0, 1000, "angle of appId #7 should not be non-zero")
+            waitForWiggleToStart(appIcon7)
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
+            waitForWiggleToStop(appIcon1)
+            LauncherModel.setAlerting(LauncherModel.get(7).appId, false)
+            waitForWiggleToStop(appIcon7)
+        }
+
+        function test_alertWigglePeekDrag() {
+            var appIcon5 = findChild(launcher, "launcherDelegate5");
+            var listView = findChild(launcher, "launcherListView")
+            verify(listView != undefined)
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
+            tryCompare(listView, "peekingIndex", 5, 1000, "Wrong appId set as peeking-index")
+            waitForWiggleToStart(appIcon5)
+            tryCompare(appIcon5, "wiggling", true, 1000, "appId #6 should not be still")
+            dragLauncherIntoView();
+            tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
+            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
+            waitForWiggleToStop(appIcon5)
+            tryCompare(appIcon5, "wiggling", false, 1000, "appId #1 should not be wiggling")
+        }
+
+        function test_alertViaCountAndCountVisible() {
+            dragLauncherIntoView();
+            var appIcon1 = findChild(launcher, "launcherDelegate1")
+            var oldCount = LauncherModel.get(1).count
+            LauncherModel.setCount(LauncherModel.get(1).appId, 42)
+            tryCompare(appIcon1, "wiggling", false, 1000, "appId #1 should be still")
+            LauncherModel.setCountVisible(LauncherModel.get(1).appId, 1)
+            tryCompare(appIcon1, "wiggling", true, 1000, "appId #1 should not be still")
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
+            waitForWiggleToStop(appIcon1)
+            LauncherModel.setCount(LauncherModel.get(1).appId, 4711)
+            tryCompare(appIcon1, "wiggling", true, 1000, "appId #1 should not be still")
+            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
+            waitForWiggleToStop(appIcon1)
+            LauncherModel.setCountVisible(LauncherModel.get(1).appId, 0)
+            LauncherModel.setCount(LauncherModel.get(1).appId, oldCount)
+        }
     }
 }

=== added directory 'tests/scripts'
=== added file 'tests/scripts/README'
--- tests/scripts/README	1970-01-01 00:00:00 +0000
+++ tests/scripts/README	2015-07-23 14:15:26 +0000
@@ -0,0 +1,9 @@
+This directory holds a few handy shell-scripts to simplify runtime-testing of DBus-APIs (requires qdbus-qt5 to be installed).
+
+launcher-icon related:
+ * list-launcher-icons.sh - get all icons of unity8-launcher
+ * alert-launcher-icon.sh - trigger alert/wiggle of unfocused launcher-icon
+ * get-progress.sh - get progress-value of a launcher-icon
+ * set-progress.sh - set progress-value of a launcher-icon
+ * set-count.sh - set the count of a launcher-icon
+ * set-count-visible.sh - set the count-visible flag of a launcher-icon

=== added file 'tests/scripts/alert-launcher-icon.sh'
--- tests/scripts/alert-launcher-icon.sh	1970-01-01 00:00:00 +0000
+++ tests/scripts/alert-launcher-icon.sh	2015-07-23 14:15:26 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 com.canonical.Unity.Launcher.Item.Alert

=== added file 'tests/scripts/get-progress.sh'
--- tests/scripts/get-progress.sh	1970-01-01 00:00:00 +0000
+++ tests/scripts/get-progress.sh	2015-07-23 14:15:26 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Get com.canonical.Unity.Launcher.Item progress

=== added file 'tests/scripts/list-launcher-icons.sh'
--- tests/scripts/list-launcher-icons.sh	1970-01-01 00:00:00 +0000
+++ tests/scripts/list-launcher-icons.sh	2015-07-23 14:15:26 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qdbus com.canonical.Unity | grep Launcher | cut -f6 -d/

=== added file 'tests/scripts/set-count-visible.sh'
--- tests/scripts/set-count-visible.sh	1970-01-01 00:00:00 +0000
+++ tests/scripts/set-count-visible.sh	2015-07-23 14:15:26 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Set com.canonical.Unity.Launcher.Item countVisible $2

=== added file 'tests/scripts/set-count.sh'
--- tests/scripts/set-count.sh	1970-01-01 00:00:00 +0000
+++ tests/scripts/set-count.sh	2015-07-23 14:15:26 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Set com.canonical.Unity.Launcher.Item count $2

=== added file 'tests/scripts/set-progress.sh'
--- tests/scripts/set-progress.sh	1970-01-01 00:00:00 +0000
+++ tests/scripts/set-progress.sh	2015-07-23 14:15:26 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Set com.canonical.Unity.Launcher.Item progress $2