Merge lp:~mitya57/appmenu-qt5/menus-and-systemtrayicons into lp:appmenu-qt5

[Dmitry Shachnev]

Add implementations of QPlatformMenuItem, QPlatformMenu and QPlatformSystemTrayIcon.

This adds new AppMenuPlatformMenuItem, AppMenuPlatformMenu, AppMenuPlatformSystemTrayIcon classes and helper classes/methods. A result of all this is that QSystemTrayIcon is useful again on Ubuntu.

Please read the QLTBA (questions likely to be asked) in the commit message.

How to test it: you need either Qt 5.4 from ppa:canonical-qt5-edgers/qt5-beta2 or patched Qt 5.3 from ppa:mitya57/test2 (the patch will be in the next official upload). Running systray example from qtbase5-examples should be a good way to test it.

[lp:~mitya57/appmenu-qt5/menus-and-systemtrayicons]

27. By Dmitry Shachnev on 2014-12-13

Add AppMenuPlatformMenuItem and AppMenuPlatformMenu classes

Having these classes will allow us to implement missing functionality
for AppMenuPlatformMenuBar class, and also add a new class for system
tray icons (AppMenuPlatformSystemTrayIcon).

28. By Dmitry Shachnev on 2014-12-13

Add AppMenuPlatformSystemTrayIcon implementation

Q: What’s this for?
A: Currently Qt 5 desktop applications which try to display a system
   tray icon will fail to do so in Unity desktop, because we abandoned
   the old XEmbed-based tray. This branch will make it work again, and
   in a nicer way. As a side-effect, notifications will now work too.

Q: We already have sni-qt, why is this needed?
A: sni-qt was only working with Qt 4, it does not work with Qt 5.
   Actually, a big part of code in this commit is copied from sni-qt.

Q: Why not just port sni-qt to Qt 5, why this code should be here?
A: In Qt 5, features such as platform tray icon should be implemented
   using Qt Platform Abstraction (QPA), which was not the case in Qt 4.
   More important, things like platform menu bar and platform tray icon
   should be in the same plugin, called “platform theme”. There should be
   only one platform theme for a platform, in Ubuntu it is appmenu-qt5.

Q: So is it just a copy of sni-qt code?
A: Most of it is based on sni-qt code, but it was changed a lot to work
   with Qt 5 and QPA interface. I also cleaned it up a bit and deleted
   some stuff that I think is not relevant.

Q: Does it add any additional dependencies to appmenu-qt5?
A: No. The only third-party library it needs is libdbusmenu-qt5, which
   is already used by appmenu-qt5.

Q: How does it work?
A: There are two things we should export — the “status notifier item”
   (which contains icon, tooltip, etc) and the menu. While the status
   notifier item will work with any server-side implementation, the menu
   will only work with ours (indicator-application). When
   indicator-application sees that an item has a menu, it will convert
   it into an indicator, and any indicator renderer (such as Unity, or
   indicator-applet) will show it.

Q: Which desktop environments will it work with?
A: It is designed to work with anything that supports indicators, like
   Unity or GNOME Flashback.

Q: Why the interface has KDE in name?
A: The StatusNotifierItem was originally developed by KDE project. While
   it is very possible that this standard will be adopted by FreeDesktop,
   indicator-application currently only supports the KDE name.

Q: Can KDE reuse this implementation?
A: They already have their own implementation, in Framework Integration.
   I could not reuse their code because they have not signed the
   Canonical contributor license agreement.

[Dmitry Shachnev (mitya57)]

This is ready for review now.

Note that this is disabled for KDE, as it is not going to work properly there. I think we should drop the KDE support altogether, as KDE now has its own platform theme and these two will conflict.

[Łukasz Zemczak (sil2100)]

Looks really good so far. I would like to do a few additional tests tomorrow morning still. Come to think of it, maybe soon we might need to think of changing the name from appmenu-qt5 to something more 'ubuntu-generic'.

[Dmitry Shachnev (mitya57)]

Yes, I want to get bug 1378935 fixed (when I have time for it), and after that it will become a full-featured platform theme. Maybe ubuntu-qt5-platform-theme will be a good name for it.

[Dmitry Shachnev (mitya57)]

I have just been pointed to https://codereview.qt-project.org/102386, which makes this whole branch unneeded. However it has not been merged yes, and if it is merged, in may or may not land in Qt 5.5. So let's keep my implementation until we have that new Qt (5.5 or 5.6) in Ubuntu.

[Łukasz Zemczak (sil2100)]

Ok, the code looks good. I didn't know too much of the old sni-qt code, but it seems everything we need is now included here as well. And let's not worry about future plans for Qt5, we can deprecate this when the need arises. For this cycle we're targeting 5.4 and I'm not sure if we'd jump to an even higher revision before release still.

review: Approve

[Dmitry Shachnev (mitya57)]

Hi Łukasz, are you going to land my branches, or should I take care of that? (Or do you have other pending changes?)

