X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=276c73eda52bc73afe36d137ff139ea8d6386408;hp=5f03d9d09a74b52cf363cecbb38c9b10c2913c76;hb=236dda81632fa792e788d45b0f4f31b973823f7f;hpb=8301c4e1ac95ae0462f91cc0e4a90ba2efa5cc45 diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index 5f03d9d0..276c73ed 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,90 +23,172 @@ #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); - - _timestampItem->setPos(0,0); - _width = _height = 0; - _selection = 0; - - if(_contentsItem->data(MessageModel::FlagsRole).toInt() & Message::Highlight) setHighlighted(true); +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); + setZValue(0); + setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight); } -ChatLine::~ChatLine() { - delete _timestampItem; - delete _senderItem; - delete _contentsItem; +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 *(ChatItem *)0; // provoke an error + } } -QRectF ChatLine::boundingRect () const { - //return childrenBoundingRect(); - return QRectF(0, 0, _width, _height); +// NOTE: senderPos is in ChatLines coordinate system! +void ChatLine::setFirstColumn(const qreal ×tampWidth, const qreal &senderWidth, const QPointF &senderPos) { + _timestampItem.prepareGeometryChange(); + _timestampItem.setGeometry(timestampWidth, _height); + // senderItem doesn't need a geom change as it's Pos is changed (ensured by void ChatScene::firstHandlePositionChanged(qreal xpos)) + _senderItem.setGeometry(senderWidth, _height); + _senderItem.setPos(senderPos); + + _timestampItem.clearLayout(); + _senderItem.clearLayout(); } -ChatItem *ChatLine::item(ChatLineModel::ColumnType column) const { - switch(column) { - case ChatLineModel::TimestampColumn: return _timestampItem; - case ChatLineModel::SenderColumn: return _senderItem; - case ChatLineModel::ContentsColumn: return _contentsItem; - default: return 0; +// NOTE: contentsPos is in ChatLines coordinate system! +void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWidth, + const QPointF &contentsPos, qreal &linePos) { + // contentsItem doesn't need a geom change as it's Pos is changed (ensured by void ChatScene::firstHandlePositionChanged(qreal xpos)) + qreal height = _contentsItem.setGeometryByWidth(contentsWidth); + linePos -= height; + bool needGeometryChange = linePos == pos().y(); + + if(needGeometryChange) { + _timestampItem.prepareGeometryChange(); + _senderItem.prepareGeometryChange(); } + _timestampItem.setHeight(height); + _senderItem.setGeometry(senderWidth, height); + + _contentsItem.setPos(contentsPos); + + _senderItem.clearLayout(); + _contentsItem.clearLayout(); + + if(needGeometryChange) + prepareGeometryChange(); + + _height = height; + + setPos(0, linePos); } -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; +void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth, qreal &linePos) { + qreal height = _contentsItem.setGeometryByWidth(contentsWidth); + linePos -= height; + bool needGeometryChange = linePos == pos().y(); - _timestampItem->setWidth(firstHandlePos - firstsep); - _senderItem->setWidth(secondHandlePos - firstHandlePos - (firstsep+secondsep)); - _height = _contentsItem->setWidth(width - secondHandlePos - secondsep); + if(needGeometryChange) { + _timestampItem.prepareGeometryChange(); + _senderItem.prepareGeometryChange(); + } + _timestampItem.setHeight(height); + _senderItem.setHeight(height); + _contentsItem.clearLayout(); - _senderItem->setPos(firstHandlePos + firstsep, 0); - _contentsItem->setPos(secondHandlePos + secondsep, 0); + if(needGeometryChange) + prepareGeometryChange(); + _height = height; _width = width; - return _height; + + setPos(0, linePos); // set pos is _very_ cheap if nothing changes. } void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) { if(selected) { - quint8 sel = (_selection & 0x80) | 0x40 | minColumn; + quint8 sel = (_selection & Highlighted) | Selected | 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; + quint8 sel = _selection & Highlighted; 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(); } } } void ChatLine::setHighlighted(bool highlighted) { - if(highlighted) _selection |= 0x80; - else _selection &= 0x7f; + if(highlighted) _selection |= Highlighted; + else _selection &= ~Highlighted; update(); } 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 & ItemMask)).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 && chatScene()->isSingleBufferScene()) { + QModelIndex prevRowIdx = model_->index(row() - 1, 0); + MsgId prevMsgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value(); + QModelIndex myIdx = model_->index(row(), 0); + MsgId myMsgId = model_->data(myIdx, MessageModel::MsgIdRole).value(); + Message::Flags flags = (Message::Flags)model_->data(myIdx, MessageModel::FlagsRole).toInt(); + // don't show the marker if we wrote that new line + if(!(flags & Message::Self)) { + BufferId bufferId = BufferId(chatScene()->idString().toInt()); + MsgId lastSeenMsgId = Client::networkModel()->lastSeenMarkerMsgId(bufferId); + if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) { + QtUiStyleSettings s("Colors"); + QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing()); + gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value()); + gradient.setColorAt(0.1, Qt::transparent); + painter->fillRect(boundingRect(), gradient); + } + } + } }