Merge lp:~uriboni/unity-2d/unity-2d-panel-pluggable into lp:unity-2d/3.0

[Ugo Riboni]

Load the panel applets from dynamically loaded plugins instead of having them hardcoded.

Load the panel applets from dynamically loaded plugins instead of having them hardcoded.

With the current architecture it's impossible to add new applets to the panel without branching the code and adding a new hardcoded applet.

With this modification each applet lives in a shared library in /usr/lib/unity-2d/plugins/panel and the actual layout of the applets in the panel is now defined via DConf (com.canonical.Unity-2d.Panel).

[lp:~uriboni/unity-2d/unity-2d-panel-pluggable]

684. By Ugo Riboni on 2011-08-12

Remove a debug comment in the CMakeLists.txt

685. By Ugo Riboni on 2011-08-12

Add soversion to the plugin libraries

686. By Ugo Riboni on 2011-08-12

Install the versioned libraries too

[Alberto Mardegan (mardy)]

data/com.canonical.Unity2d.gschema.xml:

24 + <schema path="/com/canonical/unity-2d/panel/" id="com.canonical.Unity2d.Panel" gettext-domain="unity-2d">
25 + <key type="as" name="applets">
26 + <default>["!homebutton", "!separator", "appname", "!legacytray", "indicator"]</default>
27 + <summary>Applets to display in the panel</summary>

GSettings schema allows you to write this in a simpler way: you could use type="a(sb)" where "s" is the name and "b" is the boolean for "only on first screen". And if you need it, you can also add the expanding here, having the type as "a(sbb)". I see that there's also a "child" element for GSettings schema, but I don't know much about GSettings myself, so I'm not sure how suitable it is for our case.

34 + <key type="s" name="expanding">
35 + <default>"appname"</default>
36 + <summary>Applet that should expand to fill all unused space</summary>

Why does it need to be specified here? I'd rather let the applet itself set the desired policy on its widget; also, in that way you could have more than one applet expanding, and not just one.

libunity-2d-private/src/appletproviderinterface.h:
88 + virtual QString getAppletName() const = 0;
89 + virtual QWidget* getApplet() const = 0;

Qt coding style is appletName() and applet(), with no "get".
(it would also be "Type *variable", but I see that's never used in unity-2d so
I won't interfere :-) )

panel/CMakeLists.txt:
104 -add_subdirectory(tests)
105 +#add_subdirectory(tests)

Looks suspicious. :-)

panel/app/panelmanager.cpp:
162 -#include <QLabel>
163 +#include <QProcessEnvironment>
164 +#include <QFileInfo>
165 +#include <QDir>
166 +#include <QHash>
167 +#include <QPluginLoader>
168 +#include <QDebug>
169 +#include <QVariant>

Please sort include files alphabetically (and generally, any list where order is not otherwise important).

206 + if (!pluginFileInfo.exists() || !pluginFileInfo.isDir()) {
207 + qWarning() << "Panel plugin path does not exist or it is not a directory:" << pluginPath;
208 + return plugins;
209 + }

The "exists" test is unnecessary, and the error message can also simply be: "The plugin directory does not exist:".
BTW, I see the rest of the code is using UQ_WARNING and UQ_DEBUG instead of qWarning and qDebug.