=== added file 'src/appmenuplatformmenu.cpp'
--- src/appmenuplatformmenu.cpp	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformmenu.cpp	2014-12-13 15:39:31 +0000
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "appmenuplatformmenuitem.h"
+#include "appmenuplatformmenu.h"
+
+AppMenuPlatformMenu::AppMenuPlatformMenu():
+    m_menu(new QMenu()),
+    m_tag(0)
+{
+    connect(m_menu, &QMenu::aboutToShow, this, &QPlatformMenu::aboutToShow);
+    connect(m_menu, &QMenu::aboutToHide, this, &QPlatformMenu::aboutToHide);
+}
+
+AppMenuPlatformMenu::~AppMenuPlatformMenu()
+{
+    delete m_menu;
+}
+
+void AppMenuPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
+{
+    AppMenuPlatformMenuItem *myMenuItem = qobject_cast<AppMenuPlatformMenuItem *>(menuItem);
+    AppMenuPlatformMenuItem *myBefore = qobject_cast<AppMenuPlatformMenuItem *>(before);
+
+    QAction *beforeAction = myBefore ? myBefore->m_action : Q_NULLPTR;
+    m_menu->insertAction(beforeAction, myMenuItem->m_action);
+
+    if (!myBefore) {
+        m_menuitems.append(myMenuItem);
+        return;
+    }
+
+    for (int i = 0; i < m_menuitems.size(); ++i) {
+        if (m_menuitems.at(i)->m_action == beforeAction) {
+            m_menuitems.insert(i, myMenuItem);
+            return;
+        }
+    }
+}
+
+void AppMenuPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem)
+{
+    AppMenuPlatformMenuItem *myMenuItem = qobject_cast<AppMenuPlatformMenuItem *>(menuItem);
+    m_menuitems.removeOne(myMenuItem);
+    m_menu->removeAction(myMenuItem->m_action);
+}
+
+void AppMenuPlatformMenu::syncMenuItem(QPlatformMenuItem *menuItem)
+{
+    Q_UNUSED(menuItem);
+}
+
+void AppMenuPlatformMenu::syncSeparatorsCollapsible(bool enable)
+{
+    m_menu->setSeparatorsCollapsible(enable);
+}
+
+void AppMenuPlatformMenu::setTag(quintptr tag)
+{
+    m_tag = tag;
+}
+
+quintptr AppMenuPlatformMenu::tag() const
+{
+    return m_tag;
+}
+
+void AppMenuPlatformMenu::setText(const QString &text)
+{
+    m_menu->setTitle(text);
+}
+
+void AppMenuPlatformMenu::setIcon(const QIcon &icon)
+{
+    m_menu->setIcon(icon);
+}
+
+void AppMenuPlatformMenu::setEnabled(bool enabled)
+{
+    m_menu->setEnabled(enabled);
+}
+
+void AppMenuPlatformMenu::setVisible(bool visible)
+{
+    m_menu->setVisible(visible);
+}
+
+void AppMenuPlatformMenu::setMinimumWidth(int width)
+{
+    m_menu->setMinimumWidth(width);
+}
+
+void AppMenuPlatformMenu::setFont(const QFont &font)
+{
+    m_menu->setFont(font);
+}
+
+QPlatformMenuItem *AppMenuPlatformMenu::menuItemAt(int position) const
+{
+    return m_menuitems.at(position);
+}
+
+QPlatformMenuItem *AppMenuPlatformMenu::menuItemForTag(quintptr tag) const
+{
+    foreach (AppMenuPlatformMenuItem *item, m_menuitems) {
+        if (item->m_tag == tag) {
+            return item;
+        }
+    }
+    return Q_NULLPTR;
+}
+
+QPlatformMenuItem *AppMenuPlatformMenu::createMenuItem() const
+{
+    return new AppMenuPlatformMenuItem();
+}

=== added file 'src/appmenuplatformmenu.h'
--- src/appmenuplatformmenu.h	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformmenu.h	2014-12-13 15:39:31 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef APPMENUPLATFORMMENU_H
+#define APPMENUPLATFORMMENU_H
+
+#include <QtCore/qlist.h>
+#include <QtWidgets/qmenu.h>
+#include <qpa/qplatformmenu.h>
+#include "appmenuplatformmenuitem.h"
+
+class AppMenuPlatformMenu : public QPlatformMenu
+{
+    Q_OBJECT
+    friend class AppMenuPlatformMenuItem;
+    friend class AppMenuPlatformSystemTrayIcon;
+
+public:
+    AppMenuPlatformMenu();
+    virtual ~AppMenuPlatformMenu();
+
+    virtual void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before);
+    virtual void removeMenuItem(QPlatformMenuItem *menuItem);
+    virtual void syncMenuItem(QPlatformMenuItem *menuItem);
+    virtual void syncSeparatorsCollapsible(bool enable);
+    virtual void setTag(quintptr tag);
+    virtual quintptr tag() const;
+    virtual void setText(const QString &text);
+    virtual void setIcon(const QIcon &icon);
+    virtual void setEnabled(bool enabled);
+    virtual void setVisible(bool visible);
+    virtual void setMinimumWidth(int width);
+    virtual void setFont(const QFont &font);
+    virtual QPlatformMenuItem *menuItemAt(int position) const;
+    virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const;
+    virtual QPlatformMenuItem *createMenuItem() const;
+
+private:
+    Q_DISABLE_COPY(AppMenuPlatformMenu)
+
+    QMenu *m_menu;
+    QList<AppMenuPlatformMenuItem *> m_menuitems;
+    quintptr m_tag;
+};
+
+#endif /* APPMENUPLATFORMMENU_H */

