X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=30064d6708a8a96ff8fe60f5dac062f384c8f89b;hp=0b8d3e696c65b6989f7d88fd2542202179b2a85f;hb=49813fa53b34ffa35837d30fd022e2fc72f57eb5;hpb=011d2825dd89d2f93a72a49748581b16cc9bdb50

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 0b8d3e69..30064d67 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,34 +20,45 @@
 
 #include "qtui.h"
 
-#include "actioncollection.h"
+#include "abstractnotificationbackend.h"
+#include "buffermodel.h"
 #include "chatlinemodel.h"
+#include "contextmenuactionprovider.h"
 #include "mainwin.h"
-#include "abstractnotificationbackend.h"
 #include "qtuimessageprocessor.h"
+#include "qtuisettings.h"
 #include "qtuistyle.h"
+#include "systemtray.h"
+#include "toolbaractionprovider.h"
 #include "types.h"
-#include "uisettings.h"
 #include "util.h"
 
-ActionCollection *QtUi::_actionCollection = 0;
-MainWin *QtUi::_mainWin = 0;
-QSet<AbstractNotificationBackend *> QtUi::_notificationBackends;
+#ifdef Q_WS_X11
+#  include <QX11Info>
+#endif
+
+QPointer<QtUi> QtUi::_instance = 0;
+QPointer<MainWin> QtUi::_mainWin = 0;
+QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
 QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
-QtUiStyle *QtUi::_style = 0;
 
-QtUi::QtUi() : AbstractUi() {
-  if(_style != 0) {
+QtUi::QtUi() : GraphicalUi() {
+  if(_instance != 0) {
     qWarning() << "QtUi has been instantiated again!";
     return;
   }
-  _actionCollection = new ActionCollection(this);
+  _instance = this;
+
+  QtUiSettings uiSettings;
+  Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
 
-  UiSettings uiSettings;
-  loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+  setContextMenuActionProvider(new ContextMenuActionProvider(this));
+  setToolBarActionProvider(new ToolBarActionProvider(this));
 
+  setUiStyle(new QtUiStyle(this));
   _mainWin = new MainWin();
-  _style = new QtUiStyle;
+
+  setMainWidget(_mainWin);
 
   connect(_mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
   connect(_mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
@@ -55,7 +66,6 @@ QtUi::QtUi() : AbstractUi() {
 
 QtUi::~QtUi() {
   unregisterAllNotificationBackends();
-  delete _style;
   delete _mainWin;
 }
 
@@ -79,28 +89,37 @@ void QtUi::disconnectedFromCore() {
   _mainWin->disconnectedFromCore();
 }
 
+bool QtUi::haveSystemTray() {
+#ifdef QT_NO_SYSTEMTRAYICON
+  return false;
+#else
+  return mainWindow()->systemTray()->isSystemTrayAvailable();
+#endif
+}
+
 void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
   if(!_notificationBackends.contains(backend)) {
-    _notificationBackends.insert(backend);
+    _notificationBackends.append(backend);
+    instance()->connect(backend, SIGNAL(activated(uint)), SLOT(notificationActivated(uint)));
   }
 }
 
 void QtUi::unregisterNotificationBackend(AbstractNotificationBackend *backend) {
-  _notificationBackends.remove(backend);
+  _notificationBackends.removeAll(backend);
 }
 
 void QtUi::unregisterAllNotificationBackends() {
   _notificationBackends.clear();
 }
 
-const QSet<AbstractNotificationBackend *> &QtUi::notificationBackends() {
+const QList<AbstractNotificationBackend *> &QtUi::notificationBackends() {
   return _notificationBackends;
 }
 
-uint QtUi::invokeNotification(BufferId bufId, const QString &sender, const QString &text) {
+uint QtUi::invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text) {
   static int notificationId = 0;
-  //notificationId++;
-  AbstractNotificationBackend::Notification notification(++notificationId, bufId, sender, text);
+
+  AbstractNotificationBackend::Notification notification(++notificationId, bufId, type, sender, text);
   _notifications.append(notification);
   foreach(AbstractNotificationBackend *backend, _notificationBackends)
     backend->notify(notification);
@@ -110,25 +129,22 @@ uint QtUi::invokeNotification(BufferId bufId, const QString &sender, const QStri
 void QtUi::closeNotification(uint notificationId) {
   QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
   while(i != _notifications.end()) {
-    if((*i).notificationId == notificationId) {
+    if(i->notificationId == notificationId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
         backend->close(notificationId);
-      _notifications.erase(i);
-      break;
-    }
-    ++i;
+      i = _notifications.erase(i);
+    } else ++i;
   }
 }
 
 void QtUi::closeNotifications(BufferId bufferId) {
   QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
   while(i != _notifications.end()) {
-    if(!bufferId.isValid() || (*i).bufferId == bufferId) {
+    if(!bufferId.isValid() || i->bufferId == bufferId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
-        backend->close((*i).notificationId);
-      _notifications.erase(i);
-    }
-    ++i;
+        backend->close(i->notificationId);
+      i = _notifications.erase(i);
+    } else ++i;
   }
 }
 
@@ -136,3 +152,20 @@ const QList<AbstractNotificationBackend::Notification> &QtUi::activeNotification
   return _notifications;
 }
 
+void QtUi::notificationActivated(uint notificationId) {
+  if(notificationId != 0) {
+    QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
+    while(i != _notifications.end()) {
+      if(i->notificationId == notificationId) {
+        BufferId bufId = i->bufferId;
+        if(bufId.isValid())
+          Client::bufferModel()->switchToBuffer(bufId);
+        break;
+      }
+      ++i;
+    }
+  }
+  closeNotification(notificationId);
+
+  activateMainWidget();
+}