X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=df218a51ae9d9e73a1e9708a54bcaa29a0cdbb6f;hb=429f2aad1e22ba8410f4ea63471fcfc9887c55aa;hp=65d68bfa3aea27cf3234906c0a8b8226ef409e9d;hpb=fc88dd167d0d838ca28c447279b3cc3c34e1ab43;p=quassel.git diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index 65d68bfa..df218a51 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -23,24 +23,51 @@ #include #include "bufferinfo.h" +#include "buffersyncer.h" +#include "client.h" #include "chatitem.h" #include "chatline.h" +#include "columnhandleitem.h" +#include "messagemodel.h" +#include "networkmodel.h" #include "qtui.h" +#include "qtuisettings.h" +#include "qtuistyle.h" -ChatLine::ChatLine(const QModelIndex &index, QGraphicsItem *parent) : QGraphicsItem(parent) { - _timestampItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::TimestampColumn)), this); - _senderItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::SenderColumn)), this); - _contentsItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::ContentsColumn)), this); +// ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent) +// : QGraphicsItem(parent), +// _row(row), // needs to be set before the items +// _model(model), +// _contentsItem(this), +// _senderItem(this), +// _timestampItem(this), +// _width(0), +// _height(0), +// _selection(0) +// { +// Q_ASSERT(model); +// QModelIndex index = model->index(row, ChatLineModel::ContentsColumn); +// setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight); +// } - _timestampItem->setPos(0,0); - _width = _height = 0; - _selection = 0; -} - -ChatLine::~ChatLine() { - delete _timestampItem; - delete _senderItem; - delete _contentsItem; +ChatLine::ChatLine(int row, QAbstractItemModel *model, + const qreal &width, + const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, + const QPointF &senderPos, const QPointF &contentsPos, + QGraphicsItem *parent) + : QGraphicsItem(parent), + _row(row), // needs to be set before the items + _model(model), + _contentsItem(contentsWidth, contentsPos, this), + _senderItem(senderWidth, _contentsItem.height(), senderPos, this), + _timestampItem(timestampWidth, _contentsItem.height(), this), + _width(width), + _height(_contentsItem.height()), + _selection(0) +{ + Q_ASSERT(model); + QModelIndex index = model->index(row, ChatLineModel::ContentsColumn); + setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight); } QRectF ChatLine::boundingRect () const { @@ -48,26 +75,65 @@ QRectF ChatLine::boundingRect () const { return QRectF(0, 0, _width, _height); } -ChatItem *ChatLine::item(ChatLineModel::ColumnType column) const { +ChatItem &ChatLine::item(ChatLineModel::ColumnType column) { switch(column) { - case ChatLineModel::TimestampColumn: return _timestampItem; - case ChatLineModel::SenderColumn: return _senderItem; - case ChatLineModel::ContentsColumn: return _contentsItem; - default: return 0; + case ChatLineModel::TimestampColumn: + return _timestampItem; + case ChatLineModel::SenderColumn: + return _senderItem; + case ChatLineModel::ContentsColumn: + return _contentsItem; + default: + return *(ChatItem *)0; // provoke an error } } -qreal ChatLine::setGeometry(qreal width, qreal firstHandlePos, qreal secondHandlePos) { - if(width != _width) prepareGeometryChange(); - qreal firstsep = QtUi::style()->firstColumnSeparator()/2; - qreal secondsep = QtUi::style()->secondColumnSeparator()/2; +// WARNING: setColumns should not be used without either: +// a) calling prepareGeometryChange() immediately before setColumns() +// b) calling Chatline::setPos() immediately afterwards +// +// NOTE: senderPos and contentsPos are in ChatLines coordinate system! +qreal ChatLine::setColumns(const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, + const QPointF &senderPos, const QPointF &contentsPos) { + _height = _contentsItem.setGeometryByWidth(contentsWidth); + _senderItem.setGeometry(senderWidth, _height); + _timestampItem.setGeometry(timestampWidth, _height); + + _senderItem.setPos(senderPos); + _contentsItem.setPos(contentsPos); + + _contentsItem.clearLayout(); + _senderItem.clearLayout(); + _timestampItem.clearLayout(); + + return _height; +} + +// WARNING: setGeometryByWidth should not be used without either: +// a) calling prepareGeometryChange() immediately before setColumns() +// b) calling Chatline::setPos() immediately afterwards +qreal ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth) { + _width = width; + _height = _contentsItem.setGeometryByWidth(contentsWidth); + _timestampItem.setHeight(_height); + _senderItem.setHeight(_height); + _contentsItem.clearLayout(); + return _height; +} + +qreal ChatLine::setGeometryByWidth(qreal width) { + if(width != _width) + prepareGeometryChange(); - _timestampItem->setWidth(firstHandlePos - firstsep); - _senderItem->setWidth(secondHandlePos - firstHandlePos - (firstsep+secondsep)); - _height = _contentsItem->setWidth(width - secondHandlePos - secondsep); + ColumnHandleItem *firstColumnHandle = chatScene()->firstColumnHandle(); + ColumnHandleItem *secondColumnHandle = chatScene()->secondColumnHandle(); - _senderItem->setPos(firstHandlePos + firstsep, 0); - _contentsItem->setPos(secondHandlePos + secondsep, 0); + _height = _contentsItem.setGeometryByWidth(width - secondColumnHandle->sceneRight()); + _timestampItem.setGeometry(firstColumnHandle->sceneLeft(), _height); + _senderItem.setGeometry(secondColumnHandle->sceneLeft() - firstColumnHandle->sceneRight(), _height); + + _senderItem.setPos(firstColumnHandle->sceneRight(), 0); + _contentsItem.setPos(secondColumnHandle->sceneRight(), 0); _width = width; return _height; @@ -78,15 +144,18 @@ void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) { quint8 sel = (_selection & 0x80) | 0x40 | minColumn; if(sel != _selection) { _selection = sel; - for(int i = 0; i < minColumn; i++) item((ChatLineModel::ColumnType)i)->clearSelection(); - for(int i = minColumn; i <= ChatLineModel::ContentsColumn; i++) item((ChatLineModel::ColumnType)i)->setFullSelection(); + for(int i = 0; i < minColumn; i++) + item((ChatLineModel::ColumnType)i).clearSelection(); + for(int i = minColumn; i <= ChatLineModel::ContentsColumn; i++) + item((ChatLineModel::ColumnType)i).setFullSelection(); update(); } } else { quint8 sel = _selection & 0x80; if(sel != _selection) { _selection = sel; - for(int i = 0; i <= ChatLineModel::ContentsColumn; i++) item((ChatLineModel::ColumnType)i)->clearSelection(); + for(int i = 0; i <= ChatLineModel::ContentsColumn; i++) + item((ChatLineModel::ColumnType)i).clearSelection(); update(); } } @@ -99,12 +168,33 @@ void ChatLine::setHighlighted(bool highlighted) { } void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + Q_UNUSED(option); + Q_UNUSED(widget); if(_selection & Highlighted) { painter->fillRect(boundingRect(), QBrush(QtUi::style()->highlightColor())); } if(_selection & Selected) { - qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f))->x(); + qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f)).x(); QRectF selectRect(left, 0, width() - left, height()); painter->fillRect(selectRect, QApplication::palette().brush(QPalette::Highlight)); } + + // new line marker + const QAbstractItemModel *model_ = model(); + if(model_ && row() > 0) { + QModelIndex prevRowIdx = model_->index(row() - 1, 0); + MsgId msgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value(); + Message::Flags flags = (Message::Flags)model_->data(model_->index(row(), 0), MessageModel::FlagsRole).toInt(); + // don't show the marker if we wrote that new line + if(!(flags & Message::Self)) { + BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value(); + if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) { + QtUiStyleSettings s("Colors"); + QLinearGradient gradient(0, 0, 0, height()); + gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value()); + gradient.setColorAt(0.1, Qt::transparent); + painter->fillRect(boundingRect(), gradient); + } + } + } }