Merge lp:~osomon/unity-2d/custom-quicklists-static into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Support static shortcuts in the quicklists.

Static shortcuts are defined in the application’s desktop file.
See https://wiki.ubuntu.com/Unity/LauncherAPI#Static%20Quicklist%20entries for documentation.

[Florian Boucault (fboucault)]

Behaves properly after extensive testing.

review: Approve (functional)

[Florian Boucault (fboucault)]

In launcher/UnityApplications/launchermenu.cpp:

[...]
    if (folded) {
        /* Remove all actions but the title. */
        for (int i = actions().size(); i > 0; --i) {
            QAction* action = actions().at(i - 1);
[...]

The use of a reverse for loop does not seem necessary. A forward one would be simpler. And even better would be to use a Q_FOREACH.

review: Needs Fixing

[Olivier Tilloy (osomon)]

> The use of a reverse for loop does not seem necessary. A forward one would be
> simpler. And even better would be to use a Q_FOREACH.

It *is* necessary because in this loop we are potentially removing the current action from the list, thus invalidating greater indexes. Iterating backward ensures the current index is always valid without having to resort to complex arithmetics.

[Florian Boucault (fboucault)]

> > The use of a reverse for loop does not seem necessary. A forward one would
> be
> > simpler. And even better would be to use a Q_FOREACH.
>
> It *is* necessary because in this loop we are potentially removing the current
> action from the list, thus invalidating greater indexes. Iterating backward
> ensures the current index is always valid without having to resort to complex
> arithmetics.

I had not seen that.
Q_FOREACH would still work in that case because it operates on a copy of the list as soon as it is modified I believe.

[Florian Boucault (fboucault)]

The rest of the code looks good.

review: Approve (code)

=== modified file 'launcher/UnityApplications/CMakeLists.txt'
--- launcher/UnityApplications/CMakeLists.txt	2011-03-22 22:55:11 +0000
+++ launcher/UnityApplications/CMakeLists.txt	2011-04-28 08:01:10 +0000
@@ -8,6 +8,7 @@
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(WNCK REQUIRED libwnck-1.0)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
+pkg_check_modules(INDICATOR REQUIRED indicator)
 
 # Sources
 set(UnityApplications_SRCS
@@ -70,6 +71,7 @@
     ${GIO_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     ${STARTUPNOTIFICATION_INCLUDE_DIRS}
+    ${INDICATOR_INCLUDE_DIRS}
     )
 
 target_link_libraries(UnityApplications
@@ -86,6 +88,7 @@
     ${GIO_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${STARTUPNOTIFICATION_LDFLAGS}
+    ${INDICATOR_LDFLAGS}
     )
 
 # Install
 
=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-04-14 14:27:36 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-04-28 08:01:10 +0000
@@ -61,6 +61,8 @@
 #include <libsn/sn.h>
 }
 
+const char* SHORTCUT_NICK_PROPERTY = "nick";
+
 LauncherApplication::LauncherApplication()
     : m_application(NULL)
     , m_desktopFileWatcher(NULL)
@@ -290,6 +292,10 @@
         Q_EMIT executableChanged(executable());
     }
 
+    /* Update the list of static shortcuts
+       (quicklist entries defined in the desktop file). */
+    m_staticShortcuts.reset(indicator_desktop_shortcuts_new(newDesktopFile.toUtf8().constData(), "Unity"));
+
     monitorDesktopFile(newDesktopFile);
 }
 
@@ -840,9 +846,27 @@
 void
 LauncherApplication::createStaticMenuActions()
 {
-    m_menu->addSeparator();
     QList<QAction*> actions;
 
+    /* Custom menu actions from the desktop file. */
+    if (!m_staticShortcuts.isNull()) {
+        const gchar** nicks = indicator_desktop_shortcuts_get_nicks(m_staticShortcuts.data());
+        if (nicks) {
+            int i = 0;
+            while (((gpointer*) nicks)[i]) {
+                const gchar* nick = nicks[i];
+                QAction* action = new QAction(m_menu);
+                action->setText(QString::fromUtf8(indicator_desktop_shortcuts_nick_get_name(m_staticShortcuts.data(), nick)));
+                action->setProperty(SHORTCUT_NICK_PROPERTY, QVariant(nick));
+                actions.append(action);
+                connect(action, SIGNAL(triggered()), SLOT(onStaticShortcutTriggered()));
+                ++i;
+            }
+        }
+    }
+    m_menu->insertActions(m_menu->actions().first(), actions);
+
+    actions.clear();
     bool is_running = running();
 
     /* Only applications with a corresponding desktop file can be kept in the launcher */
@@ -911,6 +935,15 @@
 }
 
 void
+LauncherApplication::onStaticShortcutTriggered()
+{
+    QAction* action = static_cast<QAction*>(sender());
+    QString nick = action->property(SHORTCUT_NICK_PROPERTY).toString();
+    m_menu->hide();
+    indicator_desktop_shortcuts_nick_exec(m_staticShortcuts.data(), nick.toUtf8().constData());
+}
+
+void
 LauncherApplication::onKeepTriggered()
 {
     QAction* keep = static_cast<QAction*>(sender());
 
=== modified file 'launcher/UnityApplications/launcherapplication.h'
--- launcher/UnityApplications/launcherapplication.h	2011-04-07 09:16:50 +0000
+++ launcher/UnityApplications/launcherapplication.h	2011-04-28 08:01:10 +0000
@@ -20,6 +20,9 @@
 #include <gio/gdesktopappinfo.h>
 #include <libwnck/libwnck.h>
 
+// libindicator
+#include <libindicator/indicator-desktop-shortcuts.h>
+
 #include "launcheritem.h"
 
 // libunity-2d
@@ -47,6 +50,7 @@
 typedef GObjectScopedPointer<GAppInfo> GAppInfoPointer;
 typedef GObjectScopedPointer<GDesktopAppInfo> GDesktopAppInfoPointer;
 typedef GScopedPointer<SnStartupSequence, sn_startup_sequence_unref> SnStartupSequencePointer;
+typedef GObjectScopedPointer<IndicatorDesktopShortcuts> IndicatorDesktopShortcutsPointer;
 class LauncherApplication : public LauncherItem
 {
     Q_OBJECT
@@ -135,6 +139,7 @@
     void show();
 
     /* Contextual menu callbacks */
+    void onStaticShortcutTriggered();
     void onKeepTriggered();
     void onQuitTriggered();
 
@@ -175,6 +180,8 @@
     template<typename T>
     bool updateOverlayState(QMap<QString, QVariant> properties,
                             QString propertyName, T* member);
+
+    IndicatorDesktopShortcutsPointer m_staticShortcuts;
 };
 
 Q_DECLARE_METATYPE(LauncherApplication*)
 
=== modified file 'launcher/UnityApplications/launchermenu.cpp'
--- launcher/UnityApplications/launchermenu.cpp	2011-03-21 13:03:36 +0000
+++ launcher/UnityApplications/launchermenu.cpp	2011-04-28 08:01:10 +0000
@@ -190,17 +190,20 @@
     }
 
     if (folded) {
-        /* Remove all actions but the first one (the title). */
-        while (actions().size() > 1) {
-            QAction* action = actions().last();
-            removeAction(action);
-            if (action->parent() == this) {
-                /* Delete the action only if we "own" it,
-                   otherwise let its parent take care of it. */
-                delete action;
+        /* Remove all actions but the title. */
+        for (int i = actions().size(); i > 0; --i) {
+            QAction* action = actions().at(i - 1);
+            if (action != m_titleAction) {
+                removeAction(action);
+                if (action->parent() == this) {
+                    /* Delete the action only if we "own" it,
+                       otherwise let its parent take care of it. */
+                    delete action;
+                }
             }
         }
     } else {
+        insertSeparator(m_titleAction);
         addSeparator();
         m_launcherItem->createMenuActions();