#include "qtui.h"
#include "abstractnotificationbackend.h"
-#include "actioncollection.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;
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;
Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
_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()));
}
_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);
}