projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Port HighlightRule to ExpressionMatch
[quassel.git]
/
src
/
qtui
/
statusnotifieritem.cpp
diff --git
a/src/qtui/statusnotifieritem.cpp
b/src/qtui/statusnotifieritem.cpp
index
68d81ab
..
48c747e
100644
(file)
--- a/
src/qtui/statusnotifieritem.cpp
+++ b/
src/qtui/statusnotifieritem.cpp
@@
-23,16
+23,19
@@
#ifdef HAVE_DBUS
#ifdef HAVE_DBUS
+#include "statusnotifieritem.h"
+
#include <QApplication>
#include <QDir>
#include <QFile>
#include <QApplication>
#include <QDir>
#include <QFile>
+#include <QIcon>
#include <QMenu>
#include <QMouseEvent>
#include <QTextDocument>
#include <QMenu>
#include <QMouseEvent>
#include <QTextDocument>
+#include "icon.h"
#include "qtui.h"
#include "quassel.h"
#include "qtui.h"
#include "quassel.h"
-#include "statusnotifieritem.h"
#include "statusnotifieritemdbus.h"
constexpr int kProtocolVersion {0};
#include "statusnotifieritemdbus.h"
constexpr int kProtocolVersion {0};
@@
-105,8
+108,9
@@
StatusNotifierItem::StatusNotifierItem(QWidget *parent)
// Our own SNI service
_statusNotifierItemDBus = new StatusNotifierItemDBus(this);
// 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, SIGNAL(toolTipChanged(QString, QString)), _statusNotifierItemDBus, SIGNAL(NewToolTip()));
- connect(this, SIGNAL(animationEnabledChanged(bool)), _statusNotifierItemDBus, SIGNAL(NewAttentionIcon()));
// Service watcher to keep track of the StatusNotifierWatcher service
QDBusServiceWatcher *watcher = new QDBusServiceWatcher(kSniWatcherService,
// Service watcher to keep track of the StatusNotifierWatcher service
QDBusServiceWatcher *watcher = new QDBusServiceWatcher(kSniWatcherService,
@@
-197,7
+201,7
@@
void StatusNotifierItem::refreshIcons()
baseDir.removeRecursively();
for (auto &&trayState : { State::Active, State::Passive, State::NeedsAttention }) {
auto iconName = SystemTray::iconName(trayState);
baseDir.removeRecursively();
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()) {
auto pixDir = QString{"%1/%2x%3/status"}.arg(baseDir.absolutePath()).arg(size.width()).arg(size.height());
if (!icon.isNull()) {
for (auto &&size : icon.availableSizes()) {
auto pixDir = QString{"%1/%2x%3/status"}.arg(baseDir.absolutePath()).arg(size.width()).arg(size.height());
@@
-252,7
+256,6
@@
void StatusNotifierItem::onModeChanged(Mode mode)
void StatusNotifierItem::onStateChanged(State state)
{
if (mode() == Mode::StatusNotifier) {
void StatusNotifierItem::onStateChanged(State state)
{
if (mode() == Mode::StatusNotifier) {
- emit _statusNotifierItemDBus->NewIcon();
emit _statusNotifierItemDBus->NewStatus(metaObject()->enumerator(metaObject()->indexOfEnumerator("State")).valueToKey(state));
}
}
emit _statusNotifierItemDBus->NewStatus(metaObject()->enumerator(metaObject()->indexOfEnumerator("State")).valueToKey(state));
}
}
@@
-280,23
+283,13
@@
QString StatusNotifierItem::title() const
QString StatusNotifierItem::iconName() const
{
QString StatusNotifierItem::iconName() const
{
- if (state() == Passive) {
- return SystemTray::iconName(State::Passive);
- }
- else {
- return SystemTray::iconName(State::Active);
- }
+ return currentIconName();
}
QString StatusNotifierItem::attentionIconName() const
{
}
QString StatusNotifierItem::attentionIconName() const
{
- if (animationEnabled()) {
- return SystemTray::iconName(State::NeedsAttention);
- }
- else {
- return SystemTray::iconName(State::NeedsAttention);
- }
+ return currentAttentionIconName();
}
}