226 + if (provider == NULL) {

Qt style prefers 0 to NULL.

296 + if (!(onlyLeftmost && screen != leftmost)) {
297 + QWidget *applet = provider->getApplet();

This condition's logic is a bit twisted. :-)
I suggest:
if (screen == leftmost || !onlyLeftmost)

Got to leave now. I'll continue the review on Monday. :-)

[Ugo Riboni (uriboni)]

> data/com.canonical.Unity2d.gschema.xml:
>
> 24 + <schema path="/com/canonical/unity-2d/panel/"
> id="com.canonical.Unity2d.Panel" gettext-domain="unity-2d">
> 25 + <key type="as" name="applets">
> 26 + <default>["!homebutton", "!separator", "appname", "!legacytray",
> "indicator"]</default>
> 27 + <summary>Applets to display in the panel</summary>
>
> GSettings schema allows you to write this in a simpler way: you could use
> type="a(sb)" where "s" is the name and "b" is the boolean for "only on first
> screen". And if you need it, you can also add the expanding here, having the
> type as "a(sbb)". I see that there's also a "child" element for GSettings
> schema, but I don't know much about GSettings myself, so I'm not sure how
> suitable it is for our case.

I thought about it but then I read the documentation for QConf, which basically says that not all complex types are supported by the QT bindings. In fact the only non-basic types supported are "as" (QStringList) and "ay" (QByteArray).
For more details read https://gitorious.org/dconf-qt/dconf-qt/blobs/master/lib/qconftypes.cpp

> 34 + <key type="s" name="expanding">
> 35 + <default>"appname"</default>
> 36 + <summary>Applet that should expand to fill all unused
> space</summary>
>
> Why does it need to be specified here? I'd rather let the applet itself set
> the desired policy on its widget; also, in that way you could have more than
> one applet expanding, and not just one.

I guess it's essentially a matter of choice if it's up to the applet or if it has to be a configuration policy.
The reason why I chose it to be a configuration policy is related to why I am proposing this change: I need to alter the panel layout (add new applets, remove stock applets) for an OEM project and want to modify the stock unity-2d as little as possible.
In this context, having the expanding widget configured in dconf allows me to change which one it is without having to patch the unity-2d widgets (or my own widgets for that matter).

Regarding the choice of having just one expanding applet, I did that to reproduce what was going on in unity-2d before this merge request: only one applet (appname) was expanding.
It's clearly possible to turn that property in an "as" property and have more than one expanding applet, but I think it's outside of the scope of this MR.

> libunity-2d-private/src/appletproviderinterface.h:
> 88 + virtual QString getAppletName() const = 0;
> 89 + virtual QWidget* getApplet() const = 0;
>
> Qt coding style is appletName() and applet(), with no "get".
> (it would also be "Type *variable", but I see that's never used in unity-2d so
> I won't interfere :-) )

I agree with you on appletName(). For applet() now that I think of it, it would actually be much more clear to call it createApplet() since it create a new one every time it's called. What do you think ?

> panel/CMakeLists.txt:
> 104 -add_subdirectory(tests)
> 105 +#add_subdirectory(tests)
>
> Looks suspicious. :-)

This should be fixed now.

> panel/app/panelmanager.cpp:
> 162 -#include <QLabel>
> 163 +#include <QProcessEnvironment>
> 164 +#include <QFil...

[Alberto Mardegan (mardy)]

[...]
> I thought about it but then I read the documentation for QConf, which
> basically says that not all complex types are supported by the QT bindings. In
> fact the only non-basic types supported are "as" (QStringList) and "ay"
> (QByteArray).

Sad. But OK with the code in your MR, then!

[...]
> In this context, having the expanding widget configured in dconf allows me to
> change which one it is without having to patch the unity-2d widgets (or my own
> widgets for that matter).

Correct -- but note that I'm not advocating against using DConf: my doubt is whether this fits better in the Unity-2d schema or in the applet's. For example:

/com/canonical/unity-2d/panel/applet/clock:
  width = 200
  expand = false

> Regarding the choice of having just one expanding applet, I did that to
> reproduce what was going on in unity-2d before this merge request: only one
> applet (appname) was expanding.
> It's clearly possible to turn that property in an "as" property and have more
> than one expanding applet, but I think it's outside of the scope of this MR.

This is also related to the previous point; I also think it can be changed later without too much effort, and later on we might have a better understanding on what measure this improved customizability is needed/helpful. For this MR, I agree that your approach is the most practical. :-)

[...]
> I agree with you on appletName(). For applet() now that I think of it, it
> would actually be much more clear to call it createApplet() since it create a
> new one every time it's called. What do you think ?

createApplet() is much better indeed.

> > BTW, I see the rest of the code is using UQ_WARNING and UQ_DEBUG instead of
> > qWarning and qDebug.
>
> I'm a bit unsure if they should be used so widely in unity-2d code because
> they are defined in a private header debug_p.h in libunity-2d-private. This
> makes me think they are internal utilities to the library.
> If this is not the case, why don't we get the file renamed to something else
> or even better merged with the public unity2ddebug.h ?

I don't know -- I just saw a merge request about changing all qDebug() and qWarnings() to use that macro, so I assumed it would make sense for this branch too. Indeed the name debug_p.h is suspicious...

> Our internal guidelines don't seem to prefer anything, and I personally find
> the explicit comparison with NULL to be clearer. Unity-2d code seems to use
> both.
> What about I change them to == 0 and we do something to put that rule into the
> coding conventions too ?

I'll see what other people think of it, too.

Now, continuing with the review.
I notice you changed the parent class of the applets from Unity2d::Applet to QWidget. While I don't see much code in the Applet class to make it useful right now, I think it's a good idea to keep it and actually have the applet interface's createApplet method return that, instead of QWidget.
The reason is that it gives us the possibility of implementing some common applet behaviour in the future, and we can use the Applet class to define an interface for panel applets: suppose for instance that one day we want to have a way to ask applets to reload their con...

review: Needs Fixing

[lp:~uriboni/unity-2d/unity-2d-panel-pluggable]

687. By Ugo Riboni on 2011-08-16

Rename the AppletProviderInterface to PanelAppletProviderInterface for clarity and consistency with following commits

688. By Ugo Riboni on 2011-08-16

Add back the Applet class, now renamed PanelApplet. Fix interface to use it. Make all plugins inherit from it instead of just QWidget.

689. By Ugo Riboni on 2011-08-16

Add soversion to the appname plugin, it was missing it from previous changes.

690. By Ugo Riboni on 2011-08-16

Refactor the method names in the interface to be more in line with Qt naming guidelines

691. By Ugo Riboni on 2011-08-16

Sort Qt imports alphabetically

692. By Ugo Riboni on 2011-08-16

Make a few tests simpler or clearer

693. By Ugo Riboni on 2011-08-16

Use the new methods from the refactored interface

694. By Ugo Riboni on 2011-08-16

Remove the Unity2d namespace from the AppNameApplet. No other applet was using it.

695. By Ugo Riboni on 2011-08-16

Merge back changes from trunk

696. By Ugo Riboni on 2011-08-16

Fix an error message

[Ugo Riboni (uriboni)]

I think I fixed all the remarks you made in your comments.

For the qDebug/qWarning thing, I think that until the header is made non-private (and thus installed with the libunity-2d-private headers) I will stick with the QT standard functions. It's easy to change them afterwards in another MR anyway.

I also made a few extra changes:
- Renamed the base class to PanelApplet (clearer than just Applet), and therefore the interface becomes PanelAppletProviderInterface.
- Removed some explicit size policy code in the appname applet constructor. As we agree size policy for all applets is controlled by the panel manager now.
- Removed an Unity2d namespace from one of the applets. Nothing else uses it in the rest of the code.

Hope it's all good now. Thanks for the review :)

[Alberto Mardegan (mardy)]

Thanks for the update!

I'd say this is good to go, but if you have time for a couple of changes, that would be even better (IMHO):

- Have the PanelApplet class and the PanelAppletProviderInterface in the Unity2d namespace. For the latter, be careful that the Q_DECLARE_INTERFACE line must be outside of the namespace. You can see an example here (but IIRC, it's also explained in the Qt documentation):
  http://gitorious.org/accounts-sso/signon/blobs/master/lib/signond/SignOn/extension-interface.h

- Since the rest of the code is using the "Type* variable" style, let's use it here too: check your panelapplet.{h,cpp}

review: Needs Fixing

[lp:~uriboni/unity-2d/unity-2d-panel-pluggable]

697. By Ugo Riboni on 2011-08-16

Coding style change

698. By Ugo Riboni on 2011-08-16

Move the interface and the PanelApplet classes into the Unity2d namespace

[Ugo Riboni (uriboni)]

All changes you requested should be there now

[Alberto Mardegan (mardy)]

Looks hot! All fine by me! :-)

review: Approve

=== modified file 'config.h.in'
--- config.h.in	2011-03-07 14:52:11 +0000
+++ config.h.in	2011-08-16 14:11:07 +0000
@@ -24,3 +24,11 @@
         return QString(QCoreApplication::applicationDirPath()+"/../");
     }
 }
+
+inline QString unity2dPluginsPath() {
+    if (isRunningInstalled()) {
+        return QString(INSTALL_PREFIX "/lib/unity-2d/plugins");
+    } else {
+        return unity2dDirectory();
+    }
+}

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2011-07-25 10:18:45 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2011-08-16 14:11:07 +0000
@@ -16,4 +16,24 @@
       <description>Use EWMH standard to reserve an area of the desktop (struts) so that no window can use the launcher's area</description>
     </key>
   </schema>
