projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 16x16 icons for context menu actions
[quassel.git]
/
src
/
qtui
/
qtui.cpp
diff --git
a/src/qtui/qtui.cpp
b/src/qtui/qtui.cpp
index
ba8d18d
..
c1ed4aa
100644
(file)
--- a/
src/qtui/qtui.cpp
+++ b/
src/qtui/qtui.cpp
@@
-23,11
+23,12
@@
#include "abstractnotificationbackend.h"
#include "actioncollection.h"
#include "chatlinemodel.h"
#include "abstractnotificationbackend.h"
#include "actioncollection.h"
#include "chatlinemodel.h"
+#include "contextmenuactionprovider.h"
#include "mainwin.h"
#include "mainwin.h"
-#include "networkmodelactionprovider.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
#include "qtuistyle.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
#include "qtuistyle.h"
+#include "toolbaractionprovider.h"
#include "types.h"
#include "util.h"
#include "types.h"
#include "util.h"
@@
-38,17
+39,18
@@
QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
QtUiStyle *QtUi::_style = 0;
QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
QtUiStyle *QtUi::_style = 0;
-QtUi::QtUi() :
Abstract
Ui() {
+QtUi::QtUi() :
Graphical
Ui() {
if(_instance != 0) {
qWarning() << "QtUi has been instantiated again!";
return;
}
_instance = this;
if(_instance != 0) {
qWarning() << "QtUi has been instantiated again!";
return;
}
_instance = this;
- _actionProvider = new NetworkModelActionProvider(this);
+ setContextMenuActionProvider(new ContextMenuActionProvider(this));
+ setToolBarActionProvider(new ToolBarActionProvider(this));
QtUiSettings uiSettings;
QtUiSettings uiSettings;
- loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+
Quassel::
loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
_mainWin = new MainWin();
_style = new QtUiStyle;
_mainWin = new MainWin();
_style = new QtUiStyle;