X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=85e6b1a60268a692ca094798ea29337a62e2cac1;hp=a65a47947ea1443a0c744feaa5a2d9a6ae5c11c2;hb=339ed024e6cf074108e39360e7db58ea0961761b;hpb=e017aca90eb3444df68fb365a5d50b05881b1c5c

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index a65a4794..85e6b1a6 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -20,19 +20,31 @@
 
 #include "qtui.h"
 
-#ifdef SPUTDEV
-# include "chatlinemodel.h"
-#else
-# include "chatline-old.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"
 
-QtUiStyle *QtUi::_style;
+ActionCollection *QtUi::_actionCollection = 0;
+QtUiStyle *QtUi::_style = 0;
 
-QtUi::QtUi()
-  : AbstractUi()
+QtUi::QtUi() : AbstractUi()
 {
-  mainWin = new MainWin(this);
+  if(_style != 0) {
+    qWarning() << "QtUi has been instantiated again!";
+    return;
+  }
+  _actionCollection = new ActionCollection(this);
+
+  UiSettings uiSettings;
+  loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+
+  mainWin = new MainWin();
   _style = new QtUiStyle;
 
   connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
@@ -48,25 +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) {
-#ifndef SPUTDEV
-  return new ChatLineOld(msg);
-#else
-  return 0;
-#endif
+AbstractMessageProcessor *QtUi::createMessageProcessor(QObject *parent) {
+  return new QtUiMessageProcessor(parent);
 }
 
 void QtUi::connectedToCore() {