+  <schema path="/com/canonical/unity-2d/panel/" id="com.canonical.Unity2d.Panel" gettext-domain="unity-2d">
+    <key type="as" name="applets">
+      <default>["!homebutton", "!separator", "appname", "!legacytray", "indicator"]</default>
+      <summary>Applets to display in the panel</summary>
+      <description>
+        List of panel applets that should be displayed, in order, in the panel.
+        Each applet name can be annotated with the prefix "!" to force that applet to be displayed
+        only on the panel living in the leftmost screen.
+      </description>
+    </key>
+    <key type="s" name="expanding">
+      <default>"appname"</default>
+      <summary>Applet that should expand to fill all unused space</summary>
+      <description>
+        If this property names a valid applet from the list in the applets property, then this
+        applet will be setup so that it tries to use all the panel space that remains empty after
+        the other applets have resized themselves to display their content.
+      </description>
+    </key>
+  </schema>
 </schemalist>

=== modified file 'debian/unity-2d-panel.install'
--- debian/unity-2d-panel.install	2011-01-14 21:41:39 +0000
+++ debian/unity-2d-panel.install	2011-08-16 14:11:07 +0000
@@ -2,3 +2,4 @@
 usr/share/applications/unity-2d-panel.desktop
 usr/share/unity-2d/panel/artwork/background.png
 usr/share/unity-2d/panel/artwork/divider.png
+usr/lib/unity-2d/plugins/panel/libpanelplugin-*.so*

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -53,6 +53,7 @@
     workspaces.cpp
     launcherdropitem.cpp
     iconutilities.cpp
+    panelapplet.cpp
     )
 
 # Build

=== added file 'libunity-2d-private/src/panelapplet.cpp'
--- libunity-2d-private/src/panelapplet.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelapplet.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,13 @@
+#include "panelapplet.h"
+
+namespace Unity2d
+{
+
+PanelApplet::PanelApplet(QWidget* parent) :
+    QWidget(parent)
+{
+}
+
+} // namespace Unity2d
+
+#include "panelapplet.moc"

=== added file 'libunity-2d-private/src/panelapplet.h'
--- libunity-2d-private/src/panelapplet.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelapplet.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,44 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PANELAPPLET_H
+#define PANELAPPLET_H
+
+// Qt
+#include <QWidget>
+
+namespace Unity2d
+{
+
+class PanelApplet : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit PanelApplet(QWidget* parent = 0);
+
+private:
+    Q_DISABLE_COPY(PanelApplet)
+};
+
+} // namespace Unity2d
+
+#endif // PANELAPPLET_H

=== added file 'libunity-2d-private/src/panelappletproviderinterface.h'
--- libunity-2d-private/src/panelappletproviderinterface.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelappletproviderinterface.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef PANELAPPLETPROVIDERINTERFACE_H
+#define PANELAPPLETPROVIDERINTERFACE_H
+
+#include "panelapplet.h"
+
+namespace Unity2d
+{
+
+class PanelAppletProviderInterface
+{
+public:
+    virtual QString appletName() const = 0;
+    virtual PanelApplet* createApplet() const = 0;
+};
+
+} // namespace Unity2d
+
+Q_DECLARE_INTERFACE(Unity2d::PanelAppletProviderInterface,
+                    "com.canonical.Unity2d.PanelAppletProviderInterface/1.0")
+
+#endif // PANELAPPLETPROVIDERINTERFACE_H

