projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WebPreview is now delayed by 2 seconds.
[quassel.git]
/
src
/
qtui
/
qtui.cpp
diff --git
a/src/qtui/qtui.cpp
b/src/qtui/qtui.cpp
index
ff676ad
..
85e6b1a
100644
(file)
--- a/
src/qtui/qtui.cpp
+++ b/
src/qtui/qtui.cpp
@@
-22,22
+22,25
@@
#include <QDebug>
#include <QDebug>
+#include "actioncollection.h"
#include "chatlinemodel.h"
#include "mainwin.h"
#include "qtuimessageprocessor.h"
#include "chatlinemodel.h"
#include "mainwin.h"
#include "qtuimessageprocessor.h"
+#include "qtuistyle.h"
#include "uisettings.h"
#include "util.h"
#include "uisettings.h"
#include "util.h"
+ActionCollection *QtUi::_actionCollection = 0;
QtUiStyle *QtUi::_style = 0;
QtUiStyle *QtUi::_style = 0;
-QtUi::QtUi()
- : AbstractUi()
+QtUi::QtUi() : AbstractUi()
{
if(_style != 0) {
qWarning() << "QtUi has been instantiated again!";
return;
}
{
if(_style != 0) {
qWarning() << "QtUi has been instantiated again!";
return;
}
-
+ _actionCollection = new ActionCollection(this);
+
UiSettings uiSettings;
loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
UiSettings uiSettings;
loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());