=== modified file 'src/appmenuplatformmenubar.cpp'
--- src/appmenuplatformmenubar.cpp	2014-11-24 15:17:32 +0000
+++ src/appmenuplatformmenubar.cpp	2014-12-13 15:39:31 +0000
@@ -17,6 +17,8 @@
  */
 
 #include "appmenuplatformmenubar.h"
+#include "appmenuplatformmenuitem.h"
+#include "appmenuplatformsystemtrayicon.h"
 #include "registrar_interface.h"
 
 // Ugly, but sadly we need to use private headers for desktop-theme related classes
@@ -243,9 +245,14 @@
 {
 public:
     GnomeAppMenuPlatformTheme();
-    virtual QPlatformMenuItem* createPlatformMenuItem() const { return 0; }
+    virtual QPlatformMenuItem* createPlatformMenuItem() const {
+        return new AppMenuPlatformMenuItem();
+    }
     virtual QPlatformMenu* createPlatformMenu() const { return 0; }
     virtual QPlatformMenuBar* createPlatformMenuBar() const;
+    virtual QPlatformSystemTrayIcon* createPlatformSystemTrayIcon() const {
+        return new AppMenuPlatformSystemTrayIcon();
+    }
 
     virtual QVariant themeHint(QPlatformTheme::ThemeHint hint) const;
 };
@@ -304,7 +311,9 @@
     {
     }
 #endif
-    virtual QPlatformMenuItem* createPlatformMenuItem() const { return 0; }
+    virtual QPlatformMenuItem* createPlatformMenuItem() const {
+        return new AppMenuPlatformMenuItem();
+    }
     virtual QPlatformMenu* createPlatformMenu() const { return 0; }
     virtual QPlatformMenuBar* createPlatformMenuBar() const;
 };

=== added file 'src/appmenuplatformmenuitem.cpp'
--- src/appmenuplatformmenuitem.cpp	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformmenuitem.cpp	2014-12-13 15:39:31 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "appmenuplatformmenuitem.h"
+#include "appmenuplatformmenu.h"
+
+AppMenuPlatformMenuItem::AppMenuPlatformMenuItem():
+    m_action(new QAction(this)),
+    m_tag(0)
+{
+    connect(m_action, &QAction::triggered, this, &QPlatformMenuItem::activated);
+    connect(m_action, &QAction::hovered,   this, &QPlatformMenuItem::hovered);
+}
+
+AppMenuPlatformMenuItem::~AppMenuPlatformMenuItem()
+{
+    delete m_action;
+}
+
+void AppMenuPlatformMenuItem::setTag(quintptr tag)
+{
+    m_tag = tag;
+}
+
+quintptr AppMenuPlatformMenuItem::tag() const
+{
+    return m_tag;
+}
+
+void AppMenuPlatformMenuItem::setText(const QString &text)
+{
+    m_action->setText(text);
+}
+
+void AppMenuPlatformMenuItem::setIcon(const QIcon &icon)
+{
+    m_action->setIcon(icon);
+}
+
+void AppMenuPlatformMenuItem::setMenu(QPlatformMenu *menu)
+{
+    if (menu) {
+        AppMenuPlatformMenu *myMenu = qobject_cast<AppMenuPlatformMenu *>(menu);
+        m_action->setMenu(myMenu->m_menu);
+    }
+}
+
+void AppMenuPlatformMenuItem::setVisible(bool isVisible)
+{
+    m_action->setVisible(isVisible);
+}
+
+void AppMenuPlatformMenuItem::setIsSeparator(bool isSeparator)
+{
+    m_action->setSeparator(isSeparator);
+}
+
+void AppMenuPlatformMenuItem::setFont(const QFont &font)
+{
+    m_action->setFont(font);
+}
+
+void AppMenuPlatformMenuItem::setRole(MenuRole role)
+{
+    QAction::MenuRole newRole;
+    switch (role) {
+    case TextHeuristicRole:
+        newRole = QAction::TextHeuristicRole;
+        break;
+    case ApplicationSpecificRole:
+        newRole = QAction::ApplicationSpecificRole;
+        break;
+    case AboutRole:
+        newRole = QAction::AboutRole;
+        break;
+    case PreferencesRole:
+        newRole = QAction::PreferencesRole;
+        break;
+    case QuitRole:
+        newRole = QAction::QuitRole;
+        break;
+    default:
+        newRole = QAction::NoRole;
+    }
+    m_action->setMenuRole(newRole);
+}
+
+void AppMenuPlatformMenuItem::setCheckable(bool checkable)
+{
+    m_action->setCheckable(checkable);
+}
+
+void AppMenuPlatformMenuItem::setChecked(bool isChecked)
+{
+    m_action->setChecked(isChecked);
+}
+
+void AppMenuPlatformMenuItem::setShortcut(const QKeySequence& shortcut)
+{
+    m_action->setShortcut(shortcut);
+}
+
+void AppMenuPlatformMenuItem::setEnabled(bool enabled)
+{
+    m_action->setEnabled(enabled);
+}
+
+void AppMenuPlatformMenuItem::setIconSize(int size)
+{
+    Q_UNUSED(size);
+}

