X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=6b2b33cdf1ce68e8f122ae63527995c9814a6d6b;hp=912582306722827500dad89449c2ec78816274df;hb=138bb708911ef06fa37859fa51bca5f47125ccdd;hpb=2e9492d9ef198bde37da1f858602ab9624c0a12a diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp index 91258230..6b2b33cd 100644 --- a/src/qtui/systemtray.cpp +++ b/src/qtui/systemtray.cpp @@ -35,7 +35,6 @@ SystemTray::SystemTray(QWidget *parent) : QObject(parent), _mode(Invalid), _state(Passive), - _inhibitActivation(false), _passiveIcon(DesktopIcon("quassel_inactive")), _activeIcon(DesktopIcon("quassel")), _needsAttentionIcon(DesktopIcon("quassel_message")), @@ -43,8 +42,6 @@ SystemTray::SystemTray(QWidget *parent) _associatedWidget(parent) { Q_ASSERT(parent); - - qApp->installEventFilter(this); } SystemTray::~SystemTray() { @@ -130,17 +127,5 @@ void SystemTray::showMessage(const QString &title, const QString &message, Messa } void SystemTray::activate(SystemTray::ActivationReason reason) { - emit activated(reason); - - if(reason == Trigger && !isActivationInhibited()) { - GraphicalUi::toggleMainWidget(); - } -} - -bool SystemTray::eventFilter(QObject *obj, QEvent *event) { - if(event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonRelease) { - _inhibitActivation = false; - } - return QObject::eventFilter(obj, event); }