X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=cb409ae2bee6bf5f968264813d0743372288c04a;hp=b6652962201c2e2cf0b5f23797f340790b8f9dde;hb=3013f4e095802e906c85878436da9e2ee3f9028c;hpb=231d30c66b4f52d239deb608f77a0ceb8034fbe9 diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index b6652962..cb409ae2 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -1,60 +1,71 @@ /*************************************************************************** -* Copyright (C) 2005-09 by the Quassel Project * -* devel@quassel-irc.org * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) version 3. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2010 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include +#include +#include +#include #include "systraynotificationbackend.h" -#include - #include "client.h" #include "clientsettings.h" #include "icon.h" +#include "iconloader.h" #include "mainwin.h" #include "networkmodel.h" #include "qtui.h" #include "systemtray.h" SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) - : AbstractNotificationBackend(parent) + : AbstractNotificationBackend(parent), + _blockActivation(false) { NotificationSettings notificationSettings; - _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool(); - _animate = notificationSettings.value("Systray/Animate", true).toBool(); + notificationSettings.initAndNotify("Systray/ShowBubble", this, SLOT(showBubbleChanged(QVariant)), true); + notificationSettings.initAndNotify("Systray/Animate", this, SLOT(animateChanged(QVariant)), true); + + connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked(uint)), SLOT(notificationActivated(uint))); + connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)), + SLOT(notificationActivated(SystemTray::ActivationReason))); - notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &))); - notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &))); + QApplication::instance()->installEventFilter(this); - connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated())); - connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), - SLOT(notificationActivated(QSystemTrayIcon::ActivationReason))); + updateToolTip(); } -void SystrayNotificationBackend::notify(const Notification ¬ification) { - if(notification.type != Highlight && notification.type != PrivMsg) +void SystrayNotificationBackend::notify(const Notification &n) { + if(n.type != Highlight && n.type != PrivMsg) return; - _notifications.append(notification); - if(_showBubble) - showBubble(); + _notifications.append(n); + if(_showBubble) { + QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId); + QString message = QString("<%1> %2").arg(n.sender, n.message); + QtUi::mainWindow()->systemTray()->showMessage(title, message, SystemTray::Information, 10000, n.notificationId); + } if(_animate) QtUi::mainWindow()->systemTray()->setAlert(true); + + updateToolTip(); } void SystrayNotificationBackend::close(uint notificationId) { @@ -66,42 +77,39 @@ void SystrayNotificationBackend::close(uint notificationId) { ++i; } - closeBubble(); + QtUi::mainWindow()->systemTray()->closeMessage(notificationId); - if(!_notifications.count()) + //if(!_notifications.count()) //FIXME make configurable QtUi::mainWindow()->systemTray()->setAlert(false); -} -void SystrayNotificationBackend::showBubble() { - // fancy stuff later: show messages in order - // for now, we just show the last message - if(_notifications.isEmpty()) - return; - Notification n = _notifications.last(); - QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId); - QString message = QString("<%1> %2").arg(n.sender, n.message); - QtUi::mainWindow()->systemTray()->showMessage(title, message); + updateToolTip(); } -void SystrayNotificationBackend::closeBubble() { - // there really seems to be no sane way to close the bubble... :( -#ifdef Q_WS_X11 - QtUi::mainWindow()->systemTray()->showMessage("", "", QSystemTrayIcon::NoIcon, 1); -#endif +void SystrayNotificationBackend::notificationActivated(uint notificationId) { + if(!_blockActivation) { + if(_notifications.count()) { + if(QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy) + _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal + if(!notificationId) + notificationId = _notifications.count()? _notifications.last().notificationId : 0; + emit activated(notificationId); + } else + GraphicalUi::toggleMainWidget(); + } } -void SystrayNotificationBackend::notificationActivated() { - if(QtUi::mainWindow()->systemTray()->isAlerted()) { - QtUi::mainWindow()->systemTray()->setInhibitActivation(); - uint id = _notifications.count()? _notifications.last().notificationId : 0; - emit activated(id); +void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) { + if(reason == SystemTray::Trigger) { + notificationActivated(0); } } -void SystrayNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) { - if(reason == QSystemTrayIcon::Trigger) { - notificationActivated(); +// moving the mouse or releasing the button means that we're not dealing with a double activation +bool SystrayNotificationBackend::eventFilter(QObject *obj, QEvent *event) { + if(event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonRelease) { + _blockActivation = false; } + return AbstractNotificationBackend::eventFilter(obj, event); } void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) { @@ -112,6 +120,11 @@ void SystrayNotificationBackend::animateChanged(const QVariant &v) { _animate = v.toBool(); } +void SystrayNotificationBackend::updateToolTip() { + QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC", + _notifications.count()? tr("%n pending highlights", "", _notifications.count()) : QString()); +} + SettingsPage *SystrayNotificationBackend::createConfigWidget() const { return new ConfigWidget(); } @@ -119,23 +132,17 @@ SettingsPage *SystrayNotificationBackend::createConfigWidget() const { /***************************************************************************/ SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "SystrayNotification", parent) { - QGroupBox *groupBox = new QGroupBox(tr("System Tray Icon"), this); - _animateBox = new QCheckBox(tr("Animate")); - connect(_animateBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged())); - _showBubbleBox = new QCheckBox(tr("Show bubble")); + _showBubbleBox = new QCheckBox(tr("Show a message in a popup")); + _showBubbleBox->setIcon(SmallIcon("dialog-information")); connect(_showBubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged())); - QVBoxLayout *layout = new QVBoxLayout(groupBox); - layout->addWidget(_animateBox); + QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(_showBubbleBox); - layout->addStretch(1); - QVBoxLayout *globalLayout = new QVBoxLayout(this); - globalLayout->addWidget(groupBox); - } void SystrayNotificationBackend::ConfigWidget::widgetChanged() { - bool changed = (_showBubble != _showBubbleBox->isChecked() || _animate != _animateBox->isChecked()); - if(changed != hasChanged()) setChangedState(changed); + bool changed = (_showBubble != _showBubbleBox->isChecked()); + if(changed != hasChanged()) + setChangedState(changed); } bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const { @@ -143,23 +150,19 @@ bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const { } void SystrayNotificationBackend::ConfigWidget::defaults() { - _animateBox->setChecked(true); _showBubbleBox->setChecked(false); widgetChanged(); } void SystrayNotificationBackend::ConfigWidget::load() { NotificationSettings s; - _animate = s.value("Systray/Animate", true).toBool(); _showBubble = s.value("Systray/ShowBubble", false).toBool(); - _animateBox->setChecked(_animate); _showBubbleBox->setChecked(_showBubble); setChangedState(false); } void SystrayNotificationBackend::ConfigWidget::save() { NotificationSettings s; - s.setValue("Systray/Animate", _animateBox->isChecked()); s.setValue("Systray/ShowBubble", _showBubbleBox->isChecked()); load(); }