=== added file 'src/appmenuplatformmenuitem.h'
--- src/appmenuplatformmenuitem.h	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformmenuitem.h	2014-12-13 15:39:31 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef APPMENUPLATFORMMENUITEM_H
+#define APPMENUPLATFORMMENUITEM_H
+
+#include <QtWidgets/qaction.h>
+#include <qpa/qplatformmenu.h>
+
+class AppMenuPlatformMenuItem : public QPlatformMenuItem
+{
+    Q_OBJECT
+    friend class AppMenuPlatformMenu;
+
+public:
+    AppMenuPlatformMenuItem();
+    virtual ~AppMenuPlatformMenuItem();
+
+    virtual void setTag(quintptr tag);
+    virtual quintptr tag() const;
+    virtual void setText(const QString &text);
+    virtual void setIcon(const QIcon &icon);
+    virtual void setMenu(QPlatformMenu *menu);
+    virtual void setVisible(bool isVisible);
+    virtual void setIsSeparator(bool isSeparator);
+    virtual void setFont(const QFont &font);
+    virtual void setRole(MenuRole role);
+    virtual void setCheckable(bool checkable);
+    virtual void setChecked(bool isChecked);
+    virtual void setShortcut(const QKeySequence& shortcut);
+    virtual void setEnabled(bool enabled);
+    virtual void setIconSize(int size);
+
+private:
+    Q_DISABLE_COPY(AppMenuPlatformMenuItem)
+
+    QAction *m_action;
+    quintptr m_tag;
+};
+
+#endif /* APPMENUPLATFORMMENUITEM_H */

