X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=10ef5d8f7069c143e0b45d47840153097dba77a2;hp=3f9289ce6f49bb060673b8b08a2c85a5c53c48b5;hb=46ddb293c61aeb90295fa1a14be71e8896f34ade;hpb=3d3f7cc562435d32561a13a07dd6b31609b8391d diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 3f9289ce..10ef5d8f 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -32,17 +32,19 @@ #include "columnhandleitem.h" #include "messagefilter.h" #include "qtui.h" -#include "qtuisettings.h" +#include "qtuistyle.h" +#include "chatviewsettings.h" +#include "webpreviewitem.h" const qreal minContentsWidth = 200; -ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject *parent) - : QGraphicsScene(parent), +ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent) + : QGraphicsScene(0, 0, width, 0, parent), _idString(idString), - _width(0), - _height(0), _model(model), _singleBufferScene(false), + _sceneRect(0, 0, width, 0), + _viewportHeight(0), _selectingItem(0), _selectionStart(-1), _isSelecting(false), @@ -53,43 +55,35 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject _singleBufferScene = filter->isSingleBufferFilter(); } - connect(this, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(rectChanged(const QRectF &))); + ChatViewSettings defaultSettings; + int defaultFirstColHandlePos = defaultSettings.value("FirstColumnHandlePos", 80).toInt(); + int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt(); - connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(rowsInserted(const QModelIndex &, int, int))); - connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), - this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int))); - - for(int i = 0; i < model->rowCount(); i++) { - ChatLine *line = new ChatLine(i, model); - _lines.append(line); - addItem(line); - } - - QtUiSettings s; - int defaultFirstColHandlePos = s.value("ChatView/DefaultFirstColumnHandlePos", 80).toInt(); - int defaultSecondColHandlePos = s.value("ChatView/DefaultSecondColumnHandlePos", 200).toInt(); - - firstColHandlePos = s.value(QString("ChatView/%1/FirstColumnHandlePos").arg(_idString), - defaultFirstColHandlePos).toInt(); - secondColHandlePos = s.value(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString), - defaultSecondColHandlePos).toInt(); + ChatViewSettings viewSettings(this); + firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt(); + secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt(); firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator()); addItem(firstColHandle); + firstColHandle->setXPos(firstColHandlePos); + connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), firstColHandle, SLOT(sceneRectChanged(const QRectF &))); secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); addItem(secondColHandle); - - connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + secondColHandle->setXPos(secondColHandlePos); connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), secondColHandle, SLOT(sceneRectChanged(const QRectF &))); - firstColHandle->setXPos(firstColHandlePos); - firstColHandle->setXLimits(0, secondColHandlePos); - secondColHandle->setXPos(secondColHandlePos); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); + setHandleXLimits(); - emit heightChanged(height()); + connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + this, SLOT(rowsInserted(const QModelIndex &, int, int))); + connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), + this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int))); + + if(model->rowCount() > 0) + rowsInserted(QModelIndex(), 0, model->rowCount() - 1); } ChatScene::~ChatScene() { @@ -97,23 +91,47 @@ ChatScene::~ChatScene() { void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { Q_UNUSED(index); - // maybe make this more efficient by prepending stuff with negative yval - // dunno if that's worth not guranteeing that 0 is on the top... - // TODO bulk inserts, iterators + + clearWebPreview(); + +// QModelIndex sidx = model()->index(start, 0); +// QModelIndex eidx = model()->index(end, 0); +// qDebug() << "rowsInserted" << start << end << "-" << sidx.data(MessageModel::MsgIdRole).value() << eidx.data(MessageModel::MsgIdRole).value(); + qreal h = 0; - qreal y = 0; - if(_width && start > 0) - y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height(); + qreal y = _sceneRect.y(); + qreal width = _sceneRect.width(); + bool atTop = true; + bool atBottom = false; + bool moveTop = false; + + if(start > 0 && start < _lines.count()) { + y = _lines.value(start)->y(); + atTop = false; + } + if(start == _lines.count()) { + y = _sceneRect.bottom(); + atTop = false; + atBottom = true; + } + + qreal contentsWidth = width - secondColumnHandle()->sceneRight(); + qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight(); + qreal timestampWidth = firstColumnHandle()->sceneLeft(); + QPointF contentsPos(secondColumnHandle()->sceneRight(), 0); + QPointF senderPos(firstColumnHandle()->sceneRight(), 0); for(int i = start; i <= end; i++) { - ChatLine *line = new ChatLine(i, model()); + ChatLine *line = new ChatLine(i, model(), + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); + line->setPos(0, y+h); + h += line->height(); _lines.insert(i, line); addItem(line); - if(_width > 0) { - line->setPos(0, y+h); - h += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); - } } + // update existing items for(int i = end+1; i < _lines.count(); i++) { _lines[i]->setRow(i); @@ -128,21 +146,50 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(_lastSelectionRow >= start) _lastSelectionRow += offset; } - if(h > 0) { - _height += h; - for(int i = end+1; i < _lines.count(); i++) { - _lines.at(i)->moveBy(0, h); + // neither pre- or append means we have to do dirty work: move items... + if(!(atTop || atBottom)) { + qreal offset = h; + int moveStart = 0; + int moveEnd = _lines.count() - 1; + // move top means: moving 0 to end (aka: end + 1) + // move top means: moving end + 1 to _lines.count() - 1 (aka: _lines.count() - (end + 1) + if(end + 1 < _lines.count() - end - 1) { + // move top part + moveTop = true; + offset = -offset; + moveEnd = end; + } else { + // move bottom part + moveStart = start; } - setSceneRect(QRectF(0, 0, _width, _height)); - emit heightChanged(_height); + ChatLine *line = 0; + for(int i = moveStart; i <= moveEnd; i++) { + line = _lines.at(i); + line->setPos(0, line->pos().y() + offset); + } + } + + // update sceneRect + if(atTop || moveTop) { + updateSceneRect(_sceneRect.adjusted(0, -h, 0, 0)); + } else { + updateSceneRect(_sceneRect.adjusted(0, 0, 0, h)); + emit lastLineChanged(_lines.last()); } + } void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { Q_UNUSED(parent); + clearWebPreview(); + qreal h = 0; // total height of removed items; + bool atTop = (start == 0); + bool atBottom = (end == _lines.count() - 1); + bool moveTop = false; + // remove items from scene QList::iterator lineIter = _lines.begin() + start; int lineCount = start; @@ -171,33 +218,86 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e _lastSelectionRow -= offset; } - // reposition remaining chatlines - if(h > 0) { - Q_ASSERT(_height >= h); - _height -= h; - for(int i = start; i < _lines.count(); i++) { - _lines.at(i)->moveBy(0, -h); + // neither removing at bottom or top means we have to move items... + if(!(atTop || atBottom)) { + qreal offset = h; + int moveStart = 0; + int moveEnd = _lines.count() - 1; + if(start < _lines.count() - start) { + // move top part + moveTop = true; + moveEnd = start - 1; + } else { + // move bottom part + moveStart = start; + offset = -offset; + } + ChatLine *line = 0; + for(int i = moveStart; i <= moveEnd; i++) { + line = _lines.at(i); + line->setPos(0, line->pos().y() + offset); } - setSceneRect(QRectF(0, 0, _width, _height)); - emit heightChanged(_height); } -} -void ChatScene::setWidth(qreal w) { - _width = w; - _height = 0; - foreach(ChatLine *line, _lines) { - line->setPos(0, _height); - _height += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); + // update sceneRect + if(atTop || moveTop) { + updateSceneRect(_sceneRect.adjusted(0, h, 0, 0)); + } else { + updateSceneRect(_sceneRect.adjusted(0, 0, 0, -h)); } - setSceneRect(QRectF(0, 0, w, _height)); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); - emit heightChanged(_height); } -void ChatScene::rectChanged(const QRectF &rect) { - firstColHandle->sceneRectChanged(rect); - secondColHandle->sceneRectChanged(rect); +void ChatScene::updateForViewport(qreal width, qreal height) { + _viewportHeight = height; + setWidth(width); +} + +// setWidth is used for 2 things: +// a) updating the scene to fit the width of the corresponding view +// b) to update the positions of the items if a columhandle has changed it's position +// forceReposition is true in the second case +// this method features some codeduplication for the sake of performance +void ChatScene::setWidth(qreal width, bool forceReposition) { + if(width == _sceneRect.width() && !forceReposition) + return; + +// clock_t startT = clock(); + + qreal linePos = _sceneRect.y() + _sceneRect.height(); + qreal yBottom = linePos; + QList::iterator lineIter = _lines.end(); + QList::iterator lineIterBegin = _lines.begin(); + ChatLine *line = 0; + qreal lineHeight = 0; + qreal contentsWidth = width - secondColumnHandle()->sceneRight(); + + if(forceReposition) { + qreal timestampWidth = firstColumnHandle()->sceneLeft(); + qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight(); + QPointF senderPos(firstColumnHandle()->sceneRight(), 0); + QPointF contentsPos(secondColumnHandle()->sceneRight(), 0); + while(lineIter != lineIterBegin) { + lineIter--; + line = *lineIter; + lineHeight = line->setColumns(timestampWidth, senderWidth, contentsWidth, senderPos, contentsPos); + linePos -= lineHeight; + line->setPos(0, linePos); + } + } else { + while(lineIter != lineIterBegin) { + lineIter--; + line = *lineIter; + lineHeight = line->setGeometryByWidth(width, contentsWidth); + linePos -= lineHeight; + line->setPos(0, linePos); + } + } + + updateSceneRect(QRectF(0, linePos, width, yBottom - linePos)); + setHandleXLimits(); + +// clock_t endT = clock(); +// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; } void ChatScene::handlePositionChanged(qreal xpos) { @@ -210,16 +310,24 @@ void ChatScene::handlePositionChanged(qreal xpos) { oldx = secondColHandlePos; secondColHandlePos = xpos; } - QtUiSettings s; - s.setValue(QString("ChatView/%1/FirstColumnHandlePos").arg(_idString), firstColHandlePos); - s.setValue(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString), secondColHandlePos); - s.setValue(QString("ChatView/DefaultFirstColumnHandlePos"), firstColHandlePos); - s.setValue(QString("ChatView/DefaultSecondColumnHandlePos"), secondColHandlePos); - setWidth(width()); // readjust all chatlines + ChatViewSettings viewSettings(this); + viewSettings.setValue("FirstColumnHandlePos", firstColHandlePos); + viewSettings.setValue("SecondColumnHandlePos", secondColHandlePos); + + ChatViewSettings defaultSettings; + defaultSettings.setValue("FirstColumnHandlePos", firstColHandlePos); + defaultSettings.setValue("SecondColumnHandlePos", secondColHandlePos); + + setWidth(width(), true); // readjust all chatlines // we get ugly redraw errors if we don't update this explicitly... :( // width() should be the same for both handles, so just use firstColHandle regardless - update(qMin(oldx, xpos) - firstColHandle->width()/2, 0, qMax(oldx, xpos) + firstColHandle->width()/2, height()); + //update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height()); +} + +void ChatScene::setHandleXLimits() { + firstColHandle->setXLimits(0, secondColHandle->sceneLeft()); + secondColHandle->setXLimits(firstColHandle->sceneRight(), width() - minContentsWidth); } void ChatScene::setSelectingItem(ChatItem *item) { @@ -238,12 +346,12 @@ void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) { void ChatScene::updateSelection(const QPointF &pos) { // This is somewhat hacky... we look at the contents item that is at the cursor's y position (ignoring x), since // it has the full height. From this item, we can then determine the row index and hence the ChatLine. - ChatItem *contentItem = static_cast(itemAt(QPointF(secondColHandlePos + secondColHandle->width()/2, pos.y()))); + ChatItem *contentItem = static_cast(itemAt(QPointF(secondColHandle->sceneRight() + 1, pos.y()))); if(!contentItem) return; int curRow = contentItem->row(); int curColumn; - if(pos.x() > secondColHandlePos + secondColHandle->width()/2) curColumn = ChatLineModel::ContentsColumn; + if(pos.x() > secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn; else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn; else curColumn = ChatLineModel::TimestampColumn; @@ -351,7 +459,7 @@ QString ChatScene::selectionToString() const { } void ChatScene::requestBacklog() { - static const int REQUEST_COUNT = 50; + static const int REQUEST_COUNT = 500; int backlogSize = model()->rowCount(); if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) { QModelIndex msgIdx = model()->index(0, 0); @@ -363,10 +471,67 @@ void ChatScene::requestBacklog() { } int ChatScene::sectionByScenePos(int x) { - if(x < firstColHandlePos) + if(x < firstColHandle->x()) return ChatLineModel::TimestampColumn; - if(x < secondColHandlePos) + if(x < secondColHandle->x()) return ChatLineModel::SenderColumn; return ChatLineModel::ContentsColumn; } + +void ChatScene::updateSceneRect(const QRectF &rect) { + _sceneRect = rect; + setSceneRect(rect); +} + + +void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) { +#ifndef HAVE_WEBKIT + Q_UNUSED(parentItem) + Q_UNUSED(url) + Q_UNUSED(urlRect) +#else + if(webPreview.parentItem != parentItem) + webPreview.parentItem = parentItem; + + if(webPreview.url != url) { + webPreview.url = url; + // load a new web view and delete the old one (if exists) + if(webPreview.previewItem) { + removeItem(webPreview.previewItem); + delete webPreview.previewItem; + } + webPreview.previewItem = new WebPreviewItem(url); + addItem(webPreview.previewItem); + } + if(webPreview.urlRect != urlRect) { + webPreview.urlRect = urlRect; + qreal previewY = urlRect.bottom(); + qreal previewX = urlRect.x(); + if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom()) + previewY = urlRect.y() - webPreview.previewItem->boundingRect().height(); + + if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width()) + previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width(); + + webPreview.previewItem->setPos(previewX, previewY); + } +#endif +} + +void ChatScene::clearWebPreview(ChatItem *parentItem) { +#ifndef HAVE_WEBKIT + Q_UNUSED(parentItem) +#else + if(parentItem == 0 || webPreview.parentItem == parentItem) { + if(webPreview.previewItem) { + removeItem(webPreview.previewItem); + delete webPreview.previewItem; + webPreview.previewItem = 0; + } + webPreview.parentItem = 0; + webPreview.url = QString(); + webPreview.urlRect = QRectF(); + } +#endif +}