projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
faster ChatLine insertion into the ChatScene. And some minor improvements
[quassel.git]
/
src
/
qtui
/
qtui.cpp
diff --git
a/src/qtui/qtui.cpp
b/src/qtui/qtui.cpp
index
a65a479
..
ff676ad
100644
(file)
--- a/
src/qtui/qtui.cpp
+++ b/
src/qtui/qtui.cpp
@@
-20,19
+20,28
@@
#include "qtui.h"
#include "qtui.h"
-#ifdef SPUTDEV
-# include "chatlinemodel.h"
-#else
-# include "chatline-old.h"
-#endif
+#include <QDebug>
+
+#include "chatlinemodel.h"
#include "mainwin.h"
#include "mainwin.h"
+#include "qtuimessageprocessor.h"
+#include "uisettings.h"
+#include "util.h"
-QtUiStyle *QtUi::_style;
+QtUiStyle *QtUi::_style
= 0
;
QtUi::QtUi()
: AbstractUi()
{
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 &)));
_style = new QtUiStyle;
connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
@@
-48,25
+57,12
@@
void QtUi::init() {
mainWin->init();
}
mainWin->init();
}
-QtUiStyle *QtUi::style() {
- return _style;
-}
-
MessageModel *QtUi::createMessageModel(QObject *parent) {
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() {
}
void QtUi::connectedToCore() {