X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=ff28ea4a6eea050edd2c6be66e93670e27ef741e;hp=03c0e5f9b68bab103dffc347824b209b161ae8e2;hb=80fcc77b8883ef496fcf0ee9b43cf678232e175c;hpb=2749b14904e18f1de05be66ccc1ebdadd57e838f diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 03c0e5f9..ff28ea4a 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "chatitem.h" #include "chatline.h" @@ -32,7 +33,9 @@ #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; @@ -41,6 +44,9 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _idString(idString), _model(model), _singleBufferScene(false), + _sceneRect(0, 0, width, 0), + _firstLineRow(-1), + _viewportHeight(0), _selectingItem(0), _selectionStart(-1), _isSelecting(false), @@ -51,26 +57,25 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _singleBufferScene = filter->isSingleBufferFilter(); } - QtUiSettings s; - int defaultFirstColHandlePos = s.value("ChatView/DefaultFirstColumnHandlePos", 80).toInt(); - int defaultSecondColHandlePos = s.value("ChatView/DefaultSecondColumnHandlePos", 200).toInt(); + ChatViewSettings defaultSettings; + int defaultFirstColHandlePos = defaultSettings.value("FirstColumnHandlePos", 80).toInt(); + int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 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 &))); + _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); - secondColHandle->setXPos(secondColHandlePos); - connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); - connect(this, SIGNAL(sceneRectChanged(const QRectF &)), secondColHandle, SLOT(sceneRectChanged(const QRectF &))); + _secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); + addItem(_secondColHandle); + _secondColHandle->setXPos(_secondColHandlePos); + connect(_secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _secondColHandle, SLOT(sceneRectChanged(const QRectF &))); setHandleXLimits(); @@ -81,6 +86,13 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w if(model->rowCount() > 0) rowsInserted(QModelIndex(), 0, model->rowCount() - 1); + +#ifdef HAVE_WEBKIT + webPreview.delayTimer.setSingleShot(true); + connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent())); + webPreview.deleteTimer.setInterval(600000); + connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent())); +#endif } ChatScene::~ChatScene() { @@ -88,33 +100,54 @@ ChatScene::~ChatScene() { void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { Q_UNUSED(index); +// 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 = sceneRect().y(); - qreal width = sceneRect().width(); + qreal y = _sceneRect.y(); + qreal width = _sceneRect.width(); bool atTop = true; bool atBottom = false; bool moveTop = false; - bool hasWidth = (width != 0); - if(start > 0) { - y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height(); + if(start > 0 && start < _lines.count()) { + y = _lines.value(start)->y(); atTop = false; } - if(start == _lines.count()) + if(start == _lines.count()) { + y = _sceneRect.bottom(); + atTop = false; atBottom = true; + } - for(int i = end; i >= start; i--) { - ChatLine *line = new ChatLine(i, model()); - _lines.insert(start, line); - addItem(line); - if(hasWidth) { - if(atTop) { - h -= line->setGeometry(width); - line->setPos(0, y+h); - } else { - line->setPos(0, y+h); - h += line->setGeometry(width); - } + 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); + + if(atTop) { + for(int i = end; i >= start; i--) { + ChatLine *line = new ChatLine(i, model(), + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); + h += line->height(); + line->setPos(0, y-h); + _lines.insert(start, line); + addItem(line); + } + } else { + for(int i = start; i <= end; i++) { + 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); } } @@ -137,30 +170,42 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { qreal offset = h; int moveStart = 0; int moveEnd = _lines.count() - 1; - ChatLine *line = 0; - if(end > _lines.count() - end) { + // 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; + moveStart = end + 1; } + 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) { - setSceneRect(sceneRect().adjusted(0, h, 0, 0)); - } else { - setSceneRect(sceneRect().adjusted(0, 0, 0, h)); - emit sceneHeightChanged(h); - } + // check if all went right + Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y()); + Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y()); + + if(!atBottom) { + if(start < _firstLineRow) { + int prevFirstLineRow = _firstLineRow + (end - start + 1); + for(int i = end + 1; i < prevFirstLineRow; i++) { + _lines.at(i)->show(); + } + } + // force new search for first proper line + _firstLineRow = -1; + } + updateSceneRect(); + if(atBottom || (!atTop && !moveTop)) { + emit lastLineChanged(_lines.last(), h); + } } void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { @@ -205,8 +250,7 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e qreal offset = h; int moveStart = 0; int moveEnd = _lines.count() - 1; - ChatLine *line = 0; - if(start > _lines.count() - end) { + if(start < _lines.count() - start) { // move top part moveTop = true; moveEnd = start - 1; @@ -215,69 +259,122 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e 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); } } + Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y()); + Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y()); + // update sceneRect - if(atTop || moveTop) { - setSceneRect(sceneRect().adjusted(0, h, 0, 0)); - } else { - setSceneRect(sceneRect().adjusted(0, 0, 0, -h)); - } + // when searching for the first non-date-line we have to take into account that our + // model still contains the just removed lines so we cannot simply call updateSceneRect() + int numRows = model()->rowCount(); + QModelIndex firstLineIdx; + _firstLineRow = -1; + bool needOffset = false; + do { + _firstLineRow++; + if(_firstLineRow >= start && _firstLineRow <= end) { + _firstLineRow = end + 1; + needOffset = true; + } + firstLineIdx = model()->index(_firstLineRow, 0); + } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && _firstLineRow < numRows); + + if(needOffset) + _firstLineRow -= end - start + 1; + updateSceneRect(); +} +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) + if(width == _sceneRect.width() && !forceReposition) return; - qreal oldHeight = sceneRect().height(); - qreal y = sceneRect().y(); - qreal linePos = y; - - foreach(ChatLine *line, _lines) { - line->setPos(0, linePos); - linePos += line->setGeometry(width); +// clock_t startT = clock(); + + // disabling the index while doing this complex updates is about + // 2 to 10 times faster! + setItemIndexMethod(QGraphicsScene::NoIndex); + + qreal linePos = _sceneRect.y() + _sceneRect.height(); + 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); + } } + setItemIndexMethod(QGraphicsScene::BspTreeIndex); - qreal height = linePos - y; - - setSceneRect(QRectF(0, y, width, height)); + updateSceneRect(width); setHandleXLimits(); - qreal dh = height - oldHeight; - if(dh > 0) - emit sceneHeightChanged(dh); +// clock_t endT = clock(); +// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; } void ChatScene::handlePositionChanged(qreal xpos) { - bool first = (sender() == firstColHandle); + bool first = (sender() == _firstColHandle); qreal oldx; if(first) { - oldx = firstColHandlePos; - firstColHandlePos = xpos; + oldx = _firstColHandlePos; + _firstColHandlePos = xpos; } else { - oldx = secondColHandlePos; - secondColHandlePos = 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); + + 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 + // width() should be the same for both handles, so just use _firstColHandle regardless //update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height()); } void ChatScene::setHandleXLimits() { - firstColHandle->setXLimits(0, secondColumnHandleRect().left()); - secondColHandle->setXLimits(firstColumnHandleRect().right(), width() - minContentsWidth); + _firstColHandle->setXLimits(0, _secondColHandle->sceneLeft()); + _secondColHandle->setXLimits(_firstColHandle->sceneRight(), width() - minContentsWidth); } void ChatScene::setSelectingItem(ChatItem *item) { @@ -296,13 +393,13 @@ 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(secondColumnHandleRect().right() + 1, 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() > secondColumnHandleRect().right()) curColumn = ChatLineModel::ContentsColumn; - else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn; + if(pos.x() > _secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn; + else if(pos.x() > _firstColHandlePos) curColumn = ChatLineModel::SenderColumn; else curColumn = ChatLineModel::TimestampColumn; ChatLineModel::ColumnType minColumn = (ChatLineModel::ColumnType)qMin(curColumn, _selectionStartCol); @@ -409,10 +506,13 @@ 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); + while((Message::Type)(model()->data(msgIdx, ChatLineModel::TypeRole).toInt()) == Message::DayChange) { + msgIdx = msgIdx.sibling(msgIdx.row() + 1, 0); + } MsgId msgId = model()->data(msgIdx, ChatLineModel::MsgIdRole).value(); BufferId bufferId = model()->data(msgIdx, ChatLineModel::BufferIdRole).value(); _lastBacklogSize = backlogSize; @@ -421,10 +521,130 @@ void ChatScene::requestBacklog() { } int ChatScene::sectionByScenePos(int x) { - if(x < firstColHandle->x()) + if(x < _firstColHandle->x()) return ChatLineModel::TimestampColumn; - if(x < secondColHandle->x()) + if(x < _secondColHandle->x()) return ChatLineModel::SenderColumn; return ChatLineModel::ContentsColumn; } + +void ChatScene::updateSceneRect() { + if(_lines.isEmpty()) { + updateSceneRect(QRectF(0, 0, _sceneRect.width(), 0)); + return; + } + + // we hide day change messages at the top by making the scene rect smaller + // and by calling QGraphicsItem::hide() on all leading day change messages + // the first one is needed to ensure proper scrollbar ranges + // the second for cases where the viewport is larger then the set scenerect + // (in this case the items are shown anyways) + if(_firstLineRow == -1) { + int numRows = model()->rowCount(); + _firstLineRow = 0; + QModelIndex firstLineIdx; + while(_firstLineRow < numRows) { + firstLineIdx = model()->index(_firstLineRow, 0); + if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange) + break; + _lines.at(_firstLineRow)->hide(); + _firstLineRow++; + } + } + + // the following call should be safe. If it crashes something went wrong during insert/remove + ChatLine *firstLine = _lines.at(_firstLineRow); + ChatLine *lastLine = _lines.last(); + updateSceneRect(QRectF(0, firstLine->pos().y(), _sceneRect.width(), lastLine->pos().y() + lastLine->height() - firstLine->pos().y())); +} + +void ChatScene::updateSceneRect(qreal width) { + _sceneRect.setWidth(width); + updateSceneRect(); +} + +void ChatScene::updateSceneRect(const QRectF &rect) { + _sceneRect = rect; + setSceneRect(rect); + update(); +} + +void ChatScene::customEvent(QEvent *event) { + switch(event->type()) { + default: + return; + } +} + +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 && webPreview.previewItem->scene()) { + removeItem(webPreview.previewItem); + delete webPreview.previewItem; + } + webPreview.previewItem = new WebPreviewItem(url); + webPreview.delayTimer.start(2000); + webPreview.deleteTimer.stop(); + } else if(webPreview.previewItem && !webPreview.previewItem->scene()) { + // we just have to readd the item to the scene + webPreview.delayTimer.start(2000); + webPreview.deleteTimer.stop(); + } + 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::showWebPreviewEvent() { +#ifdef HAVE_WEBKIT + if(webPreview.previewItem) + addItem(webPreview.previewItem); +#endif +} + +void ChatScene::clearWebPreview(ChatItem *parentItem) { +#ifndef HAVE_WEBKIT + Q_UNUSED(parentItem) +#else + if(parentItem == 0 || webPreview.parentItem == parentItem) { + if(webPreview.previewItem && webPreview.previewItem->scene()) { + removeItem(webPreview.previewItem); + webPreview.deleteTimer.start(); + } + webPreview.delayTimer.stop(); + } +#endif +} + +void ChatScene::deleteWebPreviewEvent() { +#ifdef HAVE_WEBKIT + if(webPreview.previewItem) { + delete webPreview.previewItem; + webPreview.previewItem = 0; + } + webPreview.parentItem = 0; + webPreview.url = QString(); + webPreview.urlRect = QRectF(); +#endif +}