Merge lp:~osomon/unity-2d/natty-panel-backport-oneiric-changes into lp:unity-2d/3.0

[Olivier Tilloy]

[panel] Backport an interface change from the oneiric branch (4.0): pass the panel as a parameter to the constructors of the applets.

[Alberto Mardegan (mardy)]

Thanks for this contribution!

The merge of code from the Oneiric branch is obviously fine.

About the ready() signal, while reviewing your code I started thinking about the emission of the signal from the panelManager; I was thinking of having it emitted by the panel subclass after loading the plugins (maybe with QMetaObject::invokeMethod() with a queued connection). And this led me to wonder, do we really need this signal at all? Why can't the plugins themselves call their lengthy methods with a queued connection?

[Olivier Tilloy (osomon)]

You are right, on second thought this ready() signal is probably not really useful, especially since its implementation is a tad clumsy.

Do we still want to merge the first revision of this branch (the backport from the oneiric branch)? Is there a way to have tarmac merge a selected revision only, or should I undo my last revision, or resubmit another merge request, or even merge it manually?

[Florian Boucault (fboucault)]

> You are right, on second thought this ready() signal is probably not really
> useful, especially since its implementation is a tad clumsy.
>
> Do we still want to merge the first revision of this branch (the backport from
> the oneiric branch)? Is there a way to have tarmac merge a selected revision
> only, or should I undo my last revision, or resubmit another merge request, or
> even merge it manually?

Just undoing your last revision is easiest.

[lp:~osomon/unity-2d/natty-panel-backport-oneiric-changes]

690. By Olivier Tilloy on 2011-09-09

Undo the previous revision.
After discussion (see https://code.launchpad.net/~osomon/unity-2d/natty-panel-notify-loaded/+merge/74223), this has been identified as not necessary.

[Olivier Tilloy (osomon)]

I have reverted the last revision.
I have also updated the name of the branch and the commit message accordingly.

=== modified file 'libunity-2d-private/src/panelapplet.cpp'
--- libunity-2d-private/src/panelapplet.cpp	2011-08-17 09:21:18 +0000
+++ libunity-2d-private/src/panelapplet.cpp	2011-09-09 06:56:54 +0000
@@ -3,12 +3,30 @@
 namespace Unity2d
 {
 
-PanelApplet::PanelApplet(QWidget* parent) :
-    QWidget(parent)
-{
+class PanelAppletPrivate
+{
+    Unity2dPanel* m_panel;
+
+    PanelApplet* q_ptr;
+    Q_DECLARE_PUBLIC(PanelApplet)
+};
+
+PanelApplet::PanelApplet(Unity2dPanel* panel) :
+    QWidget(),
+    d_ptr(new PanelAppletPrivate)
+{
+    Q_D(PanelApplet);
+
+    d->m_panel = panel;
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
 }
 
+Unity2dPanel* PanelApplet::panel() const
+{
+    Q_D(const PanelApplet);
+    return d->m_panel;
+}
+
 } // namespace Unity2d
 
 #include "panelapplet.moc"

=== modified file 'libunity-2d-private/src/panelapplet.h'
--- libunity-2d-private/src/panelapplet.h	2011-08-16 12:58:45 +0000
+++ libunity-2d-private/src/panelapplet.h	2011-09-09 06:56:54 +0000
@@ -23,20 +23,28 @@
 #ifndef PANELAPPLET_H
 #define PANELAPPLET_H
 
+// Local
+class Unity2dPanel;
+
 // Qt
 #include <QWidget>
 
 namespace Unity2d
 {
 
+class PanelAppletPrivate;
 class PanelApplet : public QWidget
 {
     Q_OBJECT
 public:
-    explicit PanelApplet(QWidget* parent = 0);
+    explicit PanelApplet(Unity2dPanel* panel);
+
+    Unity2dPanel* panel() const;
 
 private:
     Q_DISABLE_COPY(PanelApplet)
+    PanelAppletPrivate* d_ptr;
+    Q_DECLARE_PRIVATE(PanelApplet)
 };
 
 } // namespace Unity2d

=== modified file 'libunity-2d-private/src/panelappletproviderinterface.h'
--- libunity-2d-private/src/panelappletproviderinterface.h	2011-08-16 12:58:45 +0000
+++ libunity-2d-private/src/panelappletproviderinterface.h	2011-09-09 06:56:54 +0000
@@ -31,7 +31,7 @@
 {
 public:
     virtual QString appletName() const = 0;
-    virtual PanelApplet* createApplet() const = 0;
+    virtual PanelApplet* createApplet(Unity2dPanel* panel) const = 0;
 };
 
 } // namespace Unity2d

=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-08-19 10:42:32 +0000
+++ panel/app/panelmanager.cpp	2011-09-09 06:56:54 +0000
@@ -130,7 +130,7 @@
     return appletsConfig.toStringList();
 }
 
