X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=2bc365417a7383d2cea0cafd3d432c0da6ef3d47;hp=36b70479e73b3c10a41dd5fcf1a6292f0b2f6d09;hb=1a9450ecc5eeb5f987ceac790be84dcced02f028;hpb=3cc8b9030841cc3084ec6707a01f3b44ee58b8b9;ds=sidebyside diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp index 36b70479..2bc36541 100644 --- a/src/qtui/systemtray.cpp +++ b/src/qtui/systemtray.cpp @@ -36,9 +36,6 @@ SystemTray::SystemTray(QWidget *parent) : QObject(parent), - _passiveIcon(QIcon::fromTheme("inactive-quassel", QIcon(":/icons/inactive-quassel.png"))), - _activeIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png"))), - _needsAttentionIcon(QIcon::fromTheme("message-quassel", QIcon(":/icons/message-quassel.png"))), _associatedWidget(parent) { Q_ASSERT(parent); @@ -152,23 +149,17 @@ void SystemTray::setState(State state) } -QIcon SystemTray::stateIcon() const -{ - return stateIcon(state()); -} - - -QIcon SystemTray::stateIcon(State state) const +QString SystemTray::iconName(State state) const { switch (state) { - case Passive: - return _passiveIcon; - case Active: - return _activeIcon; - case NeedsAttention: - return _needsAttentionIcon; + case State::Passive: + return "inactive-quassel"; + case State::Active: + return "quassel"; + case State::NeedsAttention: + return "message-quassel"; } - return QIcon(); + return {}; }