Merge lp:~aacid/unity-2d/unity-2d-shell_no_dbus_to_ourselves into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

[shell] Do not use dbus calls when we can just use in-process calls

[Michał Sawicz (saviq)]

Do we really have to go through C++ for the BFB? Couldn't we do everything on the QML side of things?

review: Needs Information

[lp:~aacid/unity-2d/unity-2d-shell_no_dbus_to_ourselves]

922. By Albert Astals Cid on 2012-01-23

merge

[Albert Astals Cid (aacid)]

Without changing quite a lot of code, yes, in the current implementation BfbItem is a LauncherItem that means BfbItem needs the implementation in C++ of the activate() function since it is pure virtual in LauncherItem

[lp:~aacid/unity-2d/unity-2d-shell_no_dbus_to_ourselves]

923. By Albert Astals Cid on 2012-01-23

merge

[Michał Sawicz (saviq)]

We need tests to ensure no regression, please add tests for any interactions that were touched.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Added check for both clicking the bfb (BfbItem::activate) and for pressing Alt+F2 (ShellDeclarativeView::showCommandsLens) in https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_alt_f2_pops_dash/+merge/89873

You'll need to adapt the test a bit since they are against unity-2d and not unity-2d-shell

=== modified file 'libunity-2d-private/src/bfb.cpp'
--- libunity-2d-private/src/bfb.cpp	2011-12-09 13:46:10 +0000
+++ libunity-2d-private/src/bfb.cpp	2012-01-23 15:11:23 +0000
@@ -21,17 +21,14 @@
 #include "bfb.h"
 
 // libunity-2d
-#include <dashclient.h>
 #include <debug_p.h>
 #include <unity2dtr.h>
 
 // Qt
 
 BfbItem::BfbItem()
-: m_active(false)
+: m_active(false), m_view(NULL)
 {
-    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
-        SLOT(slotActivePageChanged(const QString&)));
 }
 
 BfbItem::~BfbItem()
@@ -43,15 +40,6 @@
     return m_active;
 }
 
-void BfbItem::slotActivePageChanged(const QString& page)
-{
-    bool active = !page.isEmpty();
-    if (m_active != active) {
-        m_active = active;
-        activeChanged(m_active);
-    }
-}
-
 bool BfbItem::running() const
 {
     return false;
@@ -82,15 +70,42 @@
     return false;
 }
 
+QObject* BfbItem::dashView() const
+{
+    return m_view;
+}
+
+void BfbItem::setDashView(QObject* view)
+{
+    if (m_view != NULL) {
+        disconnect(view);
+    }
+    m_view = view;
+    if (m_view != NULL) {
+        connect(view, SIGNAL(dashActiveChanged(bool)), this, SLOT(slotDashActiveChanged(bool)));
+    }
+}
+
 void BfbItem::activate()
 {
-    DashClient::instance()->setActivePage(m_active ? "" : "home");
+    Q_ASSERT(m_view != NULL);
+    if (m_view != NULL) {
+        QMetaObject::invokeMethod(m_view, "toggleDash");
+    }
 }
 
 void BfbItem::createMenuActions()
 {
 }
 
+void BfbItem::slotDashActiveChanged(bool active)
+{
+    if (m_active != active) {
+        m_active = active;
+        Q_EMIT activeChanged(m_active);
+    }
+}
+
 ////////////////////////////////////////////////////////////
 BfbModel::BfbModel(QObject* parent)
 : QAbstractListModel(parent)
@@ -117,4 +132,14 @@
     return QVariant::fromValue(m_bfbItem);
 }
 
+QObject* BfbModel::dashView() const
+{
+    return m_bfbItem->dashView();
+}
+
+void BfbModel::setDashView(QObject* view)
+{
+    m_bfbItem->setDashView(view);
+}
+
 #include <bfb.moc>

=== modified file 'libunity-2d-private/src/bfb.h'
--- libunity-2d-private/src/bfb.h	2011-08-11 09:25:35 +0000
+++ libunity-2d-private/src/bfb.h	2012-01-23 15:11:23 +0000
@@ -42,16 +42,20 @@
     virtual QString icon() const;
     virtual bool launching() const;
 
+    QObject* dashView() const;
+    void setDashView(QObject* view);
+
     /* methods */
     Q_INVOKABLE virtual void activate();
     Q_INVOKABLE virtual void createMenuActions();
 
 private Q_SLOTS:
-    void slotActivePageChanged(const QString&);
+    void slotDashActiveChanged(bool active);
 
 private:
     Q_DISABLE_COPY(BfbItem)
     bool m_active;
+    QObject* m_view;
 };
 
 Q_DECLARE_METATYPE(BfbItem*)
@@ -60,6 +64,7 @@
 class BfbModel : public QAbstractListModel
 {
     Q_OBJECT
+    Q_PROPERTY(QObject* dashView READ dashView WRITE setDashView)
 public:
     BfbModel(QObject* parent = 0);
     ~BfbModel();
@@ -67,6 +72,9 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
+    QObject* dashView() const;
+    void setDashView(QObject* view);
+
 private:
     Q_DISABLE_COPY(BfbModel)
     BfbItem* m_bfbItem;

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-01-19 14:40:22 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-01-23 15:11:23 +0000
@@ -47,10 +47,6 @@
 
 static const int KEY_HOLD_THRESHOLD = 250;
 
-static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
-static const char* DASH_DBUS_PATH = "/Dash";
-static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
-
 static const char* SPREAD_DBUS_SERVICE = "com.canonical.Unity2d.Spread";
 static const char* SPREAD_DBUS_PATH = "/Spread";
 static const char* SPREAD_DBUS_INTERFACE = "com.canonical.Unity2d.Spread";
@@ -266,9 +262,7 @@
 void
 ShellDeclarativeView::showCommandsLens()
 {
-    // TODO: do this directly, instead of over dbus
-    QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    dashInterface.asyncCall("activateLens", COMMANDS_LENS_ID);
+    Q_EMIT activateLens(COMMANDS_LENS_ID);
 }
 
 void

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-01-17 11:25:08 +0000
+++ shell/launcher/Launcher.qml	2012-01-23 15:11:23 +0000
@@ -181,6 +181,7 @@
 
     BfbModel {
         id: bfbModel
+        dashView: declarativeView
     }
 
     LauncherApplicationsList {