-static Unity2dPanel* instantiatePanel(int screen)
+Unity2dPanel* PanelManager::instantiatePanel(int screen)
 {
     Unity2dPanel* panel = new Unity2dPanel;
     panel->setEdge(Unity2dPanel::TopEdge);
@@ -156,7 +156,7 @@
                        << "installed plugin providing it.";
         } else {
             if (screen == leftmost || !onlyLeftmost) {
-                QWidget *applet = provider->createApplet();
+                QWidget *applet = provider->createApplet(panel);
                 if (applet == 0) {
                     qWarning() << "The panel applet plugin for" << appletName
                                << "did not return a valid plugin.";

=== modified file 'panel/app/panelmanager.h'
--- panel/app/panelmanager.h	2011-04-04 16:41:15 +0000
+++ panel/app/panelmanager.h	2011-09-09 06:56:54 +0000
@@ -40,6 +40,8 @@
     Q_DISABLE_COPY(PanelManager)
     QList<Unity2dPanel*> m_panels;
 
+    Unity2dPanel* instantiatePanel(int screen);
+
 private Q_SLOTS:
     void onScreenCountChanged(int newCount);
 };

=== modified file 'panel/applets/appindicator/appindicatorapplet.cpp'
--- panel/applets/appindicator/appindicatorapplet.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/appindicator/appindicatorapplet.cpp	2011-09-09 06:56:54 +0000
@@ -37,7 +37,8 @@
 static const char* WATCHER_PATH = "/StatusNotifierWatcher";
 static const char* WATCHER_IFACE = "org.kde.StatusNotifierWatcher";
 
-AppIndicatorApplet::AppIndicatorApplet()
+AppIndicatorApplet::AppIndicatorApplet(Unity2dPanel* panel)
+: Unity2d::PanelApplet(panel)
 {
     setupDBus();
     setupUi();

=== modified file 'panel/applets/appindicator/appindicatorapplet.h'
--- panel/applets/appindicator/appindicatorapplet.h	2011-08-16 12:58:45 +0000
+++ panel/applets/appindicator/appindicatorapplet.h	2011-09-09 06:56:54 +0000
@@ -33,7 +33,7 @@
 {
 Q_OBJECT
 public:
-    AppIndicatorApplet();
+    AppIndicatorApplet(Unity2dPanel* panel);
 
 private:
     Q_DISABLE_COPY(AppIndicatorApplet)

=== modified file 'panel/applets/appindicator/plugin.cpp'
--- panel/applets/appindicator/plugin.cpp	2011-08-16 10:44:38 +0000
+++ panel/applets/appindicator/plugin.cpp	2011-09-09 06:56:54 +0000
@@ -29,9 +29,9 @@
     return QString("appindicator");
 }
 
-PanelApplet* AppIndicatorPlugin::createApplet() const
+PanelApplet* AppIndicatorPlugin::createApplet(Unity2dPanel* panel) const
 {
-    return new AppIndicatorApplet();
+    return new AppIndicatorApplet(panel);
 }
 
 Q_EXPORT_PLUGIN2(panelplugin-appindicator, AppIndicatorPlugin)

=== modified file 'panel/applets/appindicator/plugin.h'
--- panel/applets/appindicator/plugin.h	2011-08-16 12:58:45 +0000
+++ panel/applets/appindicator/plugin.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 
 public:
     QString appletName() const;
-    PanelApplet* createApplet() const;
+    PanelApplet* createApplet(Unity2dPanel* panel) const;
 };
 
 #endif // APPINDICATOR_PLUGIN_H

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-08-17 09:21:18 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-09-09 06:56:54 +0000
@@ -212,8 +212,9 @@
     }
 };
 