=== added file 'src/appmenuplatformsystemtrayicon.cpp'
--- src/appmenuplatformsystemtrayicon.cpp	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformsystemtrayicon.cpp	2014-12-13 15:39:31 +0000
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2011 Canonical Ltd.
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on sni-qt code by Aurelien Gateau <[e-mail]>.
+ */
+
+#include <QtCore/qcoreapplication.h>
+#include <QtDBus/qdbusconnection.h>
+#include <QtDBus/qdbusconnectioninterface.h>
+#include <QtDBus/qdbusinterface.h>
+#include "appmenuplatformmenu.h"
+#include "appmenuplatformsystemtrayicon.h"
+#include "iconcache.h"
+
+static const char *SNW_INTERFACE = "org.kde.StatusNotifierWatcher";
+static const char *SNW_SERVICE   = "org.kde.StatusNotifierWatcher";
+static const char *SNW_PATH      = "/StatusNotifierWatcher";
+
+static const char *NOTIFICATION_INTERFACE = "org.freedesktop.Notifications";
+static const char *NOTIFICATION_SERVICE   = "org.freedesktop.Notifications";
+static const char *NOTIFICATION_PATH      = "/org/freedesktop/Notifications";
+
+static IconCache iconCache;
+
+AppMenuPlatformSystemTrayIcon::AppMenuPlatformSystemTrayIcon():
+    m_sniAdaptor(new StatusNotifierItemAdaptor(this)),
+    m_dbusMenuExporter(Q_NULLPTR)
+{
+    static int id = 1;
+    m_objectPath = QString("/org/kde/statusnotifieritem/%1").arg(id++);
+
+    registerMetaTypes();
+    QDBusConnection bus = QDBusConnection::sessionBus();
+    bus.registerObject(m_objectPath, this, QDBusConnection::ExportAdaptors);
+    QDBusInterface snw(SNW_SERVICE, SNW_PATH, SNW_INTERFACE);
+    snw.asyncCall("RegisterStatusNotifierItem", m_objectPath);
+}
+
+AppMenuPlatformSystemTrayIcon::~AppMenuPlatformSystemTrayIcon()
+{
+    delete m_sniAdaptor;
+}
+
+// QPlatformSystemTrayIcon implementation
+
+void AppMenuPlatformSystemTrayIcon::init()
+{
+    m_status = QStringLiteral("Active");
+    emit NewStatus(m_status);
+}
+
+void AppMenuPlatformSystemTrayIcon::cleanup()
+{
+    m_status = QStringLiteral("Passive");
+    emit NewStatus(m_status);
+}
+
+void AppMenuPlatformSystemTrayIcon::updateIcon(const QIcon &icon)
+{
+    m_icon = icon;
+    emit NewIcon();
+    emit NewToolTip(); // ToolTip contains the icon
+}
+
+void AppMenuPlatformSystemTrayIcon::updateToolTip(const QString &tooltip)
+{
+    m_tooltip = tooltip;
+    emit NewToolTip();
+}
+
+void AppMenuPlatformSystemTrayIcon::updateMenu(QPlatformMenu *menu)
+{
+    QMenu *qMenu = qobject_cast<AppMenuPlatformMenu *>(menu)->m_menu;
+    QString menuObjectPath = m_objectPath + QStringLiteral("/menu");
+    m_dbusMenuExporter = new DBusMenuExporter(menuObjectPath, qMenu);
+}
+
+QRect AppMenuPlatformSystemTrayIcon::geometry() const
+{
+    return QRect();
+}
+
+void AppMenuPlatformSystemTrayIcon::showMessage(const QString &title, const QString &msg,
+                                                const QIcon &icon, MessageIcon iconType, int msecs)
+{
+    QString iconString = icon.name();
+    if (iconString.isEmpty()) {
+        switch (iconType) {
+        case NoIcon:
+            break;
+        case Information:
+            iconString = "dialog-information";
+            break;
+        case Warning:
+            iconString = "dialog-warning";
+            break;
+        case Critical:
+            iconString = "dialog-error";
+            break;
+        }
+    }
+
+    QDBusInterface iface(NOTIFICATION_SERVICE, NOTIFICATION_PATH, NOTIFICATION_INTERFACE);
+    iface.asyncCall("Notify",
+                    id(),
+                    quint32(0),    // replaces_id
+                    iconString,
+                    title,
+                    msg,
+                    QStringList(), // actions
+                    QVariantMap(), // hints
+                    msecs);        // timeout
+}
+
+bool AppMenuPlatformSystemTrayIcon::isSystemTrayAvailable() const
+{
+    const QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface();
+    if (!interface->isServiceRegistered(SNW_SERVICE).value()) {
+        return false;
+    }
+    QDBusInterface snw(SNW_SERVICE, SNW_PATH, SNW_INTERFACE);
+    QVariant value = snw.property("IsStatusNotifierHostRegistered");
+    if (!value.canConvert<bool>()) {
+        return false;
+    }
+    return value.toBool();
+}
+
+bool AppMenuPlatformSystemTrayIcon::supportsMessages() const
+{
+    const QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface();
+    return interface->isServiceRegistered(NOTIFICATION_SERVICE).value();
+}
+
+QPlatformMenu *AppMenuPlatformSystemTrayIcon::createMenu() const
+{
+    return new AppMenuPlatformMenu();
+}
+
+// Properties
+
+QString AppMenuPlatformSystemTrayIcon::category() const
+{
+    return QStringLiteral("ApplicationStatus");
+}
+
+QString AppMenuPlatformSystemTrayIcon::id() const
+{
+    return QCoreApplication::applicationFilePath().section('/', -1);
+}
+
+QString AppMenuPlatformSystemTrayIcon::title() const
+{
+    QString title = QCoreApplication::applicationName();
+    return title.isEmpty() ? id() : title;
+}
+
+QString AppMenuPlatformSystemTrayIcon::status() const
+{
+    return m_status;
+}
+
+QString AppMenuPlatformSystemTrayIcon::iconThemePath() const
+{
+    return iconCache.themePath();
+}
+
+QString AppMenuPlatformSystemTrayIcon::iconName() const
+{
+    if (m_icon.isNull()) {
+        return QString();
+    }
+    QString name = m_icon.name();
+    if (!name.isEmpty()) {
+        return name;
+    }
+
+    return iconCache.nameForIcon(m_icon);
+}
+
+DBusToolTip AppMenuPlatformSystemTrayIcon::toolTip() const
+{
+    DBusToolTip tip;
+    tip.iconName = iconName();
+    tip.title = m_tooltip;
+    return tip;
+}
+
+QDBusObjectPath AppMenuPlatformSystemTrayIcon::menu() const
+{
+    return m_dbusMenuExporter
+        ? QDBusObjectPath(m_objectPath + QStringLiteral("/menu"))
+        : QDBusObjectPath("/invalid");
+}
+
+// StatusNotifierItem implementation
+
+void AppMenuPlatformSystemTrayIcon::ContextMenu(int x, int y)
+{
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+}
+
+void AppMenuPlatformSystemTrayIcon::Activate(int x, int y)
+{
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    emit activated(Trigger);
+}
+
+void AppMenuPlatformSystemTrayIcon::SecondaryActivate(int x, int y)
+{
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    emit activated(MiddleClick);
+}
+
+void AppMenuPlatformSystemTrayIcon::Scroll(int delta, const QString& orientation)
+{
+    Q_UNUSED(delta);
+    Q_UNUSED(orientation);
+}

