/***************************************************************************
- * 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 "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 "toolbaractionprovider.h"
#include "types.h"
-#include "uisettings.h"
#include "util.h"
-ActionCollection *QtUi::_actionCollection = 0;
-MainWin *QtUi::_mainWin = 0;
+#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;
- UiSettings uiSettings;
- loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+ setContextMenuActionProvider(new ContextMenuActionProvider(this));
+ setToolBarActionProvider(new ToolBarActionProvider(this));
+
+ QtUiSettings uiSettings;
+ Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
- _mainWin = new MainWin();
_style = new QtUiStyle;
+ _mainWin = new MainWin();
+
+ setMainWidget(_mainWin);
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 _style;
}
void QtUi::init() {
void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
if(!_notificationBackends.contains(backend)) {
_notificationBackends.append(backend);
+ instance()->connect(backend, SIGNAL(activated(uint)), SLOT(notificationActivated(uint)));
}
}
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);
if((*i).notificationId == notificationId) {
foreach(AbstractNotificationBackend *backend, _notificationBackends)
backend->close(notificationId);
- _notifications.erase(i);
+ i = _notifications.erase(i);
break;
- }
- ++i;
+ } else ++i;
}
}
if(!bufferId.isValid() || (*i).bufferId == bufferId) {
foreach(AbstractNotificationBackend *backend, _notificationBackends)
backend->close((*i).notificationId);
- _notifications.erase(i);
- }
- ++i;
+ i = _notifications.erase(i);
+ } else ++i;
}
}
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);
+ foreach(AbstractNotificationBackend *backend, _notificationBackends)
+ backend->close(notificationId);
+ _notifications.erase(i);
+ break;
+ } else ++i;
+ }
+ }
+
+ mainWindow()->forceActivated();
+}