=== modified file 'panel/app/CMakeLists.txt'
--- panel/app/CMakeLists.txt	2011-04-04 16:41:15 +0000
+++ panel/app/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -1,3 +1,5 @@
+pkg_check_modules(DCONFQT REQUIRED dconf-qt)
+
 set(panel_SRCS
     main.cpp
     panelmanager.cpp
@@ -10,15 +12,14 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${uqapplets_SOURCE_DIR}
-    ${uqapplets_SOURCE_DIR}/common
+    ${DCONFQT_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
 target_link_libraries(unity-2d-panel
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
-    uqapplets
+    ${DCONFQT_LIBRARIES}
     unity-2d-private
     )
 

=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-06-12 23:01:35 +0000
+++ panel/app/panelmanager.cpp	2011-08-16 14:11:07 +0000
@@ -25,23 +25,31 @@
 // Local
 #include <config.h>
 
-// Applets
-#include <appindicator/appindicatorapplet.h>
-#include <appname/appnameapplet.h>
-#include <homebutton/homebuttonapplet.h>
-#include <indicator/indicatorapplet.h>
-#include <legacytray/legacytrayapplet.h>
-
 // Unity
 #include <unity2dpanel.h>
+#include <panelappletproviderinterface.h>
+
+// QConf
+#include <qconf.h>
 
 // Qt
 #include <QApplication>
+#include <QDebug>
 #include <QDesktopWidget>
-#include <QLabel>
+#include <QDir>
+#include <QFileInfo>
+#include <QHash>
+#include <QPluginLoader>
+#include <QProcessEnvironment>
+#include <QVariant>
 
 using namespace Unity2d;
 
+static const char* PANEL_DCONF_SCHEMA = "com.canonical.Unity2d.Panel";
+static const char* PANEL_DCONF_PROPERTY_APPLETS = "applets";
+static const char* PANEL_DCONF_PROPERTY_EXPAND = "expanding";
+static const char* PANEL_PLUGINS_DEV_DIR_ENV = "DEV_PLUGIN_PATH";
+
 static QPalette getPalette()
 {
     QPalette palette;
@@ -57,13 +65,76 @@
     return palette;
 }
 
-static QLabel* createSeparator()
-{
-    QLabel* label = new QLabel;
-    QPixmap pix(unity2dDirectory() + "/panel/artwork/divider.png");
-    label->setPixmap(pix);
-    label->setFixedSize(pix.size());
-    return label;
+static QHash<QString, PanelAppletProviderInterface*> loadPlugins()
+{
+    QHash<QString, PanelAppletProviderInterface*> plugins;
+
+    /* When running uninstalled the plugins will be loaded from the source tree
+       under panel/applets.
+       When running installed the plugins will be typically in /usr/lib/unity-2d/plugins/panel
+       In both cases it's still possible to override these default locations by setting an
+       environment variable with the path where the plugins are located.
+    */
+
+    QString panelPluginsDefaultDir = unity2dPluginsPath() + "/panel";
+    if (!isRunningInstalled()) panelPluginsDefaultDir += "/applets";
+    QString pluginPath = QProcessEnvironment::systemEnvironment().value(PANEL_PLUGINS_DEV_DIR_ENV,
+                                                                        panelPluginsDefaultDir);
+    QFileInfo pluginFileInfo = QFileInfo(pluginPath);
+    if (!pluginFileInfo.isDir()) {
+        qWarning() << "Panel plugin directory does not exist:" << pluginPath;
+        return plugins;
+    }
+
+    qDebug() << "Scanning panel plugin directory" << pluginFileInfo.absoluteFilePath();
+
+    QDir pluginDir = QDir(pluginFileInfo.absoluteFilePath());
+    QStringList filters;
+    filters << "*.so";
+    pluginDir.setNameFilters(filters);
+
+    Q_FOREACH(QString fileEntry, pluginDir.entryList()) {
+        QString pluginFilePath = pluginDir.absoluteFilePath(fileEntry);
+        qDebug() << "Loading panel plugin:" << pluginFilePath;
+
+        QPluginLoader loader(pluginFilePath);
+        if (loader.load()) {
+            PanelAppletProviderInterface* provider;
+            provider = qobject_cast<PanelAppletProviderInterface*>(loader.instance());
+            if (provider == 0) {
+                qWarning() << "Plugin loaded from" << pluginFilePath
+                           << "does not implement the interface PanelAppletProviderInterface";
+            } else {
+               plugins.insert(provider->appletName(), provider);
+            }
+        } else {
+            qWarning() << "Failed to load panel plugin from" << pluginFilePath
+                       << "with error" << loader.errorString();
+        }
+    }
+
+    return plugins;
+}
+
+static bool loadPanelConfiguration(QStringList& applets, QString& expanding)
+{
+    QConf panelConfig(PANEL_DCONF_SCHEMA);
+
+    QVariant appletsConfig = panelConfig.property(PANEL_DCONF_PROPERTY_APPLETS);
+    if (!appletsConfig.isValid()) {
+        qWarning() << "Missing or invalid panel applets configuration in dconf. Please check"
+                   << "the property" << PANEL_DCONF_PROPERTY_APPLETS
+                   << "in schema" << PANEL_DCONF_SCHEMA;
+        return false;
+    }
+
+    applets.append(appletsConfig.toStringList());
+    qDebug() << "Configured plugins list is:" << applets;
+
+    expanding = panelConfig.property(PANEL_DCONF_PROPERTY_EXPAND).toString();
+    qDebug() << "Expanding applet is:" << expanding;
+
+    return true;
 }
 
 static Unity2dPanel* instantiatePanel(int screen)
@@ -74,17 +145,36 @@
     panel->setFixedHeight(24);
 
     int leftmost = QApplication::desktop()->screenNumber(QPoint());
-    if (screen == leftmost) {
-        panel->addWidget(new HomeButtonApplet);
-        panel->addWidget(createSeparator());
-    }
-    panel->addWidget(new AppNameApplet);
-    if (screen == leftmost) {
-        /* It doesn’t make sense to have more than one instance of the systray,
-           XEmbed’ed windows can be displayed only once anyway. */
-        panel->addWidget(new LegacyTrayApplet);
-    }
-    panel->addWidget(new IndicatorApplet);
+
+    QHash<QString, PanelAppletProviderInterface*> plugins = loadPlugins();
+
+    QString expandingApplet;
+    QStringList panelConfiguration;
+    loadPanelConfiguration(panelConfiguration, expandingApplet);
+
+    Q_FOREACH(QString appletName, panelConfiguration) {
+        bool onlyLeftmost = appletName.startsWith('!');
+        if (onlyLeftmost) {
+            appletName = appletName.mid(1);
+        }
+
+        PanelAppletProviderInterface* provider = plugins.value(appletName, NULL);
+        if (provider == 0) {
+            qWarning() << "Panel applet" << appletName << "was requested but there's no"
+                       << "installed plugin providing it.";
+        } else {
+            if (screen == leftmost || !onlyLeftmost) {
+                QWidget *applet = provider->createApplet();
+                if (appletName == expandingApplet) {
+                    applet->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+                } else {
+                    applet->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+                }
+                panel->addWidget(applet);
+            }
+        }
+    }
+
     return panel;
 }
 

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-07-18 10:33:35 +0000
+++ panel/applets/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -1,87 +1,6 @@
-project(uqapplets)
-
-macro(read_pkg_variable cmake_var pkg pkg_var)
-    execute_process(
-        COMMAND pkg-config --variable=${pkg_var} ${pkg}
-        OUTPUT_VARIABLE tmp
-        )
-    # Remove trailing newline from ${tmp}
-    string(STRIP "${tmp}" ${cmake_var})
-endmacro(read_pkg_variable)
-
-# Dependencies
-include(FindPkgConfig)
-
-pkg_check_modules(QTBAMF REQUIRED libqtbamf)
-pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(INDICATOR REQUIRED indicator)
-
-# Get indicator dirs from pkgconfig
-read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
-read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
-configure_file(indicator-config.h.in indicator-config.h)
-
-# Sources
-set(uqapplets_SRCS
-    appindicator/appindicatorapplet.cpp
-    appindicator/sniitem.cpp
-    appname/appnameapplet.cpp
-    appname/menubarwidget.cpp
-    appname/registrar.cpp
-    appname/windowhelper.cpp
-    common/applet.cpp
-    homebutton/homebuttonapplet.cpp
-    homebutton/homebutton.cpp
-    indicator/abstractindicator.cpp
-    indicator/datetimeindicator.cpp
-    indicator/indicatorapplet.cpp
-    indicator/indicatorservicemanager.cpp
-    indicator/indicator.c
-    legacytray/legacytrayapplet.cpp
-    legacytray/fdoselectionmanager.cpp
-    legacytray/fdotask.cpp
-    legacytray/x11embedcontainer.cpp
-    legacytray/x11embeddelegate.cpp
-    legacytray/x11embedpainter.cpp
-    )
-
-qt4_add_dbus_adaptor(uqapplets_SRCS appname/com.canonical.AppMenu.Registrar.xml
-    registrar.h Registrar
-    )
-
-qt4_automoc(${uqapplets_SRCS})
-
-# Build
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/appindicator
-    ${CMAKE_CURRENT_SOURCE_DIR}/appname
-    ${CMAKE_CURRENT_SOURCE_DIR}/common
-    ${CMAKE_CURRENT_SOURCE_DIR}/homebutton
-    ${CMAKE_CURRENT_SOURCE_DIR}/indicator
-    ${QTBAMF_INCLUDE_DIRS}
-    ${DBUSMENUQT_INCLUDE_DIRS}
-    ${GTK_INCLUDE_DIRS}
-    ${INDICATOR_INCLUDE_DIRS}
-    ${WNCK_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${X11_INCLUDE_DIR}
-    ${libunity-2d-private_SOURCE_DIR}/src
-    )
-
-add_library(uqapplets ${uqapplets_SRCS})
-
-target_link_libraries(uqapplets
-    ${QT_QTGUI_LIBRARIES}
-    ${QT_QTCORE_LIBRARIES}
-    ${DBUSMENUQT_LDFLAGS}
-    ${QTBAMF_LDFLAGS}
-    ${GTK_LDFLAGS}
-    ${INDICATOR_LDFLAGS}
-    ${WNCK_LDFLAGS}
-    ${X11_LIBRARIES}
-    ${X11_Xrender_LIB}
-    ${X11_Xcomposite_LIB}
-    ${X11_Xdamage_LIB}
-    ${X11_Xfixes_LIB}
-    unity-2d-private
-    )
+add_subdirectory(separator)
+add_subdirectory(homebutton)
+add_subdirectory(appname)
+add_subdirectory(legacytray)
+add_subdirectory(indicator)
+add_subdirectory(appindicator)

=== added file 'panel/applets/appindicator/CMakeLists.txt'
--- panel/applets/appindicator/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ panel/applets/appindicator/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -0,0 +1,38 @@
+project(panelplugin-appindicator)
+
+# Dependencies
+pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
+
+# Sources
+set(appindicator_SRCS
+    appindicatorapplet.cpp
+    sniitem.cpp
+    plugin.cpp
+    )
+
+# Build
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${DBUSMENUQT_INCLUDE_DIRS}
+    ${libunity-2d-private_SOURCE_DIR}/src
+    )
+
+qt4_automoc(${appindicator_SRCS})
+add_library(panelplugin-appindicator SHARED ${appindicator_SRCS})
+set_target_properties(panelplugin-appindicator PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ".."
+    VERSION 0
+    SOVERSION 0.0
+    )
+
+target_link_libraries(panelplugin-appindicator
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    ${DBUSMENUQT_LIBRARIES}
+    unity-2d-private
+    )
+
+install(TARGETS panelplugin-appindicator
+        LIBRARY DESTINATION lib/unity-2d/plugins/panel
+       )

=== modified file 'panel/applets/appindicator/appindicatorapplet.h'
--- panel/applets/appindicator/appindicatorapplet.h	2011-01-15 01:41:03 +0000
+++ panel/applets/appindicator/appindicatorapplet.h	2011-08-16 14:11:07 +0000
@@ -22,14 +22,14 @@
 #ifndef APPINDICATORAPPLET_H
 #define APPINDICATORAPPLET_H
 
-// Local
-#include <applet.h>
-
 // Qt
 #include <QDBusInterface>
 #include <QMenuBar>
 
-class AppIndicatorApplet : public Unity2d::Applet
+// Unity-2d
+#include <panelapplet.h>
+
+class AppIndicatorApplet : public Unity2d::PanelApplet
 {
 Q_OBJECT
 public:

=== added file 'panel/applets/appindicator/plugin.cpp'
--- panel/applets/appindicator/plugin.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/appindicator/plugin.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "plugin.h"
+#include "appindicatorapplet.h"
+
+#include <QtPlugin>
+
+QString AppIndicatorPlugin::appletName() const
+{
+    return QString("appindicator");
+}
+
+PanelApplet* AppIndicatorPlugin::createApplet() const
+{
+    return new AppIndicatorApplet();
+}
+
+Q_EXPORT_PLUGIN2(panelplugin-appindicator, AppIndicatorPlugin)
+
+#include "plugin.moc"

=== added file 'panel/applets/appindicator/plugin.h'
--- panel/applets/appindicator/plugin.h	1970-01-01 00:00:00 +0000
+++ panel/applets/appindicator/plugin.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef APPINDICATOR_PLUGIN_H
+#define APPINDICATOR_PLUGIN_H
+
+#include <QString>
+#include <panelappletproviderinterface.h>
+
+using namespace Unity2d;
+
+class AppIndicatorPlugin : public QObject, PanelAppletProviderInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(Unity2d::PanelAppletProviderInterface)
+
+public:
+    QString appletName() const;
+    PanelApplet* createApplet() const;
+};
+
+#endif // APPINDICATOR_PLUGIN_H

=== added file 'panel/applets/appname/CMakeLists.txt'
--- panel/applets/appname/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -0,0 +1,51 @@
+project(panelplugin-appname)
+
+# Dependencies
+pkg_check_modules(QTBAMF REQUIRED libqtbamf)
+pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
+
+# Sources
+set(appname_SRCS
+    appnameapplet.cpp
+    menubarwidget.cpp
+    registrar.cpp
+    windowhelper.cpp
+    plugin.cpp
+    )
+
+qt4_add_dbus_adaptor(appname_SRCS com.canonical.AppMenu.Registrar.xml
+    registrar.h Registrar
+    )
+
+# Build
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${QTBAMF_INCLUDE_DIRS}
+    ${DBUSMENUQT_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS}
+    ${WNCK_INCLUDE_DIRS}
+    ${libunity-2d-private_SOURCE_DIR}/src
+    )
+
+qt4_automoc(${appname_SRCS})
+add_library(panelplugin-appname SHARED ${appname_SRCS})
+
+set_target_properties(panelplugin-appname PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ".."
+    VERSION 0
+    SOVERSION 0.0
+    )
+
+target_link_libraries(panelplugin-appname
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    ${GTK_LIBRARIES}
+    ${WNCK_LIBRARIES}
+    ${DBUSMENUQT_LDFLAGS}
+    unity-2d-private
+    )
+
+install(TARGETS panelplugin-appname
+        LIBRARY DESTINATION lib/unity-2d/plugins/panel
+       )

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-08-16 14:11:07 +0000
@@ -36,7 +36,6 @@
 
 // Qt
 #include <QAbstractButton>