=== added file 'src/appmenuplatformsystemtrayicon.h'
--- src/appmenuplatformsystemtrayicon.h	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformsystemtrayicon.h	2014-12-13 15:39:31 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef APPMENUPLATFORMSYSTEMTRAYICON_H
+#define APPMENUPLATFORMSYSTEMTRAYICON_H
+
+#include <QtCore/qrect.h>
+#include <QtCore/qstring.h>
+#include <QtGui/qicon.h>
+#include <qpa/qplatformsystemtrayicon.h>
+#include <dbusmenuexporter.h>
+#include "statusnotifieritem_adaptor.h"
+
+class AppMenuPlatformSystemTrayIcon : public QPlatformSystemTrayIcon
+{
+    Q_OBJECT
+    Q_PROPERTY(QString Category READ category)
+    Q_PROPERTY(QString Id READ id)
+    Q_PROPERTY(QString Title READ title)
+    Q_PROPERTY(QString Status READ status)
+    Q_PROPERTY(quint32 WindowId READ windowId)
+    Q_PROPERTY(QString IconThemePath READ iconThemePath)
+    Q_PROPERTY(QString IconName READ iconName)
+    Q_PROPERTY(DBusImageList IconPixmap READ iconPixmap)
+    Q_PROPERTY(QString OverlayIconName READ overlayIconName)
+    Q_PROPERTY(DBusImageList OverlayIconPixmap READ overlayIconPixmap)
+    Q_PROPERTY(QString AttentionIconName READ attentionIconName)
+    Q_PROPERTY(DBusImageList AttentionIconPixmap READ attentionIconPixmap)
+    Q_PROPERTY(QString AttentionMovieName READ attentionMovieName)
+    Q_PROPERTY(DBusToolTip ToolTip READ toolTip)
+    Q_PROPERTY(QDBusObjectPath Menu READ menu)
+
+public:
+    AppMenuPlatformSystemTrayIcon();
+    virtual ~AppMenuPlatformSystemTrayIcon();
+
+    // QPlatformSystemTrayIcon
+    virtual void init();
+    virtual void cleanup();
+    virtual void updateIcon(const QIcon &icon);
+    virtual void updateToolTip(const QString &tooltip);
+    virtual void updateMenu(QPlatformMenu *menu);
+    virtual QRect geometry() const;
+    virtual void showMessage(const QString &title, const QString &msg,
+                             const QIcon &icon, MessageIcon iconType, int msecs);
+    virtual bool isSystemTrayAvailable() const;
+    virtual bool supportsMessages() const;
+    virtual QPlatformMenu *createMenu() const;
+
+    // Properties
+    QString category() const;
+    QString id() const;
+    QString title() const;
+    QString status() const;
+    quint32 windowId() const { return 0; }
+    QString iconThemePath() const;
+    QString iconName() const;
+    DBusImageList iconPixmap() const { return DBusImageList(); }
+    QString overlayIconName() const { return QString(); }
+    DBusImageList overlayIconPixmap() const { return DBusImageList(); }
+    QString attentionIconName() const { return QString(); }
+    DBusImageList attentionIconPixmap() const { return DBusImageList(); }
+    QString attentionMovieName() const { return QString(); }
+    DBusToolTip toolTip() const;
+    QDBusObjectPath menu() const;
+
+    // StatusNotifierItem
+    void ContextMenu(int x, int y);
+    void Activate(int x, int y);
+    void SecondaryActivate(int x, int y);
+    void Scroll(int delta, const QString& orientation);
+
+Q_SIGNALS:
+    void NewStatus(const QString &status);
+    void NewIcon();
+    void NewToolTip();
+
+private:
+    QString m_objectPath;
+    QString m_status;
+    QIcon m_icon;
+    QString m_tooltip;
+
+    StatusNotifierItemAdaptor *m_sniAdaptor;
+    DBusMenuExporter *m_dbusMenuExporter;
+};
+
+#endif /* APPMENUPLATFORMSYSTEMTRAYICON_H */

=== added file 'src/dbusstructures.cpp'
--- src/dbusstructures.cpp	1970-01-01 00:00:00 +0000
+++ src/dbusstructures.cpp	2014-12-13 15:39:31 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2011 Canonical Ltd.
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on sni-qt code by Aurelien Gateau <[e-mail]>.
+ */
+
+#include <QtDBus/qdbusmetatype.h>
+#include "dbusstructures.h"
+
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusImage &image)
+{
+    argument.beginStructure();
+    argument << image.width << image.height << image.pixels;
+    argument.endStructure();
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusImage &image)
+{
+    argument.beginStructure();
+    argument >> image.width >> image.height >> image.pixels;
+    argument.endStructure();
+    return argument;
+}
+
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusToolTip &tip)
+{
+    argument.beginStructure();
+    argument << tip.iconName << tip.iconPixmap << tip.title << tip.description;
+    argument.endStructure();
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusToolTip &tip)
+{
+    argument.beginStructure();
+    argument >> tip.iconName >> tip.iconPixmap >> tip.title >> tip.description;
+    argument.endStructure();
+    return argument;
+}
+
+void registerMetaTypes()
+{
+    static bool registered = false;
+    if (registered) {
+        return;
+    }
+    qDBusRegisterMetaType<DBusImage>();
+    qDBusRegisterMetaType<DBusImageList>();
+    qDBusRegisterMetaType<DBusToolTip>();
+}

=== added file 'src/dbusstructures.h'
--- src/dbusstructures.h	1970-01-01 00:00:00 +0000
+++ src/dbusstructures.h	2014-12-13 15:39:31 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2011 Canonical Ltd.
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on sni-qt code by Aurelien Gateau <[e-mail]>.
+ */
+
+#ifndef DBUSSTRUCTURES_H
+#define DBUSSTRUCTURES_H
+
+#include <QtCore/qbytearray.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qlist.h>
+#include <QtGui/qicon.h>
+#include <QtGui/qpixmap.h>
+#include <QtDBus/qdbusargument.h>
+
+struct DBusImage
+{
+    int width;
+    int height;
+    QByteArray pixels;
+};
+Q_DECLARE_METATYPE(DBusImage)
+
+typedef QList<DBusImage> DBusImageList;
+Q_DECLARE_METATYPE(DBusImageList)
+
+struct DBusToolTip
+{
+    QString iconName;
+    DBusImageList iconPixmap;
+    QString title;
+    QString description;
+};
+Q_DECLARE_METATYPE(DBusToolTip)
+
+QDBusArgument &operator<<(QDBusArgument&, const DBusImage&);
+const QDBusArgument &operator>>(const QDBusArgument&, DBusImage&);
+
+QDBusArgument &operator<<(QDBusArgument&, const DBusToolTip&);
+const QDBusArgument &operator>>(const QDBusArgument&, DBusToolTip&);
+
+void registerMetaTypes();
+
+#endif /* DBUSSTRUCTURES_H */

