X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=f85e34445f41f032037c0b4236ee14aaea9b2090;hp=811eec3eadf5aadf354281d787fcd26707bee3f0;hb=aa2d0a85c3e04a99d46c05512165c20414a669ec;hpb=060eed53b2da720c717e43a1b92dba2a6a7ab13e diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 811eec3e..f85e3444 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -20,7 +20,9 @@ #include #include +#include #include +#include #include #include @@ -28,9 +30,11 @@ #include "chatline.h" #include "chatlinemodelitem.h" #include "chatscene.h" +#include "chatview.h" #include "client.h" #include "clientbacklogmanager.h" #include "columnhandleitem.h" +#include "iconloader.h" #include "messagefilter.h" #include "qtui.h" #include "qtuistyle.h" @@ -39,17 +43,22 @@ const qreal minContentsWidth = 200; -ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent) - : QGraphicsScene(0, 0, width, 0, parent), +ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, ChatView *parent) + : QGraphicsScene(0, 0, width, 0, (QObject *)parent), + _chatView(parent), _idString(idString), _model(model), _singleBufferScene(false), _sceneRect(0, 0, width, 0), _firstLineRow(-1), _viewportHeight(0), + _cutoffMode(CutoffRight), _selectingItem(0), _selectionStart(-1), - _isSelecting(false) + _isSelecting(false), + _clickMode(NoClick), + _clickHandled(true), + _leftButtonPressed(false) { MessageFilter *filter = qobject_cast(model); if(filter) { @@ -74,14 +83,15 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w addItem(_secondColHandle); _secondColHandle->setXPos(_secondColHandlePos); connect(_secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(secondHandlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _secondColHandle, SLOT(sceneRectChanged(const QRectF &))); 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); @@ -89,9 +99,16 @@ 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())); + + _clickTimer.setInterval(QApplication::doubleClickInterval()); + _clickTimer.setSingleShot(true); + connect(&_clickTimer, SIGNAL(timeout()), SLOT(clickTimeout())); setItemIndexMethod(QGraphicsScene::NoIndex); } @@ -99,27 +116,64 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w ChatScene::~ChatScene() { } +ChatView *ChatScene::chatView() const { + return _chatView; +} + +ColumnHandleItem *ChatScene::firstColumnHandle() const { + return _firstColHandle; +} + +ColumnHandleItem *ChatScene::secondColumnHandle() const { + return _secondColHandle; +} + +ChatItem *ChatScene::chatItemAt(const QPointF &scenePos) const { + QGraphicsItem *item = itemAt(scenePos); + return dynamic_cast(item); +} + +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(); @@ -131,9 +185,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); @@ -142,9 +196,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); @@ -160,17 +214,24 @@ 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... + int moveStart = 0; + int moveEnd = _lines.count() - 1; + qreal offset = h; 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) { @@ -191,13 +252,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()); +// 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 @@ -218,6 +297,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; @@ -237,13 +323,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... @@ -317,6 +406,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"; @@ -384,7 +474,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"; @@ -401,7 +493,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); @@ -409,17 +501,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; @@ -448,81 +532,243 @@ 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); _isSelecting = false; + _selectionStart = -1; _selectingItem->continueSelecting(_selectingItem->mapFromScene(pos)); } } -void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if(_isSelecting && event->buttons() == Qt::LeftButton) { - updateSelection(event->scenePos()); - event->accept(); +bool ChatScene::isPosOverSelection(const QPointF &pos) const { + ChatItem *chatItem = chatItemAt(pos); + if(!chatItem) + return false; + if(hasGlobalSelection()) { + int row = chatItem->row(); + if(row >= qMin(_selectionStart, _selectionEnd) && row <= qMax(_selectionStart, _selectionEnd)) + return columnByScenePos(pos) >= _selectionMinCol; } else { - QGraphicsScene::mouseMoveEvent(event); + return chatItem->isPosOverSelection(chatItem->mapFromScene(pos)); } + return false; +} + +bool ChatScene::isScrollingAllowed() const { + if(_isSelecting) + return false; + + // TODO: Handle clicks and single-item selections too + + return true; +} + +/******** MOUSE HANDLING **************************************************************************/ + +void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { + QPointF pos = event->scenePos(); + QMenu menu; + + // zoom actions and similar + chatView()->addActionsToMenu(&menu, pos); + menu.addSeparator(); + + if(isPosOverSelection(pos)) + menu.addAction(SmallIcon("edit-copy"), tr("Copy Selection"), + this, SLOT(selectionToClipboard()), + QKeySequence::Copy); + + // item-specific options (select link etc) + ChatItem *item = chatItemAt(pos); + if(item) + item->addActionsToMenu(&menu, item->mapFromScene(pos)); + + menu.exec(event->screenPos()); + +} + +void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + if(event->buttons() == Qt::LeftButton) { + if(!_clickHandled && (event->scenePos() - _clickPos).toPoint().manhattanLength() >= QApplication::startDragDistance()) { + if(_clickTimer.isActive()) _clickTimer.stop(); + if(_clickMode == SingleClick && isPosOverSelection(_clickPos)) + initiateDrag(event->widget()); + else { + _clickMode = DragStartClick; + handleClick(Qt::LeftButton, _clickPos); + } + _clickMode = NoClick; + } + if(_isSelecting) { + updateSelection(event->scenePos()); + emit mouseMoveWhileSelecting(event->scenePos()); + event->accept(); + } else if(_clickHandled) + QGraphicsScene::mouseMoveEvent(event); + } else + QGraphicsScene::mouseMoveEvent(event); } void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if(event->buttons() == Qt::LeftButton && _selectionStart >= 0) { - for(int l = qMin(_selectionStart, _selectionEnd); l <= qMax(_selectionStart, _selectionEnd); l++) { - _lines[l]->setSelected(false); + if(event->buttons() == Qt::LeftButton) { + _leftButtonPressed = true; + _clickHandled = false; + if(!isPosOverSelection(event->scenePos())) { + // immediately clear selection if clicked outside; otherwise, wait for potential drag + clearSelection(); } - _selectionStart = -1; - QGraphicsScene::mousePressEvent(event); // so we can start a new local selection - } else { - QGraphicsScene::mousePressEvent(event); + if(_clickMode != NoClick && _clickTimer.isActive()) { + _clickMode = (ClickMode)(_clickMode == TripleClick ? DoubleClick : _clickMode + 1); + handleClick(Qt::LeftButton, event->scenePos()); + } else { + _clickMode = SingleClick; + _clickPos = event->scenePos(); + } + _clickTimer.start(); + } else if(event->buttons() == Qt::RightButton) { + handleClick(Qt::RightButton, event->scenePos()); } + if(event->type() == QEvent::GraphicsSceneMouseDoubleClick) + QGraphicsScene::mouseDoubleClickEvent(event); + else + QGraphicsScene::mousePressEvent(event); +} + +void ChatScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { + // we check for doubleclick ourselves, so just call press handler + mousePressEvent(event); } void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - if(_isSelecting && !event->buttons() & Qt::LeftButton) { - putToClipboard(selectionToString()); - _isSelecting = false; - event->accept(); - } else { - QGraphicsScene::mouseReleaseEvent(event); + if(!event->buttons() & Qt::LeftButton) { + _leftButtonPressed = false; + if(_clickMode != NoClick) { + if(_clickMode == SingleClick) + clearSelection(); + event->accept(); + if(!_clickTimer.isActive()) + handleClick(Qt::LeftButton, _clickPos); + } else { + // no click -> drag or selection move + if(isGloballySelecting()) { + selectionToClipboard(QClipboard::Selection); + _isSelecting = false; + event->accept(); + return; + } + } } + QGraphicsScene::mouseReleaseEvent(event); +} + +void ChatScene::clickTimeout() { + if(!_leftButtonPressed && _clickMode == SingleClick) + handleClick(Qt::LeftButton, _clickPos); +} + +void ChatScene::handleClick(Qt::MouseButton button, const QPointF &scenePos) { + if(button == Qt::LeftButton) { + clearSelection(); + + // Now send click down to items + ChatItem *chatItem = chatItemAt(scenePos); + if(chatItem) { + chatItem->handleClick(chatItem->mapFromScene(scenePos), _clickMode); + } + _clickHandled = true; + } +} + +void ChatScene::initiateDrag(QWidget *source) { + QDrag *drag = new QDrag(source); + QMimeData *mimeData = new QMimeData; + mimeData->setText(selection()); + drag->setMimeData(mimeData); + + drag->exec(Qt::CopyAction); +} + +/******** SELECTIONS ******************************************************************************/ + +void ChatScene::selectionToClipboard(QClipboard::Mode mode) { + if(!hasSelection()) + return; + + stringToClipboard(selection(), mode); } -void ChatScene::putToClipboard(const QString &selection) { - // TODO Configure clipboards -# ifdef Q_WS_X11 - QApplication::clipboard()->setText(selection, QClipboard::Selection); -# endif -//# else - QApplication::clipboard()->setText(selection); -//# endif +void ChatScene::stringToClipboard(const QString &str, QClipboard::Mode mode) { + switch(mode) { + case QClipboard::Clipboard: + QApplication::clipboard()->setText(str); + break; + case QClipboard::Selection: + if(QApplication::clipboard()->supportsSelection()) + QApplication::clipboard()->setText(str, QClipboard::Selection); + break; + default: + break; + }; } //!\brief Convert current selection to human-readable string. -QString ChatScene::selectionToString() const { +QString ChatScene::selection() const { //TODO Make selection format configurable! - if(!_isSelecting) return QString(); - int start = qMin(_selectionStart, _selectionEnd); - int end = qMax(_selectionStart, _selectionEnd); - if(start < 0 || end >= _lines.count()) { - qDebug() << "Invalid selection range:" << start << end; - return QString(); - } - QString result; - for(int l = start; l <= end; l++) { - if(_selectionMinCol == ChatLineModel::TimestampColumn) - result += _lines[l]->item(ChatLineModel::TimestampColumn).data(MessageModel::DisplayRole).toString() + " "; - if(_selectionMinCol <= ChatLineModel::SenderColumn) - result += _lines[l]->item(ChatLineModel::SenderColumn).data(MessageModel::DisplayRole).toString() + " "; - result += _lines[l]->item(ChatLineModel::ContentsColumn).data(MessageModel::DisplayRole).toString() + "\n"; + if(hasGlobalSelection()) { + int start = qMin(_selectionStart, _selectionEnd); + int end = qMax(_selectionStart, _selectionEnd); + if(start < 0 || end >= _lines.count()) { + qDebug() << "Invalid selection range:" << start << end; + return QString(); + } + QString result; + for(int l = start; l <= end; l++) { + if(_selectionMinCol == ChatLineModel::TimestampColumn) + result += _lines[l]->item(ChatLineModel::TimestampColumn).data(MessageModel::DisplayRole).toString() + " "; + if(_selectionMinCol <= ChatLineModel::SenderColumn) + result += _lines[l]->item(ChatLineModel::SenderColumn).data(MessageModel::DisplayRole).toString() + " "; + result += _lines[l]->item(ChatLineModel::ContentsColumn).data(MessageModel::DisplayRole).toString() + "\n"; + } + return result; + } else if(selectingItem()) + return selectingItem()->selection(); + return QString(); +} + +bool ChatScene::hasSelection() const { + return hasGlobalSelection() || (selectingItem() && selectingItem()->hasSelection()); +} + +bool ChatScene::hasGlobalSelection() const { + return _selectionStart >= 0; +} + +bool ChatScene::isGloballySelecting() const { + return _isSelecting; +} + +void ChatScene::clearGlobalSelection() { + if(hasGlobalSelection()) { + for(int l = qMin(_selectionStart, _selectionEnd); l <= qMax(_selectionStart, _selectionEnd); l++) + _lines[l]->setSelected(false); + _isSelecting = false; + _selectionStart = -1; } - return result; } +void ChatScene::clearSelection() { + clearGlobalSelection(); + if(selectingItem()) + selectingItem()->clearSelection(); +} + +/******** *************************************************************************************/ + void ChatScene::requestBacklog() { MessageFilter *filter = qobject_cast(model()); if(filter) @@ -530,7 +776,7 @@ void ChatScene::requestBacklog() { return; } -int ChatScene::sectionByScenePos(int x) { +ChatLineModel::ColumnType ChatScene::columnByScenePos(qreal x) const { if(x < _firstColHandle->x()) return ChatLineModel::TimestampColumn; if(x < _secondColHandle->x()) @@ -539,6 +785,15 @@ int ChatScene::sectionByScenePos(int x) { return ChatLineModel::ContentsColumn; } +int ChatScene::rowByScenePos(qreal y) const { + // 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)); @@ -557,7 +812,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++; } @@ -580,19 +835,25 @@ void ChatScene::updateSceneRect(const QRectF &rect) { update(); } -void ChatScene::customEvent(QEvent *event) { - switch(event->type()) { - default: - return; +bool ChatScene::event(QEvent *e) { + if(e->type() == QEvent::ApplicationPaletteChange) { + _firstColHandle->setColor(QApplication::palette().windowText().color()); + _secondColHandle->setColor(QApplication::palette().windowText().color()); } + return QGraphicsScene::event(e); } +/******** WEB PREVIEW *****************************************************************************/ + 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(!_showWebPreview) + return; + if(webPreview.parentItem != parentItem) webPreview.parentItem = parentItem; @@ -658,3 +919,8 @@ void ChatScene::deleteWebPreviewEvent() { webPreview.urlRect = QRectF(); #endif } + +void ChatScene::showWebPreviewChanged() { + ChatViewSettings settings; + _showWebPreview = settings.showWebPreview(); +}