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

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 157aafe1..85e6b1a6 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -20,16 +20,39 @@
 
 #include "qtui.h"
 
+#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);
+
+  UiSettings uiSettings;
+  loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+
+  mainWin = new MainWin();
+  _style = new QtUiStyle;
 
-QtUi::QtUi() : AbstractUi() {
-  mainWin = new MainWin(this);
   connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
   connect(mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
-
 }
 
 QtUi::~QtUi() {
+  delete _style;
   delete mainWin;
 }
 
@@ -37,8 +60,12 @@ void QtUi::init() {
   mainWin->init();
 }
 
-AbstractUiMsg *QtUi::layoutMsg(const Message &msg) {
-  return mainWin->layoutMsg(msg);
+MessageModel *QtUi::createMessageModel(QObject *parent) {
+  return new ChatLineModel(parent);
+}
+
+AbstractMessageProcessor *QtUi::createMessageProcessor(QObject *parent) {
+  return new QtUiMessageProcessor(parent);
 }
 
 void QtUi::connectedToCore() {