X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=ba31ce826fca6e1255e4a426a1d1c5a7bb3d0fcf;hp=de986cdaccd3876b422667dbb9ebb287c2ed3f71;hb=229b87f259ab1bc2c65f481eb39c25a872080fe7;hpb=52bdd697981071777b0a0d2fe90ed6aeb82bb18b diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index de986cda..ba31ce82 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -81,9 +81,9 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w setHandleXLimits(); connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(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))); + this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int))); if(model->rowCount() > 0) rowsInserted(QModelIndex(), 0, model->rowCount() - 1); @@ -91,9 +91,12 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w #ifdef HAVE_WEBKIT webPreview.delayTimer.setSingleShot(true); connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent())); - webPreview.deleteTimer.setInterval(600000); + //webPreview.deleteTimer.setInterval(600000); + webPreview.deleteTimer.setInterval(10000); connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent())); #endif + _showWebPreview = defaultSettings.showWebPreview(); + defaultSettings.notify("ShowWebPreview", this, SLOT(showWebPreviewChanged())); setItemIndexMethod(QGraphicsScene::NoIndex); } @@ -101,27 +104,47 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w ChatScene::~ChatScene() { } +bool ChatScene::containsBuffer(const BufferId &id) const { + MessageFilter *filter = qobject_cast(model()); + if(filter) + return filter->containsBuffer(id); + else + return false; +} + 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(); + + +// QModelIndex sidx = model()->index(start, 2); +// QModelIndex eidx = model()->index(end, 2); +// qDebug() << "rowsInserted:"; +// if(start > 0) { +// QModelIndex ssidx = model()->index(start - 1, 2); +// qDebug() << "Start--:" << start - 1 << ssidx.data(MessageModel::MsgIdRole).value() +// << ssidx.data(Qt::DisplayRole).toString(); +// } +// qDebug() << "Start:" << start << sidx.data(MessageModel::MsgIdRole).value() +// << sidx.data(Qt::DisplayRole).toString(); +// qDebug() << "End:" << end << eidx.data(MessageModel::MsgIdRole).value() +// << eidx.data(Qt::DisplayRole).toString(); +// if(end + 1 < model()->rowCount()) { +// QModelIndex eeidx = model()->index(end + 1, 2); +// qDebug() << "End++:" << end + 1 << eeidx.data(MessageModel::MsgIdRole).value() +// << eeidx.data(Qt::DisplayRole).toString(); +// } qreal h = 0; - qreal y = _sceneRect.y(); + qreal y = 0; qreal width = _sceneRect.width(); - bool atTop = true; - bool atBottom = false; + bool atBottom = (start == _lines.count()); + bool atTop = !atBottom && (start == 0); bool moveTop = false; - if(start > 0 && start < _lines.count()) { + if(start < _lines.count()) { y = _lines.value(start)->y(); - atTop = false; - } - if(start == _lines.count()) { - y = _sceneRect.bottom(); - atTop = false; - atBottom = true; + } else if(atBottom && !_lines.isEmpty()) { + y = _lines.last()->y() + _lines.last()->height(); } qreal contentsWidth = width - secondColumnHandle()->sceneRight(); @@ -133,9 +156,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(atTop) { for(int i = end; i >= start; i--) { ChatLine *line = new ChatLine(i, model(), - width, - timestampWidth, senderWidth, contentsWidth, - senderPos, contentsPos); + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); h += line->height(); line->setPos(0, y-h); _lines.insert(start, line); @@ -144,9 +167,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { } else { for(int i = start; i <= end; i++) { ChatLine *line = new ChatLine(i, model(), - width, - timestampWidth, senderWidth, contentsWidth, - senderPos, contentsPos); + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); line->setPos(0, y+h); h += line->height(); _lines.insert(i, line); @@ -162,10 +185,17 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { // update selection if(_selectionStart >= 0) { int offset = end - start + 1; - if(_selectionStart >= start) _selectionStart += offset; - if(_selectionEnd >= start) _selectionEnd += offset; - if(_firstSelectionRow >= start) _firstSelectionRow += offset; - if(_lastSelectionRow >= start) _lastSelectionRow += offset; + int oldStart = _selectionStart; + if(_selectionStart >= start) + _selectionStart += offset; + if(_selectionEnd >= start) { + _selectionEnd += offset; + if(_selectionStart == oldStart) + for(int i = start; i < start + offset; i++) + _lines[i]->setSelected(true); + } + if(_firstSelectionRow >= start) + _firstSelectionRow += offset; } // neither pre- or append means we have to do dirty work: move items... @@ -173,9 +203,6 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { int moveEnd = _lines.count() - 1; qreal offset = h; if(!(atTop || atBottom)) { -// int moveStart = 0; -// int moveEnd = _lines.count() - 1; -// qreal offset = h; // 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) { @@ -196,22 +223,31 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { // 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(end + 1 < _lines.count()) { - if(_lines.at(end)->pos().y() + _lines.at(end)->height() != _lines.at(end + 1)->pos().y()) { - qDebug() << "lines:" << _lines.count() << "start:" << start << "end:" << end; - qDebug() << "line[end]:" << _lines.at(end)->pos().y() << "+" << _lines.at(end)->height() << "=" << _lines.at(end)->pos().y() + _lines.at(end)->height(); - qDebug() << "line[end+1]" << _lines.at(end + 1)->pos().y(); - qDebug() << "needed moving:" << !(atTop || atBottom) << moveTop << moveStart << moveEnd << offset; - Q_ASSERT(false); - } - } +// if(start != 0) { +// if(_lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() != _lines.at(start)->pos().y()) { +// qDebug() << "lines:" << _lines.count() << "start:" << start << "end:" << end; +// qDebug() << "line[start - 1]:" << _lines.at(start - 1)->pos().y() << "+" << _lines.at(start - 1)->height() << "=" << _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height(); +// qDebug() << "line[start]" << _lines.at(start)->pos().y(); +// qDebug() << "needed moving:" << !(atTop || atBottom) << moveTop << moveStart << moveEnd << offset; +// Q_ASSERT(false) +// } +// } + Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y()); +// if(end + 1 < _lines.count()) { +// if(_lines.at(end)->pos().y() + _lines.at(end)->height() != _lines.at(end + 1)->pos().y()) { +// qDebug() << "lines:" << _lines.count() << "start:" << start << "end:" << end; +// qDebug() << "line[end]:" << _lines.at(end)->pos().y() << "+" << _lines.at(end)->height() << "=" << _lines.at(end)->pos().y() + _lines.at(end)->height(); +// qDebug() << "line[end+1]" << _lines.at(end + 1)->pos().y(); +// qDebug() << "needed moving:" << !(atTop || atBottom) << moveTop << moveStart << moveEnd << offset; +// Q_ASSERT(false); +// } +// } if(!atBottom) { if(start < _firstLineRow) { int prevFirstLineRow = _firstLineRow + (end - start + 1); for(int i = end + 1; i < prevFirstLineRow; i++) { - _lines.at(i)->show(); + _lines.at(i)->show(); } } // force new search for first proper line @@ -232,6 +268,13 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e bool atBottom = (end == _lines.count() - 1); bool moveTop = false; + // clear selection + if(_selectingItem) { + int row = _selectingItem->row(); + if(row >= start && row <= end) + setSelectingItem(0); + } + // remove items from scene QList::iterator lineIter = _lines.begin() + start; int lineCount = start; @@ -251,13 +294,16 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e if(_selectionStart >= 0) { int offset = end - start + 1; if(_selectionStart >= start) - _selectionStart -= offset; + _selectionStart = qMax(_selectionStart -= offset, start); if(_selectionEnd >= start) _selectionEnd -= offset; if(_firstSelectionRow >= start) _firstSelectionRow -= offset; - if(_lastSelectionRow >= start) - _lastSelectionRow -= offset; + + if(_selectionEnd < _selectionStart) { + _isSelecting = false; + _selectionStart = -1; + } } // neither removing at bottom or top means we have to move items... @@ -331,6 +377,7 @@ void ChatScene::setWidth(qreal width) { updateSceneRect(width); setHandleXLimits(); + emit layoutChanged(); // clock_t endT = clock(); // qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; @@ -398,7 +445,9 @@ void ChatScene::secondHandlePositionChanged(qreal xpos) { } //setItemIndexMethod(QGraphicsScene::BspTreeIndex); + updateSceneRect(); setHandleXLimits(); + emit layoutChanged(); // clock_t endT = clock(); // qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; @@ -415,7 +464,7 @@ void ChatScene::setSelectingItem(ChatItem *item) { } void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) { - _selectionStart = _selectionEnd = _lastSelectionRow = _firstSelectionRow = item->row(); + _selectionStart = _selectionEnd = _firstSelectionRow = item->row(); _selectionStartCol = _selectionMinCol = item->column(); _isSelecting = true; _lines[_selectionStart]->setSelected(true, (ChatLineModel::ColumnType)_selectionMinCol); @@ -423,17 +472,9 @@ 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(_secondColHandle->sceneRight() + 1, pos.y()))); - if(!contentItem) return; - - int curRow = contentItem->row(); - int curColumn; - if(pos.x() > _secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn; - else if(pos.x() > _firstColHandlePos) curColumn = ChatLineModel::SenderColumn; - else curColumn = ChatLineModel::TimestampColumn; - + int curRow = rowByScenePos(pos); + if(curRow < 0) return; + int curColumn = (int)columnByScenePos(pos); ChatLineModel::ColumnType minColumn = (ChatLineModel::ColumnType)qMin(curColumn, _selectionStartCol); if(minColumn != _selectionMinCol) { _selectionMinCol = minColumn; @@ -462,11 +503,10 @@ void ChatScene::updateSelection(const QPointF &pos) { _selectionStart = newstart; _selectionEnd = newend; - _lastSelectionRow = curRow; if(newstart == newend && minColumn == ChatLineModel::ContentsColumn) { if(!_selectingItem) { - qWarning() << "WARNING: ChatScene::updateSelection() has a null _selectingItem, this should never happen! Please report."; + // _selectingItem has been removed already return; } _lines[curRow]->setSelected(false); @@ -475,9 +515,19 @@ void ChatScene::updateSelection(const QPointF &pos) { } } +bool ChatScene::isScrollingAllowed() const { + if(_isSelecting) + return false; + + // TODO: Handle clicks and single-item selections too + + return true; +} + void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if(_isSelecting && event->buttons() == Qt::LeftButton) { updateSelection(event->scenePos()); + emit mouseMoveWhileSelecting(event->scenePos()); event->accept(); } else { QGraphicsScene::mouseMoveEvent(event); @@ -485,10 +535,11 @@ void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { } void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if(event->buttons() == Qt::LeftButton && _selectionStart >= 0) { + if(_selectionStart >= 0 && event->buttons() == Qt::LeftButton) { for(int l = qMin(_selectionStart, _selectionEnd); l <= qMax(_selectionStart, _selectionEnd); l++) { _lines[l]->setSelected(false); } + _isSelecting = false; _selectionStart = -1; QGraphicsScene::mousePressEvent(event); // so we can start a new local selection } else { @@ -544,7 +595,7 @@ void ChatScene::requestBacklog() { return; } -int ChatScene::sectionByScenePos(int x) { +ChatLineModel::ColumnType ChatScene::columnByScenePos(qreal x) { if(x < _firstColHandle->x()) return ChatLineModel::TimestampColumn; if(x < _secondColHandle->x()) @@ -553,6 +604,15 @@ int ChatScene::sectionByScenePos(int x) { return ChatLineModel::ContentsColumn; } +int ChatScene::rowByScenePos(qreal y) { + // This is somewhat hacky... we look at the contents item that is at the given y position, since + // it has the full height. From this item, we can then determine the row index and hence the ChatLine. + // ChatItems cover their ChatLine, so we won't get to the latter directly. + ChatItem *contentItem = static_cast(itemAt(QPointF(_secondColHandle->sceneRight() + 1, y))); + if(!contentItem) return -1; + return contentItem->row(); +} + void ChatScene::updateSceneRect(qreal width) { if(_lines.isEmpty()) { updateSceneRect(QRectF(0, 0, width, 0)); @@ -571,7 +631,7 @@ void ChatScene::updateSceneRect(qreal width) { while(_firstLineRow < numRows) { firstLineIdx = model()->index(_firstLineRow, 0); if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange) - break; + break; _lines.at(_firstLineRow)->hide(); _firstLineRow++; } @@ -608,6 +668,9 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q Q_UNUSED(url) Q_UNUSED(urlRect) #else + if(!_showWebPreview) + return; + if(webPreview.parentItem != parentItem) webPreview.parentItem = parentItem; @@ -673,3 +736,8 @@ void ChatScene::deleteWebPreviewEvent() { webPreview.urlRect = QRectF(); #endif } + +void ChatScene::showWebPreviewChanged() { + ChatViewSettings settings; + _showWebPreview = settings.showWebPreview(); +}