* This contains code from KStatusNotifierItem, part of the KDE libs *
* Copyright (C) 2009 Marco Martin <notmart@gmail.com> *
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) version 3. *
+ * This file is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU Library General Public License (LGPL) *
+ * as published by the Free Software Foundation; either version 2 of the *
+ * License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#ifdef HAVE_DBUS
-#include "statusnotifieritem.h"
-#include "statusnotifieritemdbus.h"
-
#include <QApplication>
#include <QMenu>
#include <QMouseEvent>
#include <QTextDocument>
+#include "quassel.h"
+#include "statusnotifieritem.h"
+#include "statusnotifieritemdbus.h"
+
const int StatusNotifierItem::_protocolVersion = 0;
+const QString StatusNotifierItem::_statusNotifierWatcherServiceName("org.kde.StatusNotifierWatcher");
+
+#ifdef HAVE_DBUSMENU
+# include "dbusmenuexporter.h"
+
+/**
+ * Specialization to provide access to icon names
+ */
+class QuasselDBusMenuExporter : public DBusMenuExporter {
+public:
+ QuasselDBusMenuExporter(const QString &dbusObjectPath, QMenu *menu, const QDBusConnection &dbusConnection)
+ : DBusMenuExporter(dbusObjectPath, menu, dbusConnection)
+ {}
+
+protected:
+ virtual QString iconNameForAction(QAction *action) { // TODO Qt 4.7: fixme when we have converted our iconloader
+ Icon icon(action->icon());
+#if QT_VERSION >= 0x040701
+ // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
+ // If you get a build error here, you need to update your pre-release
+ // of Qt 4.7.
+ return icon.isNull() ? QString() : icon.name();
+#else
+ return QString();
+#endif
+ }
+};
+
+#endif /* HAVE_DBUSMENU */
StatusNotifierItem::StatusNotifierItem(QWidget *parent)
: StatusNotifierItemParent(parent),
qDBusRegisterMetaType<DBusToolTipStruct>();
_statusNotifierItemDBus = new StatusNotifierItemDBus(this);
+
connect(this, SIGNAL(toolTipChanged(QString,QString)), _statusNotifierItemDBus, SIGNAL(NewToolTip()));
+ connect(this, SIGNAL(animationEnabledChanged(bool)), _statusNotifierItemDBus, SIGNAL(NewAttentionIcon()));
- connect(QDBusConnection::sessionBus().interface(), SIGNAL(serviceOwnerChanged(QString,QString,QString)),
- SLOT(serviceChange(QString,QString,QString)));
+ QDBusServiceWatcher *watcher = new QDBusServiceWatcher(_statusNotifierWatcherServiceName,
+ QDBusConnection::sessionBus(),
+ QDBusServiceWatcher::WatchForOwnerChange,
+ this);
+ connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)), SLOT(serviceChange(QString,QString,QString)));
setMode(StatusNotifier);
if(_notificationsClient->isValid()) {
QStringList desktopCapabilities = _notificationsClient->GetCapabilities();
_notificationsClientSupportsMarkup = desktopCapabilities.contains("body-markup");
+ _notificationsClientSupportsActions = desktopCapabilities.contains("actions");
}
StatusNotifierItemParent::init();
trayMenu()->installEventFilter(this);
+
+ // use the appdata icon folder for now
+ _iconThemePath = Quassel::findDataFilePath("icons");
+
+#ifdef HAVE_DBUSMENU
+ _menuObjectPath = "/MenuBar";
+ new QuasselDBusMenuExporter(menuObjectPath(), trayMenu(), _statusNotifierItemDBus->dbusConnection()); // will be added as menu child
+#endif
}
void StatusNotifierItem::registerToDaemon() {
if(!_statusNotifierWatcher) {
- QString interface("org.kde.StatusNotifierWatcher");
- _statusNotifierWatcher = new org::kde::StatusNotifierWatcher(interface, "/StatusNotifierWatcher",
+ _statusNotifierWatcher = new org::kde::StatusNotifierWatcher(_statusNotifierWatcherServiceName,
+ "/StatusNotifierWatcher",
QDBusConnection::sessionBus());
+ connect(_statusNotifierWatcher, SIGNAL(StatusNotifierHostRegistered()), SLOT(checkForRegisteredHosts()));
+ connect(_statusNotifierWatcher, SIGNAL(StatusNotifierHostUnregistered()), SLOT(checkForRegisteredHosts()));
}
if(_statusNotifierWatcher->isValid()
&& _statusNotifierWatcher->property("ProtocolVersion").toInt() == _protocolVersion) {
_statusNotifierWatcher->RegisterStatusNotifierItem(_statusNotifierItemDBus->service());
+ checkForRegisteredHosts();
} else {
//qDebug() << "StatusNotifierWatcher not reachable!";
}
}
-// FIXME remove deprecated slot with Qt 4.6
void StatusNotifierItem::serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner) {
- bool legacy = false;
- if(name == "org.kde.StatusNotifierWatcher") {
- if(newOwner.isEmpty()) {
- //unregistered
- //qDebug() << "Connection to the StatusNotifierWatcher lost";
- legacy = true;
- } else if(oldOwner.isEmpty()) {
- //registered
- legacy = false;
- }
- } else if(name.startsWith(QLatin1String("org.kde.StatusNotifierHost-"))) {
- if(newOwner.isEmpty() && (!_statusNotifierWatcher ||
- !_statusNotifierWatcher->property("IsStatusNotifierHostRegistered").toBool())) {
- //qDebug() << "Connection to the last StatusNotifierHost lost";
- legacy = true;
- } else if(oldOwner.isEmpty()) {
- //qDebug() << "New StatusNotifierHost";
- legacy = false;
- }
- } else {
- return;
- }
-
- // qDebug() << "Service " << name << "status change, old owner:" << oldOwner << "new:" << newOwner;
-
- if(legacy == (mode() == Legacy)) {
- return;
- }
-
- if(legacy) {
+ Q_UNUSED(name);
+ if(newOwner.isEmpty()) {
//unregistered
+ //qDebug() << "Connection to the StatusNotifierWatcher lost";
+ delete _statusNotifierWatcher;
+ _statusNotifierWatcher = 0;
setMode(Legacy);
- } else {
+ } else if(oldOwner.isEmpty()) {
//registered
setMode(StatusNotifier);
}
}
+void StatusNotifierItem::checkForRegisteredHosts() {
+ if(!_statusNotifierWatcher || !_statusNotifierWatcher->property("IsStatusNotifierHostRegistered").toBool())
+ setMode(Legacy);
+ else
+ setMode(StatusNotifier);
+}
+
+bool StatusNotifierItem::isSystemTrayAvailable() const {
+ if(mode() == StatusNotifier)
+ return true; // else it should be set to legacy on registration
+
+ return StatusNotifierItemParent::isSystemTrayAvailable();
+}
+
+bool StatusNotifierItem::isVisible() const {
+ if(mode() == StatusNotifier)
+ return shouldBeVisible(); // we don't have a way to check, so we need to trust everything went right
+
+ return StatusNotifierItemParent::isVisible();
+}
+
void StatusNotifierItem::setMode(Mode mode_) {
+ if(mode_ == mode())
+ return;
+
+ if(mode_ != StatusNotifier) {
+ _statusNotifierItemDBus->unregisterService();
+ }
+
StatusNotifierItemParent::setMode(mode_);
if(mode() == StatusNotifier) {
+ _statusNotifierItemDBus->registerService();
registerToDaemon();
}
}
emit _statusNotifierItemDBus->NewIcon();
}
+void StatusNotifierItem::setVisible(bool visible) {
+ if(visible == isVisible())
+ return;
+
+ LegacySystemTray::setVisible(visible);
+
+ if(mode() == StatusNotifier) {
+ if(shouldBeVisible()) {
+ _statusNotifierItemDBus->registerService();
+ registerToDaemon();
+ } else {
+ _statusNotifierItemDBus->unregisterService();
+ _statusNotifierWatcher->deleteLater();
+ _statusNotifierWatcher = 0;
+ }
+ }
+}
+
QString StatusNotifierItem::title() const {
return QString("Quassel IRC");
}
}
QString StatusNotifierItem::attentionIconName() const {
- return QString("quassel_message");
+ if(animationEnabled())
+ return QString("quassel_message");
+ else
+ return QString("quassel");
}
QString StatusNotifierItem::toolTipIconName() const {
return QString("quassel");
}
+QString StatusNotifierItem::iconThemePath() const {
+ return _iconThemePath;
+}
+
+QString StatusNotifierItem::menuObjectPath() const {
+ return _menuObjectPath;
+}
+
void StatusNotifierItem::activated(const QPoint &pos) {
Q_UNUSED(pos)
activate(Trigger);
if(_notificationsClientSupportsMarkup)
message = Qt::escape(message);
- QStringList actions = QStringList() << "activate" << "View";
+ QStringList actions;
+ if(_notificationsClientSupportsActions)
+ actions << "activate" << "View";
// we always queue notifications right now
QDBusReply<uint> reply = _notificationsClient->Notify(title, 0, "quassel", title, message, actions, QVariantMap(), timeout);
projects / quassel.git / blobdiff