-AppNameApplet::AppNameApplet()
-: d(new AppNameAppletPrivate)
+AppNameApplet::AppNameApplet(Unity2dPanel* panel)
+: Unity2d::PanelApplet(panel)
+, d(new AppNameAppletPrivate)
 {
     d->q = this;
     setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);

=== modified file 'panel/applets/appname/appnameapplet.h'
--- panel/applets/appname/appnameapplet.h	2011-08-16 12:58:45 +0000
+++ panel/applets/appname/appnameapplet.h	2011-09-09 06:56:54 +0000
@@ -33,7 +33,7 @@
 {
 Q_OBJECT
 public:
-    AppNameApplet();
+    AppNameApplet(Unity2dPanel* panel);
     ~AppNameApplet();
 
 protected:

=== modified file 'panel/applets/appname/plugin.cpp'
--- panel/applets/appname/plugin.cpp	2011-08-16 10:56:09 +0000
+++ panel/applets/appname/plugin.cpp	2011-09-09 06:56:54 +0000
@@ -29,9 +29,9 @@
     return QString("appname");
 }
 
-PanelApplet* AppNamePlugin::createApplet() const
+PanelApplet* AppNamePlugin::createApplet(Unity2dPanel* panel) const
 {
-    return new AppNameApplet();
+    return new AppNameApplet(panel);
 }
 
 Q_EXPORT_PLUGIN2(panelplugin-appname, AppNamePlugin)

=== modified file 'panel/applets/appname/plugin.h'
--- panel/applets/appname/plugin.h	2011-08-16 12:58:45 +0000
+++ panel/applets/appname/plugin.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 
 public:
     QString appletName() const;
-    PanelApplet* createApplet() const;
+    PanelApplet* createApplet(Unity2dPanel* panel) const;
 };
 
 #endif // APPNAME_PLUGIN_H

=== modified file 'panel/applets/homebutton/homebuttonapplet.cpp'
--- panel/applets/homebutton/homebuttonapplet.cpp	2011-08-11 15:52:38 +0000
+++ panel/applets/homebutton/homebuttonapplet.cpp	2011-09-09 06:56:54 +0000
@@ -38,8 +38,9 @@
 static const char* DBUS_PATH = "/Dash";
 static const char* DBUS_IFACE = "com.canonical.Unity2d.Dash";
 
-HomeButtonApplet::HomeButtonApplet()
-: m_button(new HomeButton)
+HomeButtonApplet::HomeButtonApplet(Unity2dPanel* panel)
+: Unity2d::PanelApplet(panel)
+, m_button(new HomeButton)
 , m_dashInterface(NULL)
 , m_launcherClient(new LauncherClient(this))
 {

=== modified file 'panel/applets/homebutton/homebuttonapplet.h'
--- panel/applets/homebutton/homebuttonapplet.h	2011-08-16 12:58:45 +0000
+++ panel/applets/homebutton/homebuttonapplet.h	2011-09-09 06:56:54 +0000
@@ -35,7 +35,7 @@
 {
 Q_OBJECT
 public:
-    HomeButtonApplet();
+    HomeButtonApplet(Unity2dPanel* panel);
 
 protected:
     void enterEvent(QEvent*);

=== modified file 'panel/applets/homebutton/plugin.cpp'
--- panel/applets/homebutton/plugin.cpp	2011-08-16 10:44:38 +0000
+++ panel/applets/homebutton/plugin.cpp	2011-09-09 06:56:54 +0000
@@ -29,9 +29,9 @@
     return QString("homebutton");
 }
 
-PanelApplet* HomeButtonPlugin::createApplet() const
+PanelApplet* HomeButtonPlugin::createApplet(Unity2dPanel* panel) const
 {
-    return new HomeButtonApplet();
+    return new HomeButtonApplet(panel);
 }
 
 Q_EXPORT_PLUGIN2(panelplugin-homebutton, HomeButtonPlugin)

=== modified file 'panel/applets/homebutton/plugin.h'
--- panel/applets/homebutton/plugin.h	2011-08-16 12:58:45 +0000
+++ panel/applets/homebutton/plugin.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 
 public:
     QString appletName() const;
-    PanelApplet* createApplet() const;
+    PanelApplet* createApplet(Unity2dPanel* panel) const;
 };
 
 #endif // HOMEBUTTON_PLUGIN_H

=== modified file 'panel/applets/indicator/indicatorapplet.cpp'
--- panel/applets/indicator/indicatorapplet.cpp	2011-06-22 14:49:34 +0000
+++ panel/applets/indicator/indicatorapplet.cpp	2011-09-09 06:56:54 +0000
@@ -39,7 +39,8 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-IndicatorApplet::IndicatorApplet()
+IndicatorApplet::IndicatorApplet(Unity2dPanel* panel)
+: Unity2d::PanelApplet(panel)
 {
     setupUi();
     loadIndicators();

=== modified file 'panel/applets/indicator/indicatorapplet.h'
--- panel/applets/indicator/indicatorapplet.h	2011-08-16 12:58:45 +0000
+++ panel/applets/indicator/indicatorapplet.h	2011-09-09 06:56:54 +0000
@@ -37,7 +37,7 @@
 {
 Q_OBJECT
 public:
-    IndicatorApplet();
+    IndicatorApplet(Unity2dPanel* panel);
 
 private Q_SLOTS:
     void loadIndicators();

=== modified file 'panel/applets/indicator/plugin.cpp'
--- panel/applets/indicator/plugin.cpp	2011-08-16 10:44:38 +0000
+++ panel/applets/indicator/plugin.cpp	2011-09-09 06:56:54 +0000
@@ -29,9 +29,9 @@
     return QString("indicator");
 }
 
-PanelApplet* IndicatorPlugin::createApplet() const
+PanelApplet* IndicatorPlugin::createApplet(Unity2dPanel* panel) const
 {
-    return new IndicatorApplet();
+    return new IndicatorApplet(panel);
 }
 
 Q_EXPORT_PLUGIN2(panelplugin-indicator, IndicatorPlugin)

=== modified file 'panel/applets/indicator/plugin.h'
--- panel/applets/indicator/plugin.h	2011-08-16 12:58:45 +0000
+++ panel/applets/indicator/plugin.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 
 public:
     QString appletName() const;
-    PanelApplet* createApplet() const;
+    PanelApplet* createApplet(Unity2dPanel* panel) const;
 };
 
 #endif // INDICATOR_PLUGIN_H

=== modified file 'panel/applets/legacytray/legacytrayapplet.cpp'
--- panel/applets/legacytray/legacytrayapplet.cpp	2011-02-02 16:57:00 +0000
+++ panel/applets/legacytray/legacytrayapplet.cpp	2011-09-09 06:56:54 +0000
@@ -33,8 +33,9 @@
 #include <QApplication>
 #include <QHBoxLayout>
 
