X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritem.cpp;h=a0beb169733ff6dcb78e6cb4c7781a6f73ca6ca1;hp=5932746cf3375f1982522bf2f92c2e490b645337;hb=a95ad2de573027f9bee36db972bcae4195168d0c;hpb=a888a2886dc1466eb0b1bb3591f43350623c6330 diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp index 5932746c..a0beb169 100644 --- a/src/qtui/statusnotifieritem.cpp +++ b/src/qtui/statusnotifieritem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This contains code from KStatusNotifierItem, part of the KDE libs * @@ -23,29 +23,32 @@ #ifdef HAVE_DBUS -#include -#include -#include -#include -#include -#include +# include "statusnotifieritem.h" -#include "qtui.h" -#include "quassel.h" -#include "statusnotifieritem.h" -#include "statusnotifieritemdbus.h" +# include +# include +# include +# include +# include +# include +# include -constexpr int kProtocolVersion {0}; +# include "icon.h" +# include "qtui.h" +# include "quassel.h" +# include "statusnotifieritemdbus.h" -const QString kSniWatcherService {QLatin1String{"org.kde.StatusNotifierWatcher"}}; -const QString kSniWatcherPath {QLatin1String{"/StatusNotifierWatcher"}}; -const QString kSniPath {QLatin1String{"/StatusNotifierItem"}}; -const QString kXdgNotificationsService {QLatin1String{"org.freedesktop.Notifications"}}; -const QString kXdgNotificationsPath {QLatin1String{"/org/freedesktop/Notifications"}}; -const QString kMenuObjectPath {QLatin1String{"/MenuBar"}}; +constexpr int kProtocolVersion{0}; -#ifdef HAVE_DBUSMENU -# include "dbusmenuexporter.h" +const QString kSniWatcherService{QLatin1String{"org.kde.StatusNotifierWatcher"}}; +const QString kSniWatcherPath{QLatin1String{"/StatusNotifierWatcher"}}; +const QString kSniPath{QLatin1String{"/StatusNotifierItem"}}; +const QString kXdgNotificationsService{QLatin1String{"org.freedesktop.Notifications"}}; +const QString kXdgNotificationsPath{QLatin1String{"/org/freedesktop/Notifications"}}; +const QString kMenuObjectPath{QLatin1String{"/MenuBar"}}; + +# ifdef HAVE_DBUSMENU +# include "dbusmenuexporter.h" /** * Specialization to provide access to icon names @@ -53,25 +56,23 @@ const QString kMenuObjectPath {QLatin1String{"/MenuBar"}}; class QuasselDBusMenuExporter : public DBusMenuExporter { public: - QuasselDBusMenuExporter(const QString &dbusObjectPath, QMenu *menu, const QDBusConnection &dbusConnection) + 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 + QString iconNameForAction(QAction* action) override // TODO Qt 4.7: fixme when we have converted our iconloader { QIcon icon(action->icon()); return icon.isNull() ? QString() : icon.name(); } }; -#endif /* HAVE_DBUSMENU */ +# endif /* HAVE_DBUSMENU */ -StatusNotifierItem::StatusNotifierItem(QWidget *parent) +StatusNotifierItem::StatusNotifierItem(QWidget* parent) : StatusNotifierItemParent(parent) -#if QT_VERSION >= 0x050000 , _iconThemeDir{QDir::tempPath() + QLatin1String{"/quassel-sni-XXXXXX"}} -#endif { static bool registered = []() -> bool { qDBusRegisterMetaType(); @@ -83,54 +84,51 @@ StatusNotifierItem::StatusNotifierItem(QWidget *parent) setMode(Mode::StatusNotifier); - connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(onVisibilityChanged(bool))); - connect(this, SIGNAL(modeChanged(Mode)), this, SLOT(onModeChanged(Mode))); - connect(this, SIGNAL(stateChanged(State)), this, SLOT(onStateChanged(State))); + connect(this, &StatusNotifierItem::visibilityChanged, this, &StatusNotifierItem::onVisibilityChanged); + connect(this, &StatusNotifierItem::modeChanged, this, &StatusNotifierItem::onModeChanged); + connect(this, &StatusNotifierItem::stateChanged, this, &StatusNotifierItem::onStateChanged); trayMenu()->installEventFilter(this); // Create a temporary directory that holds copies of the tray icons. That way, visualizers can find our icons. - // For Qt4 the relevant icons are installed in hicolor already, so nothing to be done. -#if QT_VERSION >= 0x050000 if (_iconThemeDir.isValid()) { _iconThemePath = _iconThemeDir.path(); } else { qWarning() << "Could not create temporary directory for themed tray icons!"; } -#endif - connect(this, SIGNAL(iconsChanged()), this, SLOT(refreshIcons())); + connect(this, &SystemTray::iconsChanged, this, &StatusNotifierItem::refreshIcons); refreshIcons(); // Our own SNI service _statusNotifierItemDBus = new StatusNotifierItemDBus(this); - connect(this, SIGNAL(currentIconNameChanged()), _statusNotifierItemDBus, SIGNAL(NewIcon())); - connect(this, SIGNAL(currentIconNameChanged()), _statusNotifierItemDBus, SIGNAL(NewAttentionIcon())); - connect(this, SIGNAL(toolTipChanged(QString, QString)), _statusNotifierItemDBus, SIGNAL(NewToolTip())); + connect(this, &StatusNotifierItem::currentIconNameChanged, _statusNotifierItemDBus, &StatusNotifierItemDBus::NewIcon); + connect(this, &StatusNotifierItem::currentIconNameChanged, _statusNotifierItemDBus, &StatusNotifierItemDBus::NewAttentionIcon); + connect(this, &StatusNotifierItem::toolTipChanged, _statusNotifierItemDBus, &StatusNotifierItemDBus::NewToolTip); // Service watcher to keep track of the StatusNotifierWatcher service - QDBusServiceWatcher *watcher = new QDBusServiceWatcher(kSniWatcherService, - QDBusConnection::sessionBus(), - QDBusServiceWatcher::WatchForOwnerChange, - this); - connect(watcher, SIGNAL(serviceOwnerChanged(QString, QString, QString)), SLOT(serviceChange(QString, QString, QString))); + _serviceWatcher = new QDBusServiceWatcher(kSniWatcherService, QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, this); + connect(_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &StatusNotifierItem::serviceChange); // Client instance for StatusNotifierWatcher - _statusNotifierWatcher = new org::kde::StatusNotifierWatcher(kSniWatcherService, - kSniWatcherPath, - QDBusConnection::sessionBus(), - this); - connect(_statusNotifierWatcher, SIGNAL(StatusNotifierHostRegistered()), SLOT(checkForRegisteredHosts())); - connect(_statusNotifierWatcher, SIGNAL(StatusNotifierHostUnregistered()), SLOT(checkForRegisteredHosts())); + _statusNotifierWatcher = new org::kde::StatusNotifierWatcher(kSniWatcherService, kSniWatcherPath, QDBusConnection::sessionBus(), this); + connect(_statusNotifierWatcher, + &OrgKdeStatusNotifierWatcherInterface::StatusNotifierHostRegistered, + this, + &StatusNotifierItem::checkForRegisteredHosts); + connect(_statusNotifierWatcher, + &OrgKdeStatusNotifierWatcherInterface::StatusNotifierHostUnregistered, + this, + &StatusNotifierItem::checkForRegisteredHosts); // Client instance for notifications _notificationsClient = new org::freedesktop::Notifications(kXdgNotificationsService, kXdgNotificationsPath, QDBusConnection::sessionBus(), this); - connect(_notificationsClient, SIGNAL(NotificationClosed(uint, uint)), SLOT(notificationClosed(uint, uint))); - connect(_notificationsClient, SIGNAL(ActionInvoked(uint, QString)), SLOT(notificationInvoked(uint, QString))); + connect(_notificationsClient, &OrgFreedesktopNotificationsInterface::NotificationClosed, this, &StatusNotifierItem::notificationClosed); + connect(_notificationsClient, &OrgFreedesktopNotificationsInterface::ActionInvoked, this, &StatusNotifierItem::notificationInvoked); if (_notificationsClient->isValid()) { QStringList desktopCapabilities = _notificationsClient->GetCapabilities(); @@ -138,40 +136,42 @@ StatusNotifierItem::StatusNotifierItem(QWidget *parent) _notificationsClientSupportsActions = desktopCapabilities.contains("actions"); } -#ifdef HAVE_DBUSMENU - new QuasselDBusMenuExporter(menuObjectPath(), trayMenu(), _statusNotifierItemDBus->dbusConnection()); // will be added as menu child -#endif +# ifdef HAVE_DBUSMENU + new QuasselDBusMenuExporter(menuObjectPath(), trayMenu(), _statusNotifierItemDBus->dbusConnection()); // will be added as menu child +# endif } - -void StatusNotifierItem::serviceChange(const QString &name, const QString &oldOwner, const QString &newOwner) +void StatusNotifierItem::serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner) { Q_UNUSED(name); if (newOwner.isEmpty()) { - //unregistered + // unregistered setMode(Mode::Legacy); } else if (oldOwner.isEmpty()) { - //registered + // registered setMode(Mode::StatusNotifier); } } - void StatusNotifierItem::registerToWatcher() { if (_statusNotifierWatcher->isValid() && _statusNotifierWatcher->property("ProtocolVersion").toInt() == kProtocolVersion) { - auto registerMethod = QDBusMessage::createMethodCall(kSniWatcherService, kSniWatcherPath, kSniWatcherService, + auto registerMethod = QDBusMessage::createMethodCall(kSniWatcherService, + kSniWatcherPath, + kSniWatcherService, QLatin1String{"RegisterStatusNotifierItem"}); registerMethod.setArguments(QVariantList() << _statusNotifierItemDBus->service()); - _statusNotifierItemDBus->dbusConnection().callWithCallback(registerMethod, this, SLOT(checkForRegisteredHosts()), SLOT(onDBusError(QDBusError))); + _statusNotifierItemDBus->dbusConnection().callWithCallback(registerMethod, + this, + SLOT(checkForRegisteredHosts()), + SLOT(onDBusError(QDBusError))); } else { setMode(Mode::Legacy); } } - void StatusNotifierItem::checkForRegisteredHosts() { if (!_statusNotifierWatcher || !_statusNotifierWatcher->property("IsStatusNotifierHostRegistered").toBool()) { @@ -182,25 +182,22 @@ void StatusNotifierItem::checkForRegisteredHosts() } } - -void StatusNotifierItem::onDBusError(const QDBusError &error) +void StatusNotifierItem::onDBusError(const QDBusError& error) { qWarning() << "StatusNotifierItem encountered a D-Bus error:" << error; setMode(Mode::Legacy); } - void StatusNotifierItem::refreshIcons() { -#if QT_VERSION >= 0x050000 if (!_iconThemePath.isEmpty()) { QDir baseDir{_iconThemePath + "/hicolor"}; baseDir.removeRecursively(); - for (auto &&trayState : { State::Active, State::Passive, State::NeedsAttention }) { + for (auto&& trayState : {State::Active, State::Passive, State::NeedsAttention}) { auto iconName = SystemTray::iconName(trayState); - QIcon icon = QIcon::fromTheme(iconName); + QIcon icon = icon::get(iconName); if (!icon.isNull()) { - for (auto &&size : icon.availableSizes()) { + for (auto&& size : icon.availableSizes()) { auto pixDir = QString{"%1/%2x%3/status"}.arg(baseDir.absolutePath()).arg(size.width()).arg(size.height()); QDir{}.mkpath(pixDir); if (!icon.pixmap(size).save(pixDir + "/" + iconName + ".png")) { @@ -212,22 +209,20 @@ void StatusNotifierItem::refreshIcons() // No theme icon found; use fallback from resources auto iconDir = QString{"%1/24x24/status"}.arg(baseDir.absolutePath()); QDir{}.mkpath(iconDir); - if (!QFile::copy(QString{":/icons/hicolor/24x24/status/%1.svg"}.arg(iconName), - QString{"%1/%2.svg"}.arg(iconDir, iconName))) { + if (!QFile::copy(QString{":/icons/hicolor/24x24/status/%1.svg"}.arg(iconName), QString{"%1/%2.svg"}.arg(iconDir, iconName))) { qWarning() << "Could not access fallback tray icon" << iconName; continue; } } } } -#endif + if (_statusNotifierItemDBus) { emit _statusNotifierItemDBus->NewIcon(); emit _statusNotifierItemDBus->NewAttentionIcon(); } } - bool StatusNotifierItem::isSystemTrayAvailable() const { if (mode() == Mode::StatusNotifier) { @@ -237,7 +232,6 @@ bool StatusNotifierItem::isSystemTrayAvailable() const return StatusNotifierItemParent::isSystemTrayAvailable(); } - void StatusNotifierItem::onModeChanged(Mode mode) { if (mode == Mode::StatusNotifier) { @@ -249,7 +243,6 @@ void StatusNotifierItem::onModeChanged(Mode mode) } } - void StatusNotifierItem::onStateChanged(State state) { if (mode() == Mode::StatusNotifier) { @@ -257,7 +250,6 @@ void StatusNotifierItem::onStateChanged(State state) } } - void StatusNotifierItem::onVisibilityChanged(bool isVisible) { if (mode() == Mode::StatusNotifier) { @@ -271,84 +263,64 @@ void StatusNotifierItem::onVisibilityChanged(bool isVisible) } } - QString StatusNotifierItem::title() const { return QString("Quassel IRC"); } - QString StatusNotifierItem::iconName() const { return currentIconName(); } - QString StatusNotifierItem::attentionIconName() const { return currentAttentionIconName(); } - QString StatusNotifierItem::toolTipIconName() const { return "quassel"; } - QString StatusNotifierItem::iconThemePath() const { return _iconThemePath; } - QString StatusNotifierItem::menuObjectPath() const { return kMenuObjectPath; } - -void StatusNotifierItem::activated(const QPoint &pos) +void StatusNotifierItem::activated(const QPoint& pos) { Q_UNUSED(pos) activate(Trigger); } - -bool StatusNotifierItem::eventFilter(QObject *watched, QEvent *event) +bool StatusNotifierItem::eventFilter(QObject* watched, QEvent* event) { if (mode() == StatusNotifier) { - //FIXME: ugly ugly workaround to weird QMenu's focus problems -#ifdef HAVE_KDE4 - if (watched == trayMenu() && - (event->type() == QEvent::WindowDeactivate || (event->type() == QEvent::MouseButtonRelease && static_cast(event)->button() == Qt::LeftButton))) { - // put at the back of event queue to let the action activate anyways - QTimer::singleShot(0, trayMenu(), SLOT(hide())); - } -#else if (watched == trayMenu() && event->type() == QEvent::HoverLeave) { trayMenu()->hide(); } -#endif } return StatusNotifierItemParent::eventFilter(watched, event); } - -void StatusNotifierItem::showMessage(const QString &title, const QString &message_, SystemTray::MessageIcon icon, int timeout, uint notificationId) +void StatusNotifierItem::showMessage(const QString& title, const QString& message_, SystemTray::MessageIcon icon, int timeout, uint notificationId) { QString message = message_; if (_notificationsClient->isValid()) { - if (_notificationsClientSupportsMarkup) -#if QT_VERSION < 0x050000 - message = Qt::escape(message); -#else + if (_notificationsClientSupportsMarkup) { message = message.toHtmlEscaped(); -#endif + } QStringList actions; if (_notificationsClientSupportsActions) - actions << "activate" << "View"; + actions << "activate" + << "View"; // we always queue notifications right now QDBusReply reply = _notificationsClient->Notify(title, 0, "quassel", title, message, actions, QVariantMap(), timeout); @@ -362,10 +334,9 @@ void StatusNotifierItem::showMessage(const QString &title, const QString &messag StatusNotifierItemParent::showMessage(title, message, icon, timeout, notificationId); } - void StatusNotifierItem::closeMessage(uint notificationId) { - for (auto &&dbusid : _notificationsIdMap.keys()) { + for (auto&& dbusid : _notificationsIdMap.keys()) { if (_notificationsIdMap.value(dbusid) == notificationId) { _notificationsIdMap.remove(dbusid); _notificationsClient->CloseNotification(dbusid); @@ -376,7 +347,6 @@ void StatusNotifierItem::closeMessage(uint notificationId) StatusNotifierItemParent::closeMessage(notificationId); } - void StatusNotifierItem::notificationClosed(uint dbusid, uint reason) { Q_UNUSED(reason) @@ -384,12 +354,10 @@ void StatusNotifierItem::notificationClosed(uint dbusid, uint reason) emit messageClosed(_notificationsIdMap.take(dbusid)); } - -void StatusNotifierItem::notificationInvoked(uint dbusid, const QString &action) +void StatusNotifierItem::notificationInvoked(uint dbusid, const QString& action) { Q_UNUSED(action) emit messageClicked(_notificationsIdMap.value(dbusid, 0)); } - #endif