/***************************************************************************
- * Copyright (C) 2005-2010 by the Quassel Project *
+ * Copyright (C) 2005-2012 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
QtUi::mainWindow()->systemTray()->closeMessage(notificationId);
- if(!_notifications.count())
+ //if(!_notifications.count()) //FIXME make configurable
QtUi::mainWindow()->systemTray()->setAlert(false);
updateToolTip();
void SystrayNotificationBackend::notificationActivated(uint notificationId) {
if(!_blockActivation) {
- if(QtUi::mainWindow()->systemTray()->isAlerted()) {
- _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
+ 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);
void SystrayNotificationBackend::updateToolTip() {
QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
- _notifications.count()? tr("%n pending highlights", "", _notifications.count()) : QString());
+ _notifications.count()? tr("%n pending highlight(s)", "", _notifications.count()) : QString());
}
SettingsPage *SystrayNotificationBackend::createConfigWidget() const {