Make _mainWin a QPointer, to avoid problems with double deletion in case we use KDE

[quassel.git] / src / qtui / qtui.cpp

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 1459760..1b513a7 100644 (file)
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -20,18 +20,21 @@
 
 #include "qtui.h"
 
+#include "abstractnotificationbackend.h"
 #include "actioncollection.h"
 #include "chatlinemodel.h"
 #include "mainwin.h"
-#include "abstractnotificationbackend.h"
+#include "networkmodelactionprovider.h"
 #include "qtuimessageprocessor.h"
+#include "qtuisettings.h"
 #include "qtuistyle.h"
 #include "types.h"
-#include "uisettings.h"
 #include "util.h"
 
-ActionCollection *QtUi::_actionCollection = 0;
-QSet<AbstractNotificationBackend *> QtUi::_notificationBackends;
+QHash<QString, ActionCollection *> QtUi::_actionCollections;
+QPointer<MainWin> QtUi::_mainWin = 0;
+QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
+QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
 QtUiStyle *QtUi::_style = 0;
 
 QtUi::QtUi() : AbstractUi() {
@@ -39,26 +42,36 @@ QtUi::QtUi() : AbstractUi() {
     qWarning() << "QtUi has been instantiated again!";
     return;
   }
-  _actionCollection = new ActionCollection(this);
 
-  UiSettings uiSettings;
+  _actionProvider = new NetworkModelActionProvider(this);
+
+  QtUiSettings uiSettings;
   loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
 
-  mainWin = new MainWin();
+  _mainWin = new MainWin();
   _style = new QtUiStyle;
 
-  connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
-  connect(mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
+  connect(_mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
+  connect(_mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
 }
 
 QtUi::~QtUi() {
   unregisterAllNotificationBackends();
   delete _style;
-  delete mainWin;
+  delete _mainWin;
 }
 
 void QtUi::init() {
-  mainWin->init();
+  _mainWin->init();
+}
+
+ActionCollection *QtUi::actionCollection(const QString &category) {
+  if(_actionCollections.contains(category))
+    return _actionCollections.value(category);
+  ActionCollection *coll = new ActionCollection(mainWindow());
+  coll->addAssociatedWidget(mainWindow());
+  _actionCollections.insert(category, coll);
+  return coll;
 }
 
 MessageModel *QtUi::createMessageModel(QObject *parent) {
@@ -70,28 +83,67 @@ AbstractMessageProcessor *QtUi::createMessageProcessor(QObject *parent) {
 }
 
 void QtUi::connectedToCore() {
-  mainWin->connectedToCore();
+  _mainWin->connectedToCore();
 }
 
 void QtUi::disconnectedFromCore() {
-  mainWin->disconnectedFromCore();
+  _mainWin->disconnectedFromCore();
 }
 
 void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
   if(!_notificationBackends.contains(backend)) {
-    _notificationBackends.insert(backend);
+    _notificationBackends.append(backend);
   }
 }
 
 void QtUi::unregisterNotificationBackend(AbstractNotificationBackend *backend) {
-  _notificationBackends.remove(backend);
+  _notificationBackends.removeAll(backend);
 }
 
 void QtUi::unregisterAllNotificationBackends() {
   _notificationBackends.clear();
 }
 
-void QtUi::notify(BufferId id, const QString &sender, const QString &text) {
+const QList<AbstractNotificationBackend *> &QtUi::notificationBackends() {
+  return _notificationBackends;
+}
+
+uint QtUi::invokeNotification(BufferId bufId, const QString &sender, const QString &text) {
+  static int notificationId = 0;
+  //notificationId++;
+  AbstractNotificationBackend::Notification notification(++notificationId, bufId, sender, text);
+  _notifications.append(notification);
   foreach(AbstractNotificationBackend *backend, _notificationBackends)
-    backend->notify(id, sender, text);
+    backend->notify(notification);
+  return notificationId;
+}
+
+void QtUi::closeNotification(uint notificationId) {
+  QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
+  while(i != _notifications.end()) {
+    if((*i).notificationId == notificationId) {
+      foreach(AbstractNotificationBackend *backend, _notificationBackends)
+        backend->close(notificationId);
+      _notifications.erase(i);
+      break;
+    }
+    ++i;
+  }
+}
+
+void QtUi::closeNotifications(BufferId bufferId) {
+  QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
+  while(i != _notifications.end()) {
+    if(!bufferId.isValid() || (*i).bufferId == bufferId) {
+      foreach(AbstractNotificationBackend *backend, _notificationBackends)
+        backend->close((*i).notificationId);
+      _notifications.erase(i);
+    }
+    ++i;
+  }
+}
+
+const QList<AbstractNotificationBackend::Notification> &QtUi::activeNotifications() {
+  return _notifications;
 }
+