projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Network toolbar to Main toolbar
[quassel.git]
/
src
/
uisupport
/
bufferview.cpp
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
345fd7b
..
8fbbdd3
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-35,11
+35,12
@@
#include "buffersettings.h"
#include "buffersyncer.h"
#include "client.h"
#include "buffersettings.h"
#include "buffersyncer.h"
#include "client.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
#include "iconloader.h"
#include "network.h"
#include "networkmodel.h"
#include "iconloader.h"
#include "network.h"
#include "networkmodel.h"
-#include "networkmodelactionprovider.h"
-#include "quasselui.h"
+#include "contextmenuactionprovider.h"
#include "uisettings.h"
/*****************************************
#include "uisettings.h"
/*****************************************
@@
-386,7
+387,7
@@
void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index)
indexList.removeAll(index);
indexList.prepend(index);
indexList.removeAll(index);
indexList.prepend(index);
-
Client::mainUi()->a
ctionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
+
GraphicalUi::contextMenuA
ctionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
}
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
}
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
@@
-403,12
+404,12
@@
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index)
}
void BufferView::menuActionTriggered(QAction *result) {
}
void BufferView::menuActionTriggered(QAction *result) {
-
NetworkModelActionProvider::ActionType type = (NetworkModel
ActionProvider::ActionType)result->data().toInt();
+
ContextMenuActionProvider::ActionType type = (ContextMenu
ActionProvider::ActionType)result->data().toInt();
switch(type) {
switch(type) {
- case
NetworkModel
ActionProvider::HideBufferTemporarily:
+ case
ContextMenu
ActionProvider::HideBufferTemporarily:
removeSelectedBuffers();
break;
removeSelectedBuffers();
break;
- case
NetworkModel
ActionProvider::HideBufferPermanently:
+ case
ContextMenu
ActionProvider::HideBufferPermanently:
removeSelectedBuffers(true);
break;
default:
removeSelectedBuffers(true);
break;
default: