Merge lp:~torkvemada/libdbusmenu-qt/libdbusmenu-qt into lp:libdbusmenu-qt

[Vsevolod Velichko]

Support for menu to be exported with multiple DBusMenuExporter's.
Example when it's needed: if one wants to export main menu (which is exported by default with appmenu-qt) as the Unity dock menu. Since Qt exports appmenu by default, the menu cannot be exported to dock without the patch.

[Albert Astals Cid (aacid)]

Looks good to me, do you have an application that needs this to work?

review: Approve

[Vsevolod Velichko (torkvemada)]

Yes, we have an IM qutIM who exports its main menu to Unity dock, but it doesn't work since the time when Ubuntu started auto-exporting main menu for Qt applications.

[Albert Astals Cid (aacid)]

Is 0.2.0-0ubuntu9 new enough? What's the difference i should see when running it with and without this patch?

[Vsevolod Velichko (torkvemada)]

No, 0.2 is forgotten and buried. There's an pre-alfa version 0.4 affected, which is currently available only on github and is hard to build :)

[Albert Astals Cid (aacid)]

Tried building the git version, didn't succeeed.

Honestly without a way to try this actually improves things in real life (besides the test) I don't feel like I approve this merge request, problem is that libdbusmenu-qt is kind of unmaintained

[Albert Astals Cid (aacid)]

Putting it to Work In Progress until submitter can provide a better use case of why this is needed.

Unmerged revisions

271. By Vsevolod Velichko on 2015-08-26

test for multiple exporters

270. By Vsevolod Velichko on 2015-08-26

support multiple exporters for one menu

=== modified file 'src/dbusmenu_p.cpp'
--- src/dbusmenu_p.cpp	2011-06-20 15:20:18 +0000
+++ src/dbusmenu_p.cpp	2015-08-26 21:06:14 +0000
@@ -91,4 +91,9 @@
     delete this;
 }
 
+DBusMenuExporter* DBusMenu::exporter() const
+{
+    return m_exporter;
+}
+
 #include "dbusmenu_p.moc"

=== modified file 'src/dbusmenu_p.h'
--- src/dbusmenu_p.h	2013-11-05 04:18:39 +0000
+++ src/dbusmenu_p.h	2015-08-26 21:06:14 +0000
@@ -41,6 +41,8 @@
     DBusMenu(QMenu *menu, DBusMenuExporter *exporter, int parentId);
     virtual ~DBusMenu();
 
+    DBusMenuExporter* exporter() const;
+
 protected:
     virtual bool eventFilter(QObject *obj, QEvent *event);
 

=== modified file 'src/dbusmenuexporter.cpp'
--- src/dbusmenuexporter.cpp	2012-10-24 14:43:10 +0000
+++ src/dbusmenuexporter.cpp	2015-08-26 21:06:14 +0000
@@ -55,10 +55,12 @@
 
 void DBusMenuExporterPrivate::addMenu(QMenu *menu, int parentId)
 {
-    if (menu->findChild<DBusMenu *>()) {
+    Q_FOREACH(DBusMenu *m, menu->findChildren<DBusMenu *>()) {
         // This can happen if a menu is removed from its parent and added back
         // See KDE bug 254066
-        return;
+        if(m->exporter() == q) {
+            return;
+        }
     }
     new DBusMenu(menu, q, parentId);
     Q_FOREACH(QAction *action, menu->actions()) {

=== modified file 'tests/dbusmenuexportertest.cpp'
--- tests/dbusmenuexportertest.cpp	2012-01-23 14:02:42 +0000
+++ tests/dbusmenuexportertest.cpp	2015-08-26 21:06:14 +0000
@@ -42,6 +42,7 @@
 
 static const char *TEST_SERVICE = "org.kde.dbusmenu-qt-test";
 static const char *TEST_OBJECT_PATH = "/TestMenuBar";
+static const char *TEST_OBJECT_PATH2 = "/TestMenuBar2";
 
 Q_DECLARE_METATYPE(QList<int>)
 
@@ -600,6 +601,29 @@
     QCOMPARE(trackCount(subMenu), 1);
 }
 
+// Check that menu can be exported with two different exporters
+void DBusMenuExporterTest::testMultipleExporters()
+{
+    QMenu mainMenu;
+    QVERIFY(QDBusConnection::sessionBus().registerService(TEST_SERVICE));
+    DBusMenuExporter *exporter1 = new DBusMenuExporter(TEST_OBJECT_PATH, &mainMenu);
+    DBusMenuExporter *exporter2 = new DBusMenuExporter(TEST_OBJECT_PATH2, &mainMenu);
+
+    QMenu* subMenu = new QMenu("File");
+    subMenu->addAction("a1");
+    mainMenu.addAction(subMenu->menuAction());
+
+    QDBusInterface iface1(TEST_SERVICE, TEST_OBJECT_PATH);
+    QVERIFY2(iface1.isValid(), qPrintable(iface1.lastError().message()));
+
+    QDBusInterface iface2(TEST_SERVICE, TEST_OBJECT_PATH2);
+    QVERIFY2(iface2.isValid(), qPrintable(iface2.lastError().message()));
+
+    QCOMPARE(getChildren(&iface1, 0, QStringList()).count(), mainMenu.actions().count());
+    QCOMPARE(getChildren(&iface2, 0, QStringList()).count(), mainMenu.actions().count());
+
+}
+
 // If desktop does not want icon in menus, check we do not export them
 void DBusMenuExporterTest::testHonorDontShowIconsInMenusAttribute()
 {

=== modified file 'tests/dbusmenuexportertest.h'
--- tests/dbusmenuexportertest.h	2012-01-18 15:24:13 +0000
+++ tests/dbusmenuexportertest.h	2015-08-26 21:06:14 +0000
@@ -49,6 +49,7 @@
     void testGetGroupProperties();
     void testActivateAction();
     void testTrackActionsOnlyOnce();
+    void testMultipleExporters();
     void testHonorDontShowIconsInMenusAttribute();
     void testDBusMenuObjectIsDeletedWhenExporterIsDeleted();
     void testSeparatorCollapsing_data();