projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updating mac app icon file
[quassel.git]
/
src
/
qtui
/
chatscene.cpp
diff --git
a/src/qtui/chatscene.cpp
b/src/qtui/chatscene.cpp
index
ae63e55
..
60f3f1b
100644
(file)
--- a/
src/qtui/chatscene.cpp
+++ b/
src/qtui/chatscene.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-48,7
+48,7
@@
ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
_chatView(parent),
_idString(idString),
_model(model),
_chatView(parent),
_idString(idString),
_model(model),
- _singleBuffer
Scene(false
),
+ _singleBuffer
Id(BufferId()
),
_sceneRect(0, 0, width, 0),
_firstLineRow(-1),
_viewportHeight(0),
_sceneRect(0, 0, width, 0),
_firstLineRow(-1),
_viewportHeight(0),
@@
-61,8
+61,8
@@
ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
_leftButtonPressed(false)
{
MessageFilter *filter = qobject_cast<MessageFilter*>(model);
_leftButtonPressed(false)
{
MessageFilter *filter = qobject_cast<MessageFilter*>(model);
- if(filter) {
- _singleBuffer
Scene = filter->isSingleBufferFilter
();
+ if(filter
&& filter->isSingleBufferFilter()
) {
+ _singleBuffer
Id = filter->singleBufferId
();
}
ChatViewSettings defaultSettings;
}
ChatViewSettings defaultSettings;
@@
-587,6
+587,9
@@
void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
ChatItem *item = chatItemAt(pos);
if(item)
item->addActionsToMenu(&menu, item->mapFromScene(pos));
ChatItem *item = chatItemAt(pos);
if(item)
item->addActionsToMenu(&menu, item->mapFromScene(pos));
+ else
+ // no item -> default scene actions
+ Client::mainUi()->actionProvider()->addActions(&menu, filter(), BufferId());
menu.exec(event->screenPos());
menu.exec(event->screenPos());
@@
-650,7
+653,7
@@
void ChatScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
}
void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
- if(
!event->buttons() & Qt::LeftButton
) {
+ if(
event->button() == Qt::LeftButton && _leftButtonPressed
) {
_leftButtonPressed = false;
if(_clickMode != NoClick) {
if(_clickMode == SingleClick)
_leftButtonPressed = false;
if(_clickMode != NoClick) {
if(_clickMode == SingleClick)