=== added file 'src/iconcache.cpp'
--- src/iconcache.cpp	1970-01-01 00:00:00 +0000
+++ src/iconcache.cpp	2014-12-13 15:39:31 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2011 Canonical Ltd.
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on sni-qt code by Aurelien Gateau <[e-mail]>.
+ */
+
+#include <sys/types.h>
+#include <utime.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qdir.h>
+#include "iconcache.h"
+
+const int IconCache::MaxIconCount = 20;
+
+IconCache::IconCache(QObject *parent):
+    QObject(parent),
+    m_temporaryDir(Q_NULLPTR),
+    m_initialized(false)
+{
+}
+
+IconCache::~IconCache()
+{
+    if (m_temporaryDir) {
+        delete m_temporaryDir;
+    }
+}
+
+QString IconCache::themePath()
+{
+    if (!m_initialized) {
+        QString path = QDir::tempPath() + QStringLiteral("/iconcache-XXXXXX");
+        m_temporaryDir = new QTemporaryDir(path);
+        m_initialized = true;
+    }
+    return m_temporaryDir->path();
+}
+
+QString IconCache::nameForIcon(const QIcon &icon)
+{
+    if (icon.isNull()) {
+        return QString();
+    }
+
+    qint64 key = icon.cacheKey();
+    QList<qint64>::iterator it = qFind(m_cacheKeys.begin(), m_cacheKeys.end(), key);
+    if (it == m_cacheKeys.end()) {
+        cacheIcon(key, icon);
+        trimCache();
+    } else {
+        // Place key at the end of list as it is the most recently accessed
+        m_cacheKeys.erase(it);
+        m_cacheKeys.append(key);
+    }
+
+    return QString::number(key);
+}
+
+void IconCache::trimCache()
+{
+    QDir dir(themePath() + "/hicolor");
+    dir.setFilter(QDir::Dirs);
+
+    while (m_cacheKeys.count() > MaxIconCount) {
+        qint64 cacheKey = m_cacheKeys.takeFirst();
+
+        Q_FOREACH(const QString &sizeDir, dir.entryList()) {
+            QString iconSubPath = QString("%1/apps/%2.png").arg(sizeDir).arg(cacheKey);
+            if (dir.exists(iconSubPath)) {
+                dir.remove(iconSubPath);
+            }
+        }
+    }
+}
+
+void touch(const QString &_name, const QDateTime &time)
+{
+    QByteArray name = QFile::encodeName(_name);
+    struct utimbuf buf;
+    buf.actime = time.toTime_t();
+    buf.modtime = buf.actime;
+    int ret = utime(name.data(), &buf);
+    if (ret) {
+        qCritical("Failed to touch %s: %s", name.data(), strerror(errno));
+    }
+}
+
+void IconCache::cacheIcon(qint64 key, const QIcon &icon)
+{
+    QList<QSize> sizes; //= icon.availableSizes();
+    if (sizes.isEmpty()) {
+        // sizes can be empty if icon is an SVG. In this case generate images for a few sizes
+        sizes << QSize(16, 16) << QSize(22, 22) << QSize(32, 32) << QSize(48, 48);
+    }
+
+    QDir dir(themePath());
+    Q_FOREACH(const QSize &size, sizes) {
+        QPixmap pix = icon.pixmap(size);
+        QString dirName = QString("hicolor/%1x%1/apps").arg(size.width());
+        if (!dir.exists(dirName)) {
+            if (!dir.mkpath(dirName)) {
+                qWarning("Could not create '%s' dir in '%s'",
+                    qPrintable(themePath()), qPrintable(dirName));
+                continue;
+            }
+        }
+        QString pixPath = QString("%1/%2/%3.png")
+            .arg(themePath()).arg(dirName).arg(key);
+        if (!pix.save(pixPath, "png")) {
+            qWarning("Could not save icon as '%s'", qPrintable(pixPath));
+        }
+    }
+
+    m_cacheKeys << key;
+
+    // Touch the theme path: GTK icon loading system checks the mtime of the
+    // dir to decide whether it should look for new icons in the theme dir.
+    //
+    // Note: We do not use QDateTime::currentDateTime() as the new time because
+    // if the icon is updated in less than one second, GTK won't notice it.
+    // See https://bugs.launchpad.net/sni-qt/+bug/812884
+    QFileInfo info(themePath());
+    QDateTime mtime = info.lastModified();
+    touch(themePath(), mtime.addSecs(1));
+}