-#include <QEvent>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLinearGradient>
@@ -53,9 +52,6 @@
 
 static const int FADEOUT_WIDTH = 16;
 
-namespace Unity2d
-{
-
 class WindowButton : public QAbstractButton
 {
 public:
@@ -220,7 +216,6 @@
 : d(new AppNameAppletPrivate)
 {
     d->q = this;
-    setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
 
     QPalette palette;
     palette.setColor(QPalette::WindowText, Qt::white);
@@ -301,6 +296,4 @@
     updateWidgets();
 }
 
-} // namespace
-
 #include "appnameapplet.moc"

=== modified file 'panel/applets/appname/appnameapplet.h'
--- panel/applets/appname/appnameapplet.h	2011-06-06 09:06:55 +0000
+++ panel/applets/appname/appnameapplet.h	2011-08-16 14:11:07 +0000
@@ -22,18 +22,14 @@
 #ifndef APPNAMEAPPLET_H
 #define APPNAMEAPPLET_H
 
-// Local
-#include <applet.h>
-
 // Qt
-
-class QEvent;
-
-namespace Unity2d
-{
+#include <QEvent>
+
+// Unity-2d
+#include <panelapplet.h>
 
 struct AppNameAppletPrivate;
-class AppNameApplet : public Applet
+class AppNameApplet : public Unity2d::PanelApplet
 {
 Q_OBJECT
 public:
@@ -52,7 +48,5 @@
     AppNameAppletPrivate* const d;
 };
 
-} // namespace
-
 #endif /* APPNAMEAPPLET_H */
 

=== added file 'panel/applets/appname/plugin.cpp'
--- panel/applets/appname/plugin.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/plugin.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "plugin.h"
+#include "appnameapplet.h"
+
+#include <QtPlugin>
+
+QString AppNamePlugin::appletName() const
+{
+    return QString("appname");
+}
+
+PanelApplet* AppNamePlugin::createApplet() const
+{
+    return new AppNameApplet();
+}
+
+Q_EXPORT_PLUGIN2(panelplugin-appname, AppNamePlugin)
+
+#include "plugin.moc"

=== added file 'panel/applets/appname/plugin.h'
--- panel/applets/appname/plugin.h	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/plugin.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef APPNAME_PLUGIN_H
+#define APPNAME_PLUGIN_H
+
+#include <QString>
+#include <panelappletproviderinterface.h>
+
+using namespace Unity2d;
+
+class AppNamePlugin : public QObject, PanelAppletProviderInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(Unity2d::PanelAppletProviderInterface)
+
+public:
+    QString appletName() const;
+    PanelApplet* createApplet() const;
+};
+
+#endif // APPNAME_PLUGIN_H

