#include "qtui.h"
#include "abstractnotificationbackend.h"
-#include "actioncollection.h"
+#include "buffermodel.h"
#include "chatlinemodel.h"
+#include "contextmenuactionprovider.h"
#include "mainwin.h"
-#include "networkmodelactionprovider.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
#include "qtuistyle.h"
+#include "toolbaractionprovider.h"
#include "types.h"
#include "util.h"
-QHash<QString, ActionCollection *> QtUi::_actionCollections;
+#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() {
+QtUi::QtUi() : GraphicalUi() {
if(_instance != 0) {
qWarning() << "QtUi has been instantiated again!";
return;
}
_instance = this;
- _actionProvider = new NetworkModelActionProvider(this);
-
QtUiSettings uiSettings;
Quassel::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()));
QtUi::~QtUi() {
unregisterAllNotificationBackends();
- delete _style;
delete _mainWin;
}
_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) {
return new ChatLineModel(parent);
}
void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
if(!_notificationBackends.contains(backend)) {
_notificationBackends.append(backend);
- instance()->connect(backend, SIGNAL(activated()), SLOT(notificationActivated()));
+ 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);
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);
i = _notifications.erase(i);
- break;
- } else {
- ++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);
+ backend->close(i->notificationId);
i = _notifications.erase(i);
- } else {
- ++i;
- }
+ } else ++i;
}
}
return _notifications;
}
-void QtUi::notificationActivated() {
- // this might not work with some window managers
- _mainWin->raise();
- _mainWin->activateWindow();
+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);
+
+ mainWindow()->forceActivated();
}