X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtui.cpp;h=85e6b1a60268a692ca094798ea29337a62e2cac1;hb=7cef35ccdcb26ad547383537d3615644df703c9a;hp=46c657cecd03cdc2eb5c22e70b9536e2b90f96dd;hpb=ef12cc4010e853348474b4ea15c383dd596d4858;p=quassel.git

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 46c657ce..85e6b1a6 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -20,20 +20,35 @@
 
 #include "qtui.h"
 
-#ifdef SPUTDEV
-# include "chatlinemodel.h"
-#endif
+#include <QDebug>
+
+#include "actioncollection.h"
+#include "chatlinemodel.h"
 #include "mainwin.h"
+#include "qtuimessageprocessor.h"
+#include "qtuistyle.h"
+#include "uisettings.h"
+#include "util.h"
+
+ActionCollection *QtUi::_actionCollection = 0;
+QtUiStyle *QtUi::_style = 0;
+
+QtUi::QtUi() : AbstractUi()
+{
+  if(_style != 0) {
+    qWarning() << "QtUi has been instantiated again!";
+    return;
+  }
+  _actionCollection = new ActionCollection(this);
 
-QtUiStyle *QtUi::_style;
+  UiSettings uiSettings;
+  loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
 
-QtUi::QtUi() : AbstractUi() {
-  mainWin = new MainWin(this);
+  mainWin = new MainWin();
   _style = new QtUiStyle;
 
   connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
   connect(mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
-
 }
 
 QtUi::~QtUi() {
@@ -45,21 +60,12 @@ void QtUi::init() {
   mainWin->init();
 }
 
-QtUiStyle *QtUi::style() {
-  return _style;
-}
-
 MessageModel *QtUi::createMessageModel(QObject *parent) {
-#ifndef SPUTDEV
-  Q_UNUSED(parent)
-  return 0;
-#else
-  return new ChatlineModel(parent);
-#endif
+  return new ChatLineModel(parent);
 }
 
-AbstractUiMsg *QtUi::layoutMsg(const Message &msg) {
-  return mainWin->layoutMsg(msg);
+AbstractMessageProcessor *QtUi::createMessageProcessor(QObject *parent) {
+  return new QtUiMessageProcessor(parent);
 }
 
 void QtUi::connectedToCore() {