=== removed directory 'panel/applets/common'
=== removed file 'panel/applets/common/applet.cpp'
--- panel/applets/common/applet.cpp	2011-02-10 00:48:58 +0000
+++ panel/applets/common/applet.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "applet.h"
-
-namespace Unity2d
-{
-
-struct AppletPrivate
-{
-};
-
-Applet::Applet()
-: QWidget()
-, d(new AppletPrivate)
-{
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-}
-
-Applet::~Applet()
-{
-    delete d;
-}
-
-} // namespace
-
-#include "applet.moc"

=== removed file 'panel/applets/common/applet.h'
--- panel/applets/common/applet.h	2011-02-10 00:48:58 +0000
+++ panel/applets/common/applet.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published 
- * by the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef APPLET_H
-#define APPLET_H
-
-// Local
-
-// Qt
-#include <QWidget>
-
-namespace Unity2d
-{
-
-struct AppletPrivate;
-class Applet : public QWidget
-{
-Q_OBJECT
-public:
-    Applet();
-    ~Applet();
-
-private:
-    Q_DISABLE_COPY(Applet)
-    AppletPrivate* const d;
-};
-
-} // namespace
-
-#endif /* APPLET_H */

=== added file 'panel/applets/homebutton/CMakeLists.txt'
--- panel/applets/homebutton/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ panel/applets/homebutton/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -0,0 +1,33 @@
+project(panelplugin-homebutton)
+
+# Sources
+set(homebutton_SRCS
+    homebuttonapplet.cpp
+    homebutton.cpp
+    plugin.cpp
+    )
+
+# Build
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${libunity-2d-private_SOURCE_DIR}/src
+    )
+
+qt4_automoc(${homebutton_SRCS})
+add_library(panelplugin-homebutton SHARED ${homebutton_SRCS})
+set_target_properties(panelplugin-homebutton PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ".."
+    VERSION 0
+    SOVERSION 0.0
+    )
+
+target_link_libraries(panelplugin-homebutton
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    unity-2d-private
+    )
+
+install(TARGETS panelplugin-homebutton
+        LIBRARY DESTINATION lib/unity-2d/plugins/panel
+       )

=== modified file 'panel/applets/homebutton/homebuttonapplet.cpp'
--- panel/applets/homebutton/homebuttonapplet.cpp	2011-05-26 16:41:04 +0000
+++ panel/applets/homebutton/homebuttonapplet.cpp	2011-08-16 14:11:07 +0000
@@ -98,13 +98,13 @@
 
 void HomeButtonApplet::enterEvent(QEvent* event)
 {
-    Unity2d::Applet::enterEvent(event);
+    QWidget::enterEvent(event);
     m_launcherClient->beginForceVisible();
 }
 
 void HomeButtonApplet::leaveEvent(QEvent* event)
 {
-    Unity2d::Applet::leaveEvent(event);
+    QWidget::leaveEvent(event);
     m_launcherClient->endForceVisible();
 }
 

=== modified file 'panel/applets/homebutton/homebuttonapplet.h'
--- panel/applets/homebutton/homebuttonapplet.h	2011-05-26 16:41:04 +0000
+++ panel/applets/homebutton/homebuttonapplet.h	2011-08-16 14:11:07 +0000
@@ -23,13 +23,15 @@
 #define HOMEBUTTONAPPLET_H
 
 // Local
-#include <applet.h>
 #include "homebutton.h"
 
+// Unity-2d
+#include <panelapplet.h>
+
 class QDBusInterface;
 class LauncherClient;
 
-class HomeButtonApplet : public Unity2d::Applet
+class HomeButtonApplet : public Unity2d::PanelApplet
 {
 Q_OBJECT
 public:

=== added file 'panel/applets/homebutton/plugin.cpp'
--- panel/applets/homebutton/plugin.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/homebutton/plugin.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "plugin.h"
+#include "homebuttonapplet.h"
+
+#include <QtPlugin>
+
+QString HomeButtonPlugin::appletName() const
+{
+    return QString("homebutton");
+}
+
+PanelApplet* HomeButtonPlugin::createApplet() const
+{
+    return new HomeButtonApplet();
+}
+
+Q_EXPORT_PLUGIN2(panelplugin-homebutton, HomeButtonPlugin)
+
+#include "plugin.moc"

=== added file 'panel/applets/homebutton/plugin.h'
--- panel/applets/homebutton/plugin.h	1970-01-01 00:00:00 +0000
+++ panel/applets/homebutton/plugin.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef HOMEBUTTON_PLUGIN_H
+#define HOMEBUTTON_PLUGIN_H
+
+#include <QString>
+#include <panelappletproviderinterface.h>
+
+using namespace Unity2d;
+
+class HomeButtonPlugin : public QObject, PanelAppletProviderInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(Unity2d::PanelAppletProviderInterface)
+
+public:
+    QString appletName() const;
+    PanelApplet* createApplet() const;
+};
+
+#endif // HOMEBUTTON_PLUGIN_H

