projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump © years
[quassel.git]
/
src
/
qtui
/
systraynotificationbackend.cpp
diff --git
a/src/qtui/systraynotificationbackend.cpp
b/src/qtui/systraynotificationbackend.cpp
index
dade708
..
7413495
100644
(file)
--- a/
src/qtui/systraynotificationbackend.cpp
+++ b/
src/qtui/systraynotificationbackend.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
0
by the Quassel Project *
+ * Copyright (C) 2005-201
2
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-88,7
+88,8
@@
void SystrayNotificationBackend::close(uint notificationId) {
void SystrayNotificationBackend::notificationActivated(uint notificationId) {
if(!_blockActivation) {
if(_notifications.count()) {
void SystrayNotificationBackend::notificationActivated(uint notificationId) {
if(!_blockActivation) {
if(_notifications.count()) {
- _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
+ 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);
if(!notificationId)
notificationId = _notifications.count()? _notifications.last().notificationId : 0;
emit activated(notificationId);
@@
-121,7
+122,7
@@
void SystrayNotificationBackend::animateChanged(const QVariant &v) {
void SystrayNotificationBackend::updateToolTip() {
QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
void SystrayNotificationBackend::updateToolTip() {
QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
- _notifications.count()? tr("%n pending highlight
s
", "", _notifications.count()) : QString());
+ _notifications.count()? tr("%n pending highlight
(s)
", "", _notifications.count()) : QString());
}
SettingsPage *SystrayNotificationBackend::createConfigWidget() const {
}
SettingsPage *SystrayNotificationBackend::createConfigWidget() const {