=== added file 'src/iconcache.h'
--- src/iconcache.h	1970-01-01 00:00:00 +0000
+++ src/iconcache.h	2014-12-13 15:39:31 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2011 Canonical Ltd.
+ * Copyright 2014 Dmitry Shachnev <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on sni-qt code by Aurelien Gateau <[e-mail]>.
+ */
+
+#ifndef ICONCACHE_H
+#define ICONCACHE_H
+
+#include <QtCore/qlist.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qtemporarydir.h>
+#include <QtGui/qicon.h>
+
+/**
+ * This class will save pixmaps from icons in a temporary dir on the disk,
+ * making it possible to pass filenames for icons without names.
+ */
+class IconCache : public QObject
+{
+    Q_OBJECT
+public:
+    IconCache(QObject* parent=0);
+    ~IconCache();
+
+    static const int MaxIconCount;
+
+    QString themePath();
+    QString nameForIcon(const QIcon &icon);
+
+private:
+    QTemporaryDir *m_temporaryDir;
+    mutable QList<qint64> m_cacheKeys;
+    bool m_initialized;
+
+    void cacheIcon(qint64 key, const QIcon &);
+    void trimCache();
+};
+
+#endif /* ICONCACHE_H */

=== added file 'src/org.kde.StatusNotifierItem.xml'
--- src/org.kde.StatusNotifierItem.xml	1970-01-01 00:00:00 +0000
+++ src/org.kde.StatusNotifierItem.xml	2014-12-13 15:39:31 +0000
@@ -0,0 +1,96 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.kde.StatusNotifierItem">
+
+    <property name="Category" type="s" access="read"/>
+    <property name="Id" type="s" access="read"/>
+    <property name="Title" type="s" access="read"/>
+    <property name="Status" type="s" access="read"/>
+    <property name="WindowId" type="i" access="read"/>
+
+    <!-- An additional path to add to the theme search path to find the icons specified above. -->
+    <property name="IconThemePath" type="s" access="read"/>
+    <property name="Menu" type="o" access="read"/>
+    <property name="ItemIsMenu" type="b" access="read"/>
+
+
+    <!-- main icon -->
+    <!-- names are preferred over pixmaps -->
+    <property name="IconName" type="s" access="read"/>
+
+    <!--struct containing width, height and image data-->
+    <property name="IconPixmap" type="(iiay)" access="read">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageList"/>
+    </property>
+
+    <property name="OverlayIconName" type="s" access="read"/>
+
+    <property name="OverlayIconPixmap" type="(iiay)" access="read">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageList"/>
+    </property>
+
+
+    <!-- Requesting attention icon -->
+    <property name="AttentionIconName" type="s" access="read"/>
+
+    <!--same definition as image-->
+    <property name="AttentionIconPixmap" type="(iiay)" access="read">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageList"/>
+    </property>
+
+    <property name="AttentionMovieName" type="s" access="read"/>
+
+
+
+    <!-- tooltip data -->
+
+    <!--(iiay) is an image-->
+    <property name="ToolTip" type="(s(iiay)ss)" access="read">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusToolTip"/>
+    </property>
+
+
+    <!-- interaction: the systemtray wants the application to do something -->
+    <method name="ContextMenu">
+        <!-- we're passing the coordinates of the icon, so the app knows where to put the popup window -->
+        <arg name="x" type="i" direction="in"/>
+        <arg name="y" type="i" direction="in"/>
+    </method>
+
+    <method name="Activate">
+        <arg name="x" type="i" direction="in"/>
+        <arg name="y" type="i" direction="in"/>
+    </method>
+
+    <method name="SecondaryActivate">
+        <arg name="x" type="i" direction="in"/>
+        <arg name="y" type="i" direction="in"/>
+    </method>
+
+    <method name="Scroll">
+      <arg name="delta" type="i" direction="in"/>
+      <arg name="orientation" type="s" direction="in"/>
+    </method>
+
+    <!-- Signals: the client wants to change something in the status-->
+    <signal name="NewTitle">
+    </signal>
+
+    <signal name="NewIcon">
+    </signal>
+
+    <signal name="NewAttentionIcon">
+    </signal>
+
+    <signal name="NewOverlayIcon">
+    </signal>
+
+    <signal name="NewToolTip">
+    </signal>
+
+    <signal name="NewStatus">
+      <arg name="status" type="s"/>
+    </signal>
+
+  </interface>
+</node>

=== modified file 'src/src.pro'
--- src/src.pro	2014-04-14 15:04:02 +0000
+++ src/src.pro	2014-12-13 15:39:31 +0000
@@ -6,14 +6,25 @@
 
 QT += core-private gui-private platformsupport-private dbus widgets
 DBUS_INTERFACES += com.canonical.AppMenu.Registrar.xml
+DBUS_ADAPTORS += org.kde.StatusNotifierItem.xml
+QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS += -i dbusstructures.h
 
 CONFIG += X11 link_pkgconfig debug
 PKGCONFIG += dbusmenu-qt5 gtk+-2.0
 DESTDIR = ./
 
 HEADERS += \
-        appmenuplatformmenubar.h
+        appmenuplatformmenuitem.h \
+        appmenuplatformmenu.h \
+        appmenuplatformmenubar.h \
+        appmenuplatformsystemtrayicon.h \
+        dbusstructures.h \
+        iconcache.h
 
 SOURCES += \
-        appmenuplatformmenubar.cpp
-
+        appmenuplatformmenuitem.cpp \
+        appmenuplatformmenu.cpp \
+        appmenuplatformmenubar.cpp \
+        appmenuplatformsystemtrayicon.cpp \
+        dbusstructures.cpp \
+        iconcache.cpp