X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=ff676ad1685601fd1ab8ac19746e8a8b2c50761b;hp=e0fac9c4aacdab840f8defbdfe96438f0f2cbd3e;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hpb=a2bf6dec2ea5a72d15a3310f8a7abc11988228c4

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index e0fac9c4..ff676ad1 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -20,18 +20,28 @@
 
 #include "qtui.h"
 
-#ifdef SPUTDEV
-# include "chatlinemodel.h"
-#endif
+#include <QDebug>
+
+#include "chatlinemodel.h"
 #include "mainwin.h"
-#include "chatline-old.h"
+#include "qtuimessageprocessor.h"
+#include "uisettings.h"
+#include "util.h"
 
-QtUiStyle *QtUi::_style;
+QtUiStyle *QtUi::_style = 0;
 
 QtUi::QtUi()
   : AbstractUi()
 {
-  mainWin = new MainWin(this);
+  if(_style != 0) {
+    qWarning() << "QtUi has been instantiated again!";
+    return;
+  }
+    
+  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 &)));
@@ -47,21 +57,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 new ChatLineOld(msg);
+AbstractMessageProcessor *QtUi::createMessageProcessor(QObject *parent) {
+  return new QtUiMessageProcessor(parent);
 }
 
 void QtUi::connectedToCore() {