/***************************************************************************
- * 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 *
#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 "util.h"
QHash<QString, ActionCollection *> QtUi::_actionCollections;
-MainWin *QtUi::_mainWin = 0;
+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) {
+ if(_instance != 0) {
qWarning() << "QtUi has been instantiated again!";
return;
}
+ _instance = this;
+
+ _actionProvider = new NetworkModelActionProvider(this);
QtUiSettings uiSettings;
loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
if(!_notificationBackends.contains(backend)) {
_notificationBackends.append(backend);
+ instance()->connect(backend, SIGNAL(activated()), SLOT(notificationActivated()));
}
}
if((*i).notificationId == notificationId) {
foreach(AbstractNotificationBackend *backend, _notificationBackends)
backend->close(notificationId);
- _notifications.erase(i);
+ i = _notifications.erase(i);
break;
+ } else {
+ ++i;
}
- ++i;
}
}
if(!bufferId.isValid() || (*i).bufferId == bufferId) {
foreach(AbstractNotificationBackend *backend, _notificationBackends)
backend->close((*i).notificationId);
- _notifications.erase(i);
+ i = _notifications.erase(i);
+ } else {
+ ++i;
}
- ++i;
}
}
return _notifications;
}
+void QtUi::notificationActivated() {
+ // this might not work with some window managers
+ _mainWin->raise();
+ _mainWin->activateWindow();
+}