=== added file 'panel/applets/indicator/CMakeLists.txt'
--- panel/applets/indicator/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ panel/applets/indicator/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -0,0 +1,61 @@
+project(panelplugin-indicator)
+
+macro(read_pkg_variable cmake_var pkg pkg_var)
+    execute_process(
+        COMMAND pkg-config --variable=${pkg_var} ${pkg}
+        OUTPUT_VARIABLE tmp
+        )
+    # Remove trailing newline from ${tmp}
+    string(STRIP "${tmp}" ${cmake_var})
+endmacro(read_pkg_variable)
+
+# Dependencies
+pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
+pkg_check_modules(INDICATOR REQUIRED indicator)
+
+# Get indicator dirs from pkgconfig
+read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
+read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
+configure_file(indicator-config.h.in indicator-config.h)
+
+# Sources
+set(indicator_SRCS
+    abstractindicator.cpp
+    datetimeindicator.cpp
+    indicatorapplet.cpp
+    indicatorservicemanager.cpp
+    indicator.c
+    plugin.cpp
+    )
+
+# Build
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${DBUSMENUQT_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS}
+    ${INDICATOR_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${libunity-2d-private_SOURCE_DIR}/src
+    )
+
+qt4_automoc(${indicator_SRCS})
+add_library(panelplugin-indicator SHARED ${indicator_SRCS})
+set_target_properties(panelplugin-indicator PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ".."
+    VERSION 0
+    SOVERSION 0.0
+    )
+
+target_link_libraries(panelplugin-indicator
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    ${DBUSMENUQT_LDFLAGS}
+    ${GTK_LDFLAGS}
+    ${INDICATOR_LDFLAGS}
+    unity-2d-private
+    )
+
+install(TARGETS panelplugin-indicator
+        LIBRARY DESTINATION lib/unity-2d/plugins/panel
+       )

=== renamed file 'panel/applets/indicator-config.h.in' => 'panel/applets/indicator/indicator-config.h.in'
=== modified file 'panel/applets/indicator/indicatorapplet.h'
--- panel/applets/indicator/indicatorapplet.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/indicatorapplet.h	2011-08-16 14:11:07 +0000
@@ -22,18 +22,18 @@
 #ifndef INDICATORAPPLET_H
 #define INDICATORAPPLET_H
 
-// Local
-#include <applet.h>
-
 // Qt
 #include <QDBusInterface>
 #include <QMenuBar>
 
+// Unity-2d
+#include <panelapplet.h>
+
 class QX11EmbedContainer;
 
 struct _IndicatorPlugin;
 
-class IndicatorApplet : public Unity2d::Applet
+class IndicatorApplet : public Unity2d::PanelApplet
 {
 Q_OBJECT
 public:

=== added file 'panel/applets/indicator/plugin.cpp'
--- panel/applets/indicator/plugin.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/indicator/plugin.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "plugin.h"
+#include "indicatorapplet.h"
+
+#include <QtPlugin>
+
+QString IndicatorPlugin::appletName() const
+{
+    return QString("indicator");
+}
+
+PanelApplet* IndicatorPlugin::createApplet() const
+{
+    return new IndicatorApplet();
+}
+
+Q_EXPORT_PLUGIN2(panelplugin-indicator, IndicatorPlugin)
+
+#include "plugin.moc"

=== added file 'panel/applets/indicator/plugin.h'
--- panel/applets/indicator/plugin.h	1970-01-01 00:00:00 +0000
+++ panel/applets/indicator/plugin.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef INDICATOR_PLUGIN_H
+#define INDICATOR_PLUGIN_H
+
+#include <QString>
+#include <panelappletproviderinterface.h>
+
+using namespace Unity2d;
+
+class IndicatorPlugin : public QObject, PanelAppletProviderInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(Unity2d::PanelAppletProviderInterface)
+
+public:
+    QString appletName() const;
+    PanelApplet* createApplet() const;
+};
+
+#endif // INDICATOR_PLUGIN_H

=== added file 'panel/applets/legacytray/CMakeLists.txt'
--- panel/applets/legacytray/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ panel/applets/legacytray/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -0,0 +1,43 @@
+project(panelplugin-legacytray)
+
+# Sources
+set(legacytray_SRCS
+    legacytrayapplet.cpp
+    fdoselectionmanager.cpp
+    fdotask.cpp
+    x11embedcontainer.cpp
+    x11embeddelegate.cpp
+    x11embedpainter.cpp
+    plugin.cpp
+    )
+
+# Build
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${X11_INCLUDE_DIR}
+    ${libunity-2d-private_SOURCE_DIR}/src
+    )
+
+qt4_automoc(${legacytray_SRCS})
+add_library(panelplugin-legacytray SHARED ${legacytray_SRCS})
+set_target_properties(panelplugin-legacytray PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ".."
+    VERSION 0
+    SOVERSION 0.0
+    )
+
+target_link_libraries(panelplugin-legacytray
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    ${X11_LIBRARIES}
+    ${X11_Xrender_LIB}
+    ${X11_Xcomposite_LIB}
+    ${X11_Xdamage_LIB}
+    ${X11_Xfixes_LIB}
+    unity-2d-private
+    )
+
+install(TARGETS panelplugin-legacytray
+        LIBRARY DESTINATION lib/unity-2d/plugins/panel
+       )

=== modified file 'panel/applets/legacytray/legacytrayapplet.h'
--- panel/applets/legacytray/legacytrayapplet.h	2011-01-15 01:41:03 +0000
+++ panel/applets/legacytray/legacytrayapplet.h	2011-08-16 14:11:07 +0000
@@ -22,10 +22,8 @@
 #ifndef LEGACYTRAYAPPLET_H
 #define LEGACYTRAYAPPLET_H
 
-// Local
-#include <applet.h>
-
-// Qt
+// Unity-2d
+#include <panelapplet.h>
 
 namespace SystemTray
 {
@@ -33,7 +31,7 @@
 class Task;
 }
 
