projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a shortcut for hiding current buffer.
[quassel.git]
/
src
/
qtui
/
knotificationbackend.cpp
diff --git
a/src/qtui/knotificationbackend.cpp
b/src/qtui/knotificationbackend.cpp
index
d3939df
..
5adbfbc
100644
(file)
--- a/
src/qtui/knotificationbackend.cpp
+++ b/
src/qtui/knotificationbackend.cpp
@@
-28,6
+28,7
@@
#include "client.h"
#include "icon.h"
#include "iconloader.h"
#include "client.h"
#include "icon.h"
#include "iconloader.h"
+#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
#include "networkmodel.h"
#include "qtui.h"
@@
-36,6
+37,8
@@
KNotificationBackend::KNotificationBackend(QObject *parent)
{
connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
SLOT(notificationActivated(SystemTray::ActivationReason)));
{
connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
SLOT(notificationActivated(SystemTray::ActivationReason)));
+
+ updateToolTip();
}
void KNotificationBackend::notify(const Notification &n) {
}
void KNotificationBackend::notify(const Notification &n) {
@@
-62,6
+65,7
@@
void KNotificationBackend::notify(const Notification &n) {
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
+ updateToolTip();
QtUi::mainWindow()->systemTray()->setAlert(true);
}
QtUi::mainWindow()->systemTray()->setAlert(true);
}
@@
-75,11
+79,12
@@
void KNotificationBackend::removeNotificationById(uint notificationId) {
} else
++i;
}
} else
++i;
}
+ updateToolTip();
}
void KNotificationBackend::close(uint notificationId) {
removeNotificationById(notificationId);
}
void KNotificationBackend::close(uint notificationId) {
removeNotificationById(notificationId);
- if(!_notifications.count())
+ //if(!_notifications.count()) // FIXME make configurable
QtUi::mainWindow()->systemTray()->setAlert(false);
}
QtUi::mainWindow()->systemTray()->setAlert(false);
}
@@
-93,15
+98,21
@@
void KNotificationBackend::notificationActivated() {
}
void KNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
}
void KNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
- if(reason == SystemTray::Trigger && _notifications.count()) {
- notificationActivated(_notifications.first().first); // oldest one
+ if(reason == SystemTray::Trigger) {
+ if( _notifications.count())
+ notificationActivated(_notifications.first().first); // oldest one
+ else
+ GraphicalUi::toggleMainWidget();
}
}
void KNotificationBackend::notificationActivated(uint notificationId) {
}
}
void KNotificationBackend::notificationActivated(uint notificationId) {
- QtUi::mainWindow()->systemTray()->setInhibitActivation();
emit activated(notificationId);
emit activated(notificationId);
+}
+void KNotificationBackend::updateToolTip() {
+ QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
+ _notifications.count()? tr("%n pending highlight(s)", "", _notifications.count()) : QString());
}
SettingsPage *KNotificationBackend::createConfigWidget() const {
}
SettingsPage *KNotificationBackend::createConfigWidget() const {