projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preparing storage backend to store usermode and awaymessage for session restore
[quassel.git]
/
src
/
qtui
/
chatitem.cpp
diff --git
a/src/qtui/chatitem.cpp
b/src/qtui/chatitem.cpp
index
3f429de
..
de96b2d
100644
(file)
--- a/
src/qtui/chatitem.cpp
+++ b/
src/qtui/chatitem.cpp
@@
-32,6
+32,7
@@
#include "bufferview.h"
#include "chatitem.h"
#include "chatlinemodel.h"
#include "bufferview.h"
#include "chatitem.h"
#include "chatlinemodel.h"
+#include "contextmenuactionprovider.h"
#include "iconloader.h"
#include "mainwin.h"
#include "qtui.h"
#include "iconloader.h"
#include "mainwin.h"
#include "qtui.h"
@@
-39,7
+40,6
@@
ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent)
: QGraphicsItem(parent),
ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent)
: QGraphicsItem(parent),
- _data(0),
_boundingRect(0, 0, width, height),
_selectionMode(NoSelection),
_selectionStart(-1)
_boundingRect(0, 0, width, height),
_selectionMode(NoSelection),
_selectionStart(-1)
@@
-49,10
+49,6
@@
ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos,
setPos(pos);
}
setPos(pos);
}
-ChatItem::~ChatItem() {
- delete _data;
-}
-
QVariant ChatItem::data(int role) const {
QModelIndex index = model()->index(row(), column());
if(!index.isValid()) {
QVariant ChatItem::data(int role) const {
QModelIndex index = model()->index(row(), column());
if(!index.isValid()) {
@@
-62,8
+58,10
@@
QVariant ChatItem::data(int role) const {
return model()->data(index, role);
}
return model()->data(index, role);
}
-QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const {
- QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
+void ChatItem::initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const {
+ Q_ASSERT(layout);
+
+ layout->setText(data(MessageModel::DisplayRole).toString());
QTextOption option;
option.setWrapMode(wrapMode);
QTextOption option;
option.setWrapMode(wrapMode);
@@
-73,33
+71,18
@@
QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignmen
QList<QTextLayout::FormatRange> formatRanges
= QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value<UiStyle::FormatList>(), layout->text().length());
layout->setAdditionalFormats(formatRanges);
QList<QTextLayout::FormatRange> formatRanges
= QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value<UiStyle::FormatList>(), layout->text().length());
layout->setAdditionalFormats(formatRanges);
- return layout;
}
}
-void ChatItem::doLayout() {
- QTextLayout *layout_ = layout();
- layout_->beginLayout();
- QTextLine line = layout_->createLine();
+void ChatItem::doLayout(QTextLayout *layout) const {
+ layout->beginLayout();
+ QTextLine line = layout->createLine();
if(line.isValid()) {
line.setLineWidth(width());
line.setPosition(QPointF(0,0));
}
if(line.isValid()) {
line.setLineWidth(width());
line.setPosition(QPointF(0,0));
}
- layout_->endLayout();
-}
-
-void ChatItem::clearLayout() {
- delete _data;
- _data = 0;
+ layout->endLayout();
}
}
-ChatItemPrivate *ChatItem::privateData() const {
- if(!_data) {
- ChatItem *that = const_cast<ChatItem *>(this);
- that->_data = that->newPrivateData();
- that->doLayout();
- }
- return _data;
-}
// NOTE: This is not the most time-efficient implementation, but it saves space by not caching unnecessary data
// This is a deliberate trade-off. (-> selectFmt creation, data() call)
// NOTE: This is not the most time-efficient implementation, but it saves space by not caching unnecessary data
// This is a deliberate trade-off. (-> selectFmt creation, data() call)
@@
-109,7
+92,11
@@
void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QVector<QTextLayout::FormatRange> formats = additionalFormats();
QTextLayout::FormatRange selectFmt = selectionFormat();
if(selectFmt.format.isValid()) formats.append(selectFmt);
QVector<QTextLayout::FormatRange> formats = additionalFormats();
QTextLayout::FormatRange selectFmt = selectionFormat();
if(selectFmt.format.isValid()) formats.append(selectFmt);
- layout()->draw(painter, QPointF(0,0), formats, boundingRect());
+ QTextLayout layout;
+ initLayout(&layout);
+ layout.draw(painter, QPointF(0,0), formats, boundingRect());
+
+ // layout()->draw(painter, QPointF(0,0), formats, boundingRect());
// Debuging Stuff
// uncomment partially or all of the following stuff:
// Debuging Stuff
// uncomment partially or all of the following stuff:
@@
-142,8
+129,11
@@
void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
qint16 ChatItem::posToCursor(const QPointF &pos) const {
if(pos.y() > height()) return data(MessageModel::DisplayRole).toString().length();
if(pos.y() < 0) return 0;
qint16 ChatItem::posToCursor(const QPointF &pos) const {
if(pos.y() > height()) return data(MessageModel::DisplayRole).toString().length();
if(pos.y() < 0) return 0;
- for(int l = layout()->lineCount() - 1; l >= 0; l--) {
- QTextLine line = layout()->lineAt(l);
+
+ QTextLayout layout;
+ initLayout(&layout);
+ for(int l = layout.lineCount() - 1; l >= 0; l--) {
+ QTextLine line = layout.lineAt(l);
if(pos.y() >= line.y()) {
return line.xToCursor(pos.x(), QTextLine::CursorOnCharacter);
}
if(pos.y() >= line.y()) {
return line.xToCursor(pos.x(), QTextLine::CursorOnCharacter);
}
@@
-238,10
+228,10
@@
QList<QRectF> ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity
searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive);
}
searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive);
}
-
bool hadPrivateData = hasPrivateData()
;
-
+
QTextLayout layout
;
+ initLayout(&layout);
foreach(int idx, indexList) {
foreach(int idx, indexList) {
- QTextLine line = layout
()->
lineForTextPosition(idx);
+ QTextLine line = layout
.
lineForTextPosition(idx);
qreal x = line.cursorToX(idx);
qreal width = line.cursorToX(idx + searchWord.count()) - x;
qreal height = line.height();
qreal x = line.cursorToX(idx);
qreal width = line.cursorToX(idx + searchWord.count()) - x;
qreal height = line.height();
@@
-249,8
+239,6
@@
QList<QRectF> ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity
resultList << QRectF(x, y, width, height);
}
resultList << QRectF(x, y, width, height);
}
- if(!hadPrivateData)
- clearLayout();
return resultList;
}
return resultList;
}
@@
-291,7
+279,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
@@
-299,9
+287,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);
+ GraphicalUi::contextMenuActionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>());
}
// ************************************************************
}
// ************************************************************
@@
-312,7
+300,9
@@
void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
Q_UNUSED(option); Q_UNUSED(widget);
painter->setClipRect(boundingRect()); // no idea why QGraphicsItem clipping won't work
Q_UNUSED(option); Q_UNUSED(widget);
painter->setClipRect(boundingRect()); // no idea why QGraphicsItem clipping won't work
- qreal layoutWidth = layout()->minimumWidth();
+ QTextLayout layout;
+ initLayout(&layout);
+ qreal layoutWidth = layout.minimumWidth();
qreal offset = 0;
if(chatScene()->senderCutoffMode() == ChatScene::CutoffLeft)
offset = qMin(width() - layoutWidth, (qreal)0);
qreal offset = 0;
if(chatScene()->senderCutoffMode() == ChatScene::CutoffLeft)
offset = qMin(width() - layoutWidth, (qreal)0);
@@
-324,10
+314,10
@@
void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
if(layoutWidth > width()) {
// Draw a nice gradient for longer items
// Qt's text drawing with a gradient brush sucks, so we use an alpha-channeled pixmap instead
if(layoutWidth > width()) {
// Draw a nice gradient for longer items
// Qt's text drawing with a gradient brush sucks, so we use an alpha-channeled pixmap instead
- QPixmap pixmap(layout
()->
boundingRect().toRect().size());
+ QPixmap pixmap(layout
.
boundingRect().toRect().size());
pixmap.fill(Qt::transparent);
QPainter pixPainter(&pixmap);
pixmap.fill(Qt::transparent);
QPainter pixPainter(&pixmap);
- layout
()->
draw(&pixPainter, QPointF(qMax(offset, (qreal)0), 0), QVector<QTextLayout::FormatRange>() << selectFmt);
+ layout
.
draw(&pixPainter, QPointF(qMax(offset, (qreal)0), 0), QVector<QTextLayout::FormatRange>() << selectFmt);
pixPainter.end();
// Create alpha channel mask
pixPainter.end();
// Create alpha channel mask
@@
-349,7
+339,7
@@
void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
pixmap.setAlphaChannel(mask);
painter->drawPixmap(0, 0, pixmap);
} else {
pixmap.setAlphaChannel(mask);
painter->drawPixmap(0, 0, pixmap);
} else {
- layout
()->
draw(painter, QPointF(0,0), QVector<QTextLayout::FormatRange>() << selectFmt, boundingRect());
+ layout
.
draw(painter, QPointF(0,0), QVector<QTextLayout::FormatRange>() << selectFmt, boundingRect());
}
}
}
}
@@
-360,7
+350,8
@@
void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
ContentsChatItem::ActionProxy ContentsChatItem::_actionProxy;
ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent)
ContentsChatItem::ActionProxy ContentsChatItem::_actionProxy;
ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent)
- : ChatItem(0, 0, pos, parent)
+ : ChatItem(0, 0, pos, parent),
+ _data(0)
{
const QAbstractItemModel *model_ = model();
QModelIndex index = model_->index(row(), column());
{
const QAbstractItemModel *model_ = model();
QModelIndex index = model_->index(row(), column());
@@
-369,6
+360,18
@@
ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGrap
setGeometryByWidth(width);
}
setGeometryByWidth(width);
}
+ContentsChatItem::~ContentsChatItem() {
+ delete _data;
+}
+
+ContentsChatItemPrivate *ContentsChatItem::privateData() const {
+ if(!_data) {
+ ContentsChatItem *that = const_cast<ContentsChatItem *>(this);
+ that->_data = new ContentsChatItemPrivate(findClickables(), that);
+ }
+ return _data;
+}
+
qreal ContentsChatItem::setGeometryByWidth(qreal w) {
if(w != width()) {
prepareGeometryChange();
qreal ContentsChatItem::setGeometryByWidth(qreal w) {
if(w != width()) {
prepareGeometryChange();
@@
-379,28
+382,30
@@
qreal ContentsChatItem::setGeometryByWidth(qreal w) {
while(finder.nextWrapColumn() > 0)
lines++;
setHeight(lines * fontMetrics()->lineSpacing());
while(finder.nextWrapColumn() > 0)
lines++;
setHeight(lines * fontMetrics()->lineSpacing());
+ delete _data;
+ _data = 0;
}
return height();
}
}
return height();
}
-void ContentsChatItem::doLayout(
)
{
+void ContentsChatItem::doLayout(
QTextLayout *layout) const
{
ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
if(!wrapList.count()) return; // empty chatitem
qreal h = 0;
WrapColumnFinder finder(this);
ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
if(!wrapList.count()) return; // empty chatitem
qreal h = 0;
WrapColumnFinder finder(this);
- layout
()
->beginLayout();
+ layout->beginLayout();
forever {
forever {
- QTextLine line = layout
()
->createLine();
+ QTextLine line = layout->createLine();
if(!line.isValid())
break;
int col = finder.nextWrapColumn();
if(!line.isValid())
break;
int col = finder.nextWrapColumn();
- line.setNumColumns(col >= 0 ? col - line.textStart() : layout
()
->text().length());
+ line.setNumColumns(col >= 0 ? col - line.textStart() : layout->text().length());
line.setPosition(QPointF(0, h));
h += fontMetrics()->lineSpacing();
}
line.setPosition(QPointF(0, h));
h += fontMetrics()->lineSpacing();
}
- layout
()
->endLayout();
+ layout->endLayout();
}
// NOTE: This method is not threadsafe and not reentrant!
}
// NOTE: This method is not threadsafe and not reentrant!
@@
-500,7
+505,7
@@
QVector<QTextLayout::FormatRange> ContentsChatItem::additionalFormats() const {
}
void ContentsChatItem::endHoverMode() {
}
void ContentsChatItem::endHoverMode() {
- if(
hasP
rivateData()) {
+ if(
p
rivateData()) {
if(privateData()->currentClickable.isValid()) {
setCursor(Qt::ArrowCursor);
privateData()->currentClickable = Clickable();
if(privateData()->currentClickable.isValid()) {
setCursor(Qt::ArrowCursor);
privateData()->currentClickable = Clickable();
@@
-598,8
+603,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) {
@@
-613,16
+616,15
@@
void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
foreach(QAction *action, menu->actions())
action->setVisible(false);
QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length);
foreach(QAction *action, menu->actions())
action->setVisible(false);
QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length);
-
Client::mainUi()->a
ctionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>(), name);
+
GraphicalUi::contextMenuA
ctionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>(), name);
break;
}
default:
break;
}
} else {
break;
}
default:
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
);
}
}
}
}
@@
-642,7
+644,9
@@
void ContentsChatItem::showWebPreview(const Clickable &click) {
#ifndef HAVE_WEBKIT
Q_UNUSED(click);
#else
#ifndef HAVE_WEBKIT
Q_UNUSED(click);
#else
- QTextLine line = layout()->lineForTextPosition(click.start);
+ QTextLayout layout;
+ initLayout(&layout);
+ QTextLine line = layout.lineForTextPosition(click.start);
qreal x = line.cursorToX(click.start);
qreal width = line.cursorToX(click.start + click.length) - x;
qreal height = line.height();
qreal x = line.cursorToX(click.start);
qreal width = line.cursorToX(click.start + click.length) - x;
qreal height = line.height();
@@
-666,9
+670,8
@@
void ContentsChatItem::clearWebPreview() {
/*************************************************************************************************/
/*************************************************************************************************/
-ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item)
+ContentsChatItem::WrapColumnFinder::WrapColumnFinder(
const
ChatItem *_item)
: item(_item),
: item(_item),
- layout(0),
wrapList(item->data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>()),
wordidx(0),
lineCount(0),
wrapList(item->data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>()),
wordidx(0),
lineCount(0),
@@
-677,7
+680,6
@@
ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item)
}
ContentsChatItem::WrapColumnFinder::~WrapColumnFinder() {
}
ContentsChatItem::WrapColumnFinder::~WrapColumnFinder() {
- delete layout;
}
qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() {
}
qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() {
@@
-697,10
+699,10
@@
qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() {
// check if we have a very long word that needs inter word wrap
if(wrapList.at(start).endX > targetWidth) {
if(!line.isValid()) {
// check if we have a very long word that needs inter word wrap
if(wrapList.at(start).endX > targetWidth) {
if(!line.isValid()) {
-
layout = item->createLayout(
QTextOption::NoWrap);
- layout
->
beginLayout();
- line = layout
->
createLine();
- layout
->
endLayout();
+
item->initLayoutHelper(&layout,
QTextOption::NoWrap);
+ layout
.
beginLayout();
+ line = layout
.
createLine();
+ layout
.
endLayout();
}
return line.xToCursor(targetWidth, QTextLine::CursorOnCharacter);
}
}
return line.xToCursor(targetWidth, QTextLine::CursorOnCharacter);
}