-class LegacyTrayApplet : public Unity2d::Applet
+class LegacyTrayApplet : public Unity2d::PanelApplet
 {
 Q_OBJECT
 public:

=== added file 'panel/applets/legacytray/plugin.cpp'
--- panel/applets/legacytray/plugin.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/legacytray/plugin.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "plugin.h"
+#include "legacytrayapplet.h"
+
+#include <QtPlugin>
+
+QString LegacyTrayPlugin::appletName() const
+{
+    return QString("legacytray");
+}
+
+PanelApplet* LegacyTrayPlugin::createApplet() const
+{
+    return new LegacyTrayApplet();
+}
+
+Q_EXPORT_PLUGIN2(panelplugin-legacytray, LegacyTrayPlugin)
+
+#include "plugin.moc"

=== added file 'panel/applets/legacytray/plugin.h'
--- panel/applets/legacytray/plugin.h	1970-01-01 00:00:00 +0000
+++ panel/applets/legacytray/plugin.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef LEGACYTRAY_PLUGIN_H
+#define LEGACYTRAY_PLUGIN_H
+
+#include <QString>
+#include <panelappletproviderinterface.h>
+
+using namespace Unity2d;
+
+class LegacyTrayPlugin : public QObject, PanelAppletProviderInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(Unity2d::PanelAppletProviderInterface)
+
+public:
+    QString appletName() const;
+    PanelApplet* createApplet() const;
+};
+
+#endif // LEGACYTRAY_PLUGIN_H

=== added directory 'panel/applets/separator'
=== added file 'panel/applets/separator/CMakeLists.txt'
--- panel/applets/separator/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ panel/applets/separator/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -0,0 +1,32 @@
+project(panelplugin-separator)
+
+# Sources
+set(separator_SRCS
+    separatorapplet.cpp
+    plugin.cpp
+    )
+
+# Build
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${libunity-2d-private_SOURCE_DIR}/src
+    )
+
+qt4_automoc(${separator_SRCS})
+add_library(panelplugin-separator SHARED ${separator_SRCS})
+set_target_properties(panelplugin-separator PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ".."
+    VERSION 0
+    SOVERSION 0.0
+    )
+
+target_link_libraries(panelplugin-separator
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    unity-2d-private
+    )
+
+install(TARGETS panelplugin-separator
+        LIBRARY DESTINATION lib/unity-2d/plugins/panel
+       )

=== added file 'panel/applets/separator/plugin.cpp'
--- panel/applets/separator/plugin.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/separator/plugin.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "plugin.h"
+#include "separatorapplet.h"
+
+#include <QtPlugin>
+
+QString SeparatorPlugin::appletName() const
+{
+    return QString("separator");
+}
+
+PanelApplet* SeparatorPlugin::createApplet() const
+{
+    return new SeparatorApplet();
+}
+
+Q_EXPORT_PLUGIN2(panelplugin-separator, SeparatorPlugin)
+
+#include "plugin.moc"

=== added file 'panel/applets/separator/plugin.h'
--- panel/applets/separator/plugin.h	1970-01-01 00:00:00 +0000
+++ panel/applets/separator/plugin.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef SEPARATOR_PLUGIN_H
+#define SEPARATOR_PLUGIN_H
+
+#include <QString>
+#include <panelappletproviderinterface.h>
+
+using namespace Unity2d;
+
+class SeparatorPlugin : public QObject, PanelAppletProviderInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(Unity2d::PanelAppletProviderInterface)
+
+public:
+    QString appletName() const;
+    PanelApplet* createApplet() const;
+};
+
+#endif // SEPARATOR_PLUGIN_H

=== added file 'panel/applets/separator/separatorapplet.cpp'
--- panel/applets/separator/separatorapplet.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/separator/separatorapplet.cpp	2011-08-16 14:11:07 +0000
@@ -0,0 +1,44 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "separatorapplet.h"
+
+// Local
+#include <config.h>
+
+// QT
+#include <QPixmap>
+#include <QHBoxLayout>
+
+SeparatorApplet::SeparatorApplet()
+    : m_separator(new QLabel())
+{
+    QPixmap pix(unity2dDirectory() + "/panel/artwork/divider.png");
+    m_separator->setPixmap(pix);
+    m_separator->setFixedSize(pix.size());
+
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setMargin(0);
+    layout->addWidget(m_separator);
+}
+
+#include "separatorapplet.moc"

=== added file 'panel/applets/separator/separatorapplet.h'
--- panel/applets/separator/separatorapplet.h	1970-01-01 00:00:00 +0000
+++ panel/applets/separator/separatorapplet.h	2011-08-16 14:11:07 +0000
@@ -0,0 +1,44 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SEPARATORAPPLET_H
+#define SEPARATORAPPLET_H
+
+// Qt
+#include <QLabel>
+
+// Unity-2d
+#include <panelapplet.h>
+
+using namespace Unity2d;
+
+class SeparatorApplet : public Unity2d::PanelApplet
+{
+Q_OBJECT
+public:
+    SeparatorApplet();
+
+private:
+    Q_DISABLE_COPY(SeparatorApplet)
+    QLabel* m_separator;
+};
+
+#endif /* SEPARATORAPPLET_H */

=== modified file 'panel/tests/CMakeLists.txt'
--- panel/tests/CMakeLists.txt	2011-01-27 16:23:33 +0000
+++ panel/tests/CMakeLists.txt	2011-08-16 14:11:07 +0000
@@ -6,7 +6,7 @@
         qt4_generate_moc(${_test}.cpp ${_test}.moc)
         target_link_libraries(${_test}
             ${QT_QTTEST_LIBRARIES}
-            uqapplets
+            panelplugin-homebutton
             )
         set(_test_list "${_test_list};${_test}")
     endforeach(_test)
@@ -17,8 +17,7 @@
 endmacro(panel_tests)
 
 include_directories(
-    ${uqapplets_SOURCE_DIR}/homebutton
-    ${uqapplets_SOURCE_DIR}/common
+    ${panelplugin-homebutton_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTTEST_INCLUDE_DIR}
     )

=== modified file 'panel/tests/homebuttonapplettest.cpp'
--- panel/tests/homebuttonapplettest.cpp	2011-01-15 01:41:03 +0000
+++ panel/tests/homebuttonapplettest.cpp	2011-08-16 14:11:07 +0000
@@ -25,11 +25,10 @@
 // Qt
 #include <QtTestGui>
 
-using namespace Unity2d;
-
 class HomeButtonAppletTest : public QObject
 {
     Q_OBJECT
+
 private Q_SLOTS:
     void testCreateButton()
     {