#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);
+ setContextMenuActionProvider(new ContextMenuActionProvider(this));
+ setToolBarActionProvider(new ToolBarActionProvider(this));
QtUiSettings uiSettings;
- loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+ Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
_mainWin = new MainWin();
_style = new QtUiStyle;
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)));
}
}
backend->close(notificationId);
i = _notifications.erase(i);
break;
- } else {
- ++i;
- }
+ } else ++i;
}
}
foreach(AbstractNotificationBackend *backend, _notificationBackends)
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);
+ foreach(AbstractNotificationBackend *backend, _notificationBackends)
+ backend->close(notificationId);
+ _notifications.erase(i);
+ break;
+ } else ++i;
+ }
+ }
+
+ mainWindow()->forceActivated();
}