projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using the extended away icon for away state as proposed by jussi01
[quassel.git]
/
src
/
qtui
/
chatitem.cpp
diff --git
a/src/qtui/chatitem.cpp
b/src/qtui/chatitem.cpp
index
fc45b77
..
098c78e
100644
(file)
--- a/
src/qtui/chatitem.cpp
+++ b/
src/qtui/chatitem.cpp
@@
-278,7
+278,7
@@
void ChatItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
}
void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
- if(_selectionMode != NoSelection &&
!event->buttons() &
Qt::LeftButton) {
+ if(_selectionMode != NoSelection &&
event->button() ==
Qt::LeftButton) {
chatScene()->selectionToClipboard(QClipboard::Selection);
event->accept();
} else
chatScene()->selectionToClipboard(QClipboard::Selection);
event->accept();
} else
@@
-286,9
+286,9
@@
void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
void ChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
}
void ChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
- Q_UNUSED(menu);
Q_UNUSED(pos);
Q_UNUSED(pos);
+ Client::mainUi()->actionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>());
}
// ************************************************************
}
// ************************************************************
@@
-602,8
+602,6
@@
void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
}
void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
}
void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
- Q_UNUSED(pos); // we assume that the current mouse cursor pos is the point of invocation
-
if(privateData()->currentClickable.isValid()) {
Clickable click = privateData()->currentClickable;
switch(click.type) {
if(privateData()->currentClickable.isValid()) {
Clickable click = privateData()->currentClickable;
switch(click.type) {
@@
-624,9
+622,8
@@
void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
break;
}
} else {
break;
}
} else {
-
// Buffer-specific actions
// Buffer-specific actions
- C
lient::mainUi()->actionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>()
);
+ C
hatItem::addActionsToMenu(menu, pos
);
}
}
}
}