X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=18186f24d525a60449c65433bd4e9bc2f5a3362e;hp=9969800003af923570d2936bb8e74c5baea4cd9a;hb=fd53bde61a90cd694352e1043593e5a727783729;hpb=4476cfb22f36ad9ba96e4978c3bcce1c2f6b5a04 diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp index 99698000..18186f24 100644 --- a/src/qtui/legacysystemtray.cpp +++ b/src/qtui/legacysystemtray.cpp @@ -21,6 +21,7 @@ #ifndef QT_NO_SYSTEMTRAYICON #include "legacysystemtray.h" +#include "mainwin.h" #include "qtui.h" LegacySystemTray::LegacySystemTray(QWidget *parent) @@ -46,6 +47,8 @@ LegacySystemTray::LegacySystemTray(QWidget *parent) _blinkTimer.setInterval(500); _blinkTimer.setSingleShot(false); connect(&_blinkTimer, SIGNAL(timeout()), SLOT(on_blinkTimeout())); + + connect(this, SIGNAL(toolTipChanged(QString,QString)), SLOT(syncLegacyIcon())); } void LegacySystemTray::init() { @@ -59,7 +62,11 @@ void LegacySystemTray::init() { void LegacySystemTray::syncLegacyIcon() { _trayIcon->setIcon(stateIcon()); - _trayIcon->setToolTip(toolTipTitle()); + + QString tooltip = QString("%1").arg(toolTipTitle()); + if(!toolTipSubTitle().isEmpty()) + tooltip += QString("
%1").arg(toolTipSubTitle()); + _trayIcon->setToolTip(tooltip); } void LegacySystemTray::setVisible(bool visible) {