Merge lp:~agateau/libdbusmenu-qt/kmenu-title into lp:~agateau/libdbusmenu-qt/trunk

[Aurélien Gâteau]

Reimplementation of support for KMenu titles. This implementation is not based on external contributor code. Please compare it to the previous one [1] to confirm it can go in without any copyright issue

[1]: http://bazaar.launchpad.net/~agateau/libdbusmenu-qt/trunk/revision/153

[David Barth (dbarth)]

+1

review: Approve

=== modified file 'src/dbusmenuexporter.cpp'
--- src/dbusmenuexporter.cpp	2010-09-20 08:55:12 +0000
+++ src/dbusmenuexporter.cpp	2010-09-21 15:46:42 +0000
@@ -78,7 +78,7 @@
 QVariantMap DBusMenuExporterPrivate::propertiesForKMenuTitleAction(QAction *action_) const
 {
     QVariantMap map;
-    map.insert("enabled", false);
+    map.insert("x-kde-title", true);
 
     const QWidgetAction *widgetAction = qobject_cast<const QWidgetAction *>(action_);
     DMRETURN_VALUE_IF_FAIL(widgetAction, map);

=== modified file 'src/dbusmenuimporter.cpp'
--- src/dbusmenuimporter.cpp	2010-09-20 08:55:12 +0000
+++ src/dbusmenuimporter.cpp	2010-09-21 15:46:42 +0000
@@ -27,11 +27,14 @@
 #include <QDBusMetaType>
 #include <QDBusReply>
 #include <QDBusVariant>
+#include <QFont>
 #include <QMenu>
 #include <QPointer>
 #include <QSignalMapper>
 #include <QTime>
 #include <QTimer>
+#include <QToolButton>
+#include <QWidgetAction>
 
 // Local
 #include "dbusmenuitem_p.h"
@@ -66,6 +69,22 @@
     DBusMenuImporterMethod m_method;
 };
 
+static QAction *createKdeTitle(QAction *action, QWidget *parent)
+{
+    QToolButton *titleWidget = new QToolButton(0);
+    QFont font = titleWidget->font();
+    font.setBold(true);
+    titleWidget->setFont(font);
+    titleWidget->setIcon(action->icon());
+    titleWidget->setText(action->text());
+    titleWidget->setDown(true);
+    titleWidget->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+    QWidgetAction *titleAction = new QWidgetAction(parent);
+    titleAction->setDefaultWidget(titleWidget);
+    return titleAction;
+}
+
 class DBusMenuImporterPrivate
 {
 public:
@@ -143,8 +162,14 @@
                 group->addAction(action);
             }
         }
+
+        bool isKdeTitle = map.take("x-kde-title").toBool();
         updateAction(action, map, map.keys());
 
+        if (isKdeTitle) {
+            action = createKdeTitle(action, parent);
+        }
+
         return action;
     }