-LegacyTrayApplet::LegacyTrayApplet()
-: m_selectionManager(new SystemTray::FdoSelectionManager)
+LegacyTrayApplet::LegacyTrayApplet(Unity2dPanel* panel)
+: Unity2d::PanelApplet(panel)
+, m_selectionManager(new SystemTray::FdoSelectionManager)
 {
     QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 

=== modified file 'panel/applets/legacytray/legacytrayapplet.h'
--- panel/applets/legacytray/legacytrayapplet.h	2011-08-16 12:58:45 +0000
+++ panel/applets/legacytray/legacytrayapplet.h	2011-09-09 06:56:54 +0000
@@ -35,7 +35,7 @@
 {
 Q_OBJECT
 public:
-    LegacyTrayApplet();
+    LegacyTrayApplet(Unity2dPanel* panel);
     virtual ~LegacyTrayApplet();
 
 private Q_SLOTS:

=== modified file 'panel/applets/legacytray/plugin.cpp'
--- panel/applets/legacytray/plugin.cpp	2011-08-16 10:44:38 +0000
+++ panel/applets/legacytray/plugin.cpp	2011-09-09 06:56:54 +0000
@@ -29,9 +29,9 @@
     return QString("legacytray");
 }
 
-PanelApplet* LegacyTrayPlugin::createApplet() const
+PanelApplet* LegacyTrayPlugin::createApplet(Unity2dPanel* panel) const
 {
-    return new LegacyTrayApplet();
+    return new LegacyTrayApplet(panel);
 }
 
 Q_EXPORT_PLUGIN2(panelplugin-legacytray, LegacyTrayPlugin)

=== modified file 'panel/applets/legacytray/plugin.h'
--- panel/applets/legacytray/plugin.h	2011-08-16 12:58:45 +0000
+++ panel/applets/legacytray/plugin.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 
 public:
     QString appletName() const;
-    PanelApplet* createApplet() const;
+    PanelApplet* createApplet(Unity2dPanel* panel) const;
 };
 
 #endif // LEGACYTRAY_PLUGIN_H

=== modified file 'panel/applets/separator/plugin.cpp'
--- panel/applets/separator/plugin.cpp	2011-08-16 10:44:38 +0000
+++ panel/applets/separator/plugin.cpp	2011-09-09 06:56:54 +0000
@@ -29,9 +29,9 @@
     return QString("separator");
 }
 
-PanelApplet* SeparatorPlugin::createApplet() const
+PanelApplet* SeparatorPlugin::createApplet(Unity2dPanel* panel) const
 {
-    return new SeparatorApplet();
+    return new SeparatorApplet(panel);
 }
 
 Q_EXPORT_PLUGIN2(panelplugin-separator, SeparatorPlugin)

=== modified file 'panel/applets/separator/plugin.h'
--- panel/applets/separator/plugin.h	2011-08-16 12:58:45 +0000
+++ panel/applets/separator/plugin.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 
 public:
     QString appletName() const;
-    PanelApplet* createApplet() const;
+    PanelApplet* createApplet(Unity2dPanel* panel) const;
 };
 
 #endif // SEPARATOR_PLUGIN_H

=== modified file 'panel/applets/separator/separatorapplet.cpp'
--- panel/applets/separator/separatorapplet.cpp	2011-08-11 09:56:53 +0000
+++ panel/applets/separator/separatorapplet.cpp	2011-09-09 06:56:54 +0000
@@ -29,8 +29,9 @@
 #include <QPixmap>
 #include <QHBoxLayout>
 
-SeparatorApplet::SeparatorApplet()
-    : m_separator(new QLabel())
+SeparatorApplet::SeparatorApplet(Unity2dPanel* panel) :
+    Unity2d::PanelApplet(panel),
+    m_separator(new QLabel())
 {
     QPixmap pix(unity2dDirectory() + "/panel/artwork/divider.png");
     m_separator->setPixmap(pix);

=== modified file 'panel/applets/separator/separatorapplet.h'
--- panel/applets/separator/separatorapplet.h	2011-08-16 12:58:45 +0000
+++ panel/applets/separator/separatorapplet.h	2011-09-09 06:56:54 +0000
@@ -34,7 +34,7 @@
 {
 Q_OBJECT
 public:
-    SeparatorApplet();
+    SeparatorApplet(Unity2dPanel* panel);
 
 private:
     Q_DISABLE_COPY(SeparatorApplet)

=== modified file 'panel/tests/homebuttonapplettest.cpp'
--- panel/tests/homebuttonapplettest.cpp	2011-08-11 15:52:38 +0000
+++ panel/tests/homebuttonapplettest.cpp	2011-09-09 06:56:54 +0000
@@ -32,7 +32,8 @@
 private Q_SLOTS:
     void testCreateButton()
     {
-        HomeButtonApplet applet;
+        Unity2dPanel* panel = 0;
+        HomeButtonApplet applet(panel);
     }
 };