projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ToolBarActionProvider as another specialization of NetworkModelController
[quassel.git]
/
src
/
qtui
/
chatscene.cpp
diff --git
a/src/qtui/chatscene.cpp
b/src/qtui/chatscene.cpp
index
c6341ec
..
4fdf92a
100644
(file)
--- a/
src/qtui/chatscene.cpp
+++ b/
src/qtui/chatscene.cpp
@@
-34,6
+34,7
@@
#include "client.h"
#include "clientbacklogmanager.h"
#include "columnhandleitem.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "columnhandleitem.h"
+#include "contextmenuactionprovider.h"
#include "iconloader.h"
#include "messagefilter.h"
#include "qtui.h"
#include "iconloader.h"
#include "messagefilter.h"
#include "qtui.h"
@@
-586,7
+587,7
@@
void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
item->addActionsToMenu(&menu, item->mapFromScene(pos));
else
// no item -> default scene actions
item->addActionsToMenu(&menu, item->mapFromScene(pos));
else
// no item -> default scene actions
-
Client::mainUi()->a
ctionProvider()->addActions(&menu, filter(), BufferId());
+
GraphicalUi::contextMenuA
ctionProvider()->addActions(&menu, filter(), BufferId());
menu.exec(event->screenPos());
menu.exec(event->screenPos());
@@
-865,8
+866,9
@@
void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
if(webPreview.url != url) {
webPreview.url = url;
// prepare to load a different URL
if(webPreview.url != url) {
webPreview.url = url;
// prepare to load a different URL
- if(webPreview.previewItem && webPreview.previewItem->scene()) {
- removeItem(webPreview.previewItem);
+ if(webPreview.previewItem) {
+ if(webPreview.previewItem->scene())
+ removeItem(webPreview.previewItem);
delete webPreview.previewItem;
webPreview.previewItem = 0;
}
delete webPreview.previewItem;
webPreview.previewItem = 0;
}