Merge lp:~uriboni/unity-2d/add-fav-from-software-center into lp:unity-2d/3.0

[Ugo Riboni]

[launcher] Expose a new DBUS method that will be called by Software Center to add new favorites

This MR exposes an object to DBUS that exposes a method that when called causes a new favorite to be added to the Launcher.

This method is currently only called by Software Center in this branch:
lp:~gary-lasker/software-center/launcher-integration-plan-b

To run from that branch to test, you can run from the checkout directory:
PYTHONPATH=. python ./software-center

Note that this implements only a small part of the full spec, but it was agreed that's all we need for Natty with Unity and Software Center developers.

[Florian Boucault (fboucault)]

The code is good. The current behaviour is reliable.

However there are several user experience issues:
- if the launcher is hidden, it should show when adding the favorite (the same way it shows when an application requests attention)
- the added item should wiggle (the same way it shows when an application requests attention) as to help the user figure out where the application is
- [SOFTWARE CENTER SPECIFIC] the option of adding to the launcher is not very noticeable at all
- [SOFTWARE CENTER SPECIFIC] the option of adding to the launcher disappears as soon as the installation is finished
- [SOFTWARE CENTER SPECIFIC] the option of adding to the launcher does not appear when clicking on the 'install' button from the list of applications

review: Needs Fixing

[lp:~uriboni/unity-2d/add-fav-from-software-center]

456. By Ugo Riboni on 2011-03-21

Make sure the shake animation for urgent apps doesn't always run for the entire 30 loops

457. By Ugo Riboni on 2011-03-21

When a new favorite is added via software center make it urgent for a bit to attract attention

458. By Ugo Riboni on 2011-03-21

Initialize the m_forceUrgent variable to prevent a bug

459. By Ugo Riboni on 2011-03-21

Revert previous incorrect fix.

460. By Ugo Riboni on 2011-03-21

Make sure the launcher tiles shake only as long as they are in urgent state.

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-03-14 15:25:50 +0000
+++ launcher/LauncherItem.qml	2011-03-21 18:22:07 +0000
@@ -318,7 +318,7 @@
                 alwaysRunToEnd: true
 
                 SequentialAnimation {
-                    loops: 30
+                    loops: (urgent) ? 30 : 0
                     NumberAnimation { target: tile; property: "rotation"; to: 15; duration: 150 }
                     NumberAnimation { target: tile; property: "rotation"; to: -15; duration: 150 }
                 }
 
=== modified file 'launcher/UnityApplications/CMakeLists.txt'
--- launcher/UnityApplications/CMakeLists.txt	2011-02-11 09:25:11 +0000
+++ launcher/UnityApplications/CMakeLists.txt	2011-03-21 18:22:07 +0000
@@ -15,6 +15,7 @@
     launcheritem.cpp
     launcherapplication.cpp
     launcherapplicationslist.cpp
+    launcherapplicationslistdbus.cpp
     launcherdevice.cpp
     launcherdeviceslist.cpp
     placeentry.cpp
@@ -32,6 +33,7 @@
     launcheritem.h
     launcherapplication.h
     launcherapplicationslist.h
+    launcherapplicationslistdbus.h
     launcherdevice.h
     launcherdeviceslist.h
     placeentry.h
 
=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-03-21 13:46:48 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-03-21 18:22:07 +0000
@@ -54,6 +54,7 @@
     , m_progress(0), m_progressBarVisible(false)
     , m_counter(0), m_counterVisible(false)
     , m_emblem(QString()), m_emblemVisible(false)
+    , m_forceUrgent(false)
 {
     /* Make sure wnck_set_client_type is called only once */
     static bool client_type_set = false;
@@ -128,6 +129,10 @@
 bool
 LauncherApplication::urgent() const
 {
+    if (m_forceUrgent) {
+        return true;
+    }
+
     if (m_application != NULL) {
         return m_application->urgent();
     }
@@ -135,6 +140,27 @@
     return false;
 }
 
+void
+LauncherApplication::beginForceUrgent(int duration)
+{
+    bool wasUrgent = urgent();
+    m_forceUrgent = true;
+    if (wasUrgent != urgent()) {
+        Q_EMIT urgentChanged(urgent());
+    }
+    QTimer::singleShot(duration, this, SLOT(endForceUrgent()));
+}
+
+void
+LauncherApplication::endForceUrgent()
+{
+    bool wasUrgent = urgent();
+    m_forceUrgent = false;
+    if (wasUrgent != urgent()) {
+        Q_EMIT urgentChanged(urgent());
+    }
+}
+
 bool
 LauncherApplication::sticky() const
 {
 
=== modified file 'launcher/UnityApplications/launcherapplication.h'
--- launcher/UnityApplications/launcherapplication.h	2011-03-11 01:14:28 +0000
+++ launcher/UnityApplications/launcherapplication.h	2011-03-21 18:22:07 +0000
@@ -37,6 +37,7 @@
 class LauncherApplication : public LauncherItem
 {
     Q_OBJECT
+    friend class LauncherApplicationsListDBUS;
 
     Q_PROPERTY(bool sticky READ sticky WRITE setSticky NOTIFY stickyChanged)
     Q_PROPERTY(QString application_type READ application_type NOTIFY applicationTypeChanged)
@@ -127,6 +128,8 @@
 
     void onDesktopFileChanged(const QString&);
     void checkDesktopFileReallyRemoved();
+    void beginForceUrgent(int duration);
+    void endForceUrgent();
 
 private:
     BamfApplication *m_application;
@@ -143,6 +146,7 @@
     bool m_counterVisible;
     QString m_emblem;
     bool m_emblemVisible;
+    bool m_forceUrgent;
 
     void updateBamfApplicationDependentProperties();
     void monitorDesktopFile(const QString&);
 
=== modified file 'launcher/UnityApplications/launcherapplicationslist.cpp'
--- launcher/UnityApplications/launcherapplicationslist.cpp	2011-03-11 15:44:28 +0000
+++ launcher/UnityApplications/launcherapplicationslist.cpp	2011-03-21 18:22:07 +0000
@@ -17,6 +17,7 @@
 #include "launcherapplication.h"
 #include "launcherapplicationslist.h"
 #include "webfavorite.h"
+#include "launcherapplicationslistdbus.h"
 
 #include "bamf-matcher.h"
 #include "bamf-application.h"
@@ -31,6 +32,8 @@
 #define FAVORITES_KEY QString("/desktop/unity-2d/launcher/favorites")
 #define DBUS_SERVICE_UNITY "com.canonical.Unity"
 #define DBUS_SERVICE_LAUNCHER_ENTRY "com.canonical.Unity.LauncherEntry"
+#define DBUS_SERVICE_LAUNCHER "com.canonical.Unity.Launcher"
+#define DBUS_OBJECT_LAUNCHER "/com/canonical/Unity/Launcher"
 
 LauncherApplicationsList::LauncherApplicationsList(QObject *parent) :
     QAbstractListModel(parent)
@@ -38,20 +41,34 @@
     m_favorites_list = new GConfItemQmlWrapper();
     m_favorites_list->setKey(FAVORITES_KEY);
 
+    QDBusConnection session = QDBusConnection::sessionBus();
     /* FIXME: libunity will send out the Update signal for LauncherEntries
        only if it finds com.canonical.Unity on the bus, so let's just quickly
        register ourselves as Unity here. Should be moved somewhere else more proper */
-    if (!QDBusConnection::sessionBus().registerService(DBUS_SERVICE_UNITY)) {
-        qWarning() << "The name com.canonical.Unity is already taken on the bus";
+    if (!session.registerService(DBUS_SERVICE_UNITY)) {
+        qWarning() << "The name" << DBUS_SERVICE_UNITY << "is already taken on DBUS";
     } else {
         /* Set ourselves up to receive any Update signal coming from any
            LauncherEntry */
-        QDBusConnection session = QDBusConnection::sessionBus();
         session.connect(QString(), QString(),
                         DBUS_SERVICE_LAUNCHER_ENTRY, "Update",
                         this, SLOT(onRemoteEntryUpdated(QString,QMap<QString,QVariant>)));
     }
 
+    if (!session.registerService(DBUS_SERVICE_LAUNCHER)) {
+        qWarning() << "The name" << DBUS_SERVICE_LAUNCHER << "is already taken on DBUS";
+    } else {
+        /* Set ourselves up to receive a method call from Software Center asking us to add
+           to favorites an application that is being installed and that the user requested
+           to be added. */
+        LauncherApplicationsListDBUS *dbusAdapter = new LauncherApplicationsListDBUS(this);
+        if (!session.registerObject(DBUS_OBJECT_LAUNCHER, dbusAdapter,
+                                    QDBusConnection::ExportAllSlots)) {
+            qWarning() << "The object" << DBUS_OBJECT_LAUNCHER << "on" << DBUS_SERVICE_LAUNCHER
+                       << "is already present on DBUS.";
+        }
+    }
+
     load();
 }
 
 
=== modified file 'launcher/UnityApplications/launcherapplicationslist.h'
--- launcher/UnityApplications/launcherapplicationslist.h	2011-03-11 14:56:13 +0000
+++ launcher/UnityApplications/launcherapplicationslist.h	2011-03-21 18:22:07 +0000
@@ -34,6 +34,7 @@
 class LauncherApplicationsList : public QAbstractListModel
 {
     Q_OBJECT
+    friend class LauncherApplicationsListDBUS;
 
 public:
     LauncherApplicationsList(QObject *parent = 0);
 
=== added file 'launcher/UnityApplications/launcherapplicationslistdbus.cpp'
--- launcher/UnityApplications/launcherapplicationslistdbus.cpp	1970-01-01 00:00:00 +0000
+++ launcher/UnityApplications/launcherapplicationslistdbus.cpp	2011-03-21 18:22:07 +0000
@@ -0,0 +1,30 @@
+#include "launcherapplication.h"
+#include "launcherapplicationslistdbus.h"
+#include "launcherapplicationslist.h"
+
+LauncherApplicationsListDBUS::LauncherApplicationsListDBUS(QObject *parent) :
+    QDBusAbstractAdaptor(parent)
+{
+}
+
+void
+LauncherApplicationsListDBUS::AddLauncherItemFromPosition(QString icon, QString title,
+                                                          int icon_x, int icon_y, int icon_size,
+                                                          QString desktop_file, QString aptdaemon_task)
+{
+    Q_UNUSED(icon)
+    Q_UNUSED(title)
+    Q_UNUSED(icon_x)
+    Q_UNUSED(icon_y)
+    Q_UNUSED(icon_size)
+    Q_UNUSED(aptdaemon_task)
+
+    LauncherApplicationsList* applicationsList = qobject_cast<LauncherApplicationsList*>(parent());
+    if (applicationsList != NULL && !desktop_file.isEmpty()) {
+        applicationsList->insertFavoriteApplication(desktop_file);
+        LauncherApplication *application = applicationsList->m_applicationForDesktopFile.value(desktop_file, NULL);
+        if (application != NULL) {
+            application->beginForceUrgent(1500);
+        }
+    }
+}
 
=== added file 'launcher/UnityApplications/launcherapplicationslistdbus.h'
--- launcher/UnityApplications/launcherapplicationslistdbus.h	1970-01-01 00:00:00 +0000
+++ launcher/UnityApplications/launcherapplicationslistdbus.h	2011-03-21 18:22:07 +0000
@@ -0,0 +1,22 @@
+#ifndef LAUNCHERAPPLICATIONSLISTDBUS_H
+#define LAUNCHERAPPLICATIONSLISTDBUS_H
+
+#include <QObject>
+#include <QtDBus/QDBusAbstractAdaptor>
+
+class LauncherApplicationsListDBUS : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.Launcher")
+
+public:
+    explicit LauncherApplicationsListDBUS(QObject *parent = 0);
+
+public Q_SLOTS:
+    void AddLauncherItemFromPosition(QString icon, QString title,
+                                     int icon_x, int icon_y, int icon_size,
+                                     QString desktop_file, QString aptdaemon_task);
+
+};
+
+#endif // LAUNCHERAPPLICATIONSLISTDBUS_H