X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fknotificationbackend.cpp;h=41d56385f30a69883d3a21a57a7e3120d20b2dfe;hp=d3939dfba8e8f6a19c5a786950756e8e1e5a7ae4;hb=695758015a80eb8c158a9ac4c0f1c0b547e70df3;hpb=e7d1bc1fa02e1233f140e4b04d99ab8f4685bce5

diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index d3939dfb..41d56385 100644
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,120 +15,159 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include <KNotification>
 #include <KNotifyConfigWidget>
+#include <QIcon>
 #include <QTextDocument>
 #include <QVBoxLayout>
 
 #include "knotificationbackend.h"
 
 #include "client.h"
-#include "icon.h"
-#include "iconloader.h"
+#include "mainwin.h"
 #include "networkmodel.h"
 #include "qtui.h"
 
 KNotificationBackend::KNotificationBackend(QObject *parent)
-: AbstractNotificationBackend(parent)
+    : AbstractNotificationBackend(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) {
-  QString type;
-  switch(n.type) {
+
+void KNotificationBackend::notify(const Notification &n)
+{
+    QString type;
+    switch (n.type) {
     case Highlight:
-      type = "Highlight"; break;
+        type = "Highlight"; break;
     case HighlightFocused:
-      type = "HighlightFocused"; break;
+        type = "HighlightFocused"; break;
     case PrivMsg:
-      type = "PrivMsg"; break;
+        type = "PrivMsg"; break;
     case PrivMsgFocused:
-      type = "PrivMsgFocused"; break;
-  }
-
-  QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, Qt::escape(n.message));
-  KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
-                                KNotification::RaiseWidgetOnActivation
-                               |KNotification::CloseWhenWidgetActivated
-                               |KNotification::CloseOnTimeout);
-  connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
-  notification->setActions(QStringList("View"));
-  notification->setProperty("notificationId", n.notificationId);
+        type = "PrivMsgFocused"; break;
+    }
+
+#if QT_VERSION < 0x050000
+    QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, Qt::escape(n.message));
+#else
+    QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, n.message.toHtmlEscaped());
+#endif
+    KNotification *notification = KNotification::event(type, message, QIcon::fromTheme("dialog-information").pixmap(48), QtUi::mainWindow(),
+        KNotification::RaiseWidgetOnActivation
+        |KNotification::CloseWhenWidgetActivated
+        |KNotification::CloseOnTimeout);
+    connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
+    notification->setActions(QStringList("View"));
+    notification->setProperty("notificationId", n.notificationId);
+
+    _notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
+
+    updateToolTip();
+    QtUi::mainWindow()->systemTray()->setAlert(true);
+}
 
-  _notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
 
-  QtUi::mainWindow()->systemTray()->setAlert(true);
+void KNotificationBackend::removeNotificationById(uint notificationId)
+{
+    QList<QPair<uint, QPointer<KNotification> > >::iterator i = _notifications.begin();
+    while (i != _notifications.end()) {
+        if (i->first == notificationId) {
+            if (i->second)
+                i->second->close();
+            i = _notifications.erase(i);
+        }
+        else
+            ++i;
+    }
+    updateToolTip();
 }
 
-void KNotificationBackend::removeNotificationById(uint notificationId) {
-  QList<QPair<uint, QPointer<KNotification> > >::iterator i = _notifications.begin();
-  while(i != _notifications.end()) {
-    if(i->first == notificationId) {
-      if(i->second)
-        i->second->close();
-      i = _notifications.erase(i);
-    } else
-      ++i;
-  }
-}
 
-void KNotificationBackend::close(uint notificationId) {
-  removeNotificationById(notificationId);
-  if(!_notifications.count())
+void KNotificationBackend::close(uint notificationId)
+{
+    removeNotificationById(notificationId);
+    //if(!_notifications.count()) // FIXME make configurable
     QtUi::mainWindow()->systemTray()->setAlert(false);
 }
 
-void KNotificationBackend::notificationActivated() {
-  uint id = 0;
-  KNotification *n = qobject_cast<KNotification *>(sender());
-  if(n)
-    id = n->property("notificationId").toUInt();
 
-  notificationActivated(id);
+void KNotificationBackend::notificationActivated()
+{
+    uint id = 0;
+    KNotification *n = qobject_cast<KNotification *>(sender());
+    if (n)
+        id = n->property("notificationId").toUInt();
+
+    notificationActivated(id);
 }
 
-void KNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
-  if(reason == SystemTray::Trigger && _notifications.count()) {
-    notificationActivated(_notifications.first().first); // oldest one
-  }
+
+void KNotificationBackend::notificationActivated(SystemTray::ActivationReason reason)
+{
+    if (reason == SystemTray::Trigger) {
+        if (_notifications.count())
+            notificationActivated(_notifications.first().first);  // oldest one
+        else
+            GraphicalUi::toggleMainWidget();
+    }
 }
 
-void KNotificationBackend::notificationActivated(uint notificationId) {
-  QtUi::mainWindow()->systemTray()->setInhibitActivation();
-  emit activated(notificationId);
 
+void KNotificationBackend::notificationActivated(uint notificationId)
+{
+    emit activated(notificationId);
 }
 
-SettingsPage *KNotificationBackend::createConfigWidget() const {
-  return new ConfigWidget();
+
+void KNotificationBackend::updateToolTip()
+{
+    QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
+        _notifications.count() ? tr("%n pending highlight(s)", "", _notifications.count()) : QString());
 }
 
+
+SettingsPage *KNotificationBackend::createConfigWidget() const
+{
+    return new ConfigWidget();
+}
+
+
 /***************************************************************************/
 
-KNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "KNotification", parent) {
-  _widget = new KNotifyConfigWidget(this);
-  _widget->setApplication("quassel");
+KNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "KNotification", parent)
+{
+    _widget = new KNotifyConfigWidget(this);
+    _widget->setApplication("quassel");
 
-  QVBoxLayout *layout = new QVBoxLayout(this);
-  layout->addWidget(_widget);
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(_widget);
 
-  connect(_widget, SIGNAL(changed(bool)), SLOT(widgetChanged(bool)));
+    connect(_widget, SIGNAL(changed(bool)), SLOT(widgetChanged(bool)));
 }
 
-void KNotificationBackend::ConfigWidget::widgetChanged(bool changed) {
-  setChangedState(changed);
+
+void KNotificationBackend::ConfigWidget::widgetChanged(bool changed)
+{
+    setChangedState(changed);
 }
 
-void KNotificationBackend::ConfigWidget::load() {
-  setChangedState(false);
+
+void KNotificationBackend::ConfigWidget::load()
+{
+    setChangedState(false);
 }
 
-void KNotificationBackend::ConfigWidget::save() {
-  _widget->save();
-  load();
+
+void KNotificationBackend::ConfigWidget::save()
+{
+    _widget->save();
+    load();
 }