X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=d78ee1c825eede84a29e4a6c9579da0c697294eb;hp=4fdf92a06c05e78285d60343b63316b296d518fa;hb=894e2dd800e90ab52618fa620b1c995545506574;hpb=a540a0285feef171e16fd6225b0e045fc5fc52e4 diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 4fdf92a0..d78ee1c8 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2010 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,8 +23,18 @@ #include #include #include +#include #include -#include + +#ifdef HAVE_KDE +# include +#else +# include +#endif + +#ifdef HAVE_WEBKIT +# include +#endif #include "chatitem.h" #include "chatline.h" @@ -36,6 +46,8 @@ #include "columnhandleitem.h" #include "contextmenuactionprovider.h" #include "iconloader.h" +#include "mainwin.h" +#include "markerlineitem.h" #include "messagefilter.h" #include "qtui.h" #include "qtuistyle.h" @@ -53,6 +65,9 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _sceneRect(0, 0, width, 0), _firstLineRow(-1), _viewportHeight(0), + _markerLine(new MarkerLineItem(width)), + _markerLineValid(false), + _markerLineVisible(false), _cutoffMode(CutoffRight), _selectingItem(0), _selectionStart(-1), @@ -66,6 +81,9 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _singleBufferId = filter->singleBufferId(); } + addItem(_markerLine); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _markerLine, SLOT(sceneRectChanged(const QRectF &))); + ChatViewSettings defaultSettings; int defaultFirstColHandlePos = defaultSettings.value("FirstColumnHandlePos", 80).toInt(); int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt(); @@ -89,13 +107,16 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w setHandleXLimits(); + if(model->rowCount() > 0) + rowsInserted(QModelIndex(), 0, model->rowCount() - 1); + 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); + connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), + this, SLOT(rowsRemoved())); + connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), SLOT(dataChanged(QModelIndex, QModelIndex))); #ifdef HAVE_WEBKIT webPreview.timer.setSingleShot(true); @@ -126,9 +147,52 @@ ColumnHandleItem *ChatScene::secondColumnHandle() const { return _secondColHandle; } +ChatLine *ChatScene::chatLine(MsgId msgId, bool matchExact) const { + if(!_lines.count()) + return 0; + + QList::ConstIterator start = _lines.begin(); + QList::ConstIterator end = _lines.end(); + QList::ConstIterator middle; + + int n = int(end - start); + int half; + + while(n > 0) { + half = n >> 1; + middle = start + half; + if((*middle)->msgId() < msgId) { + start = middle + 1; + n -= half + 1; + } else { + n = half; + } + } + + if(start != end && (*start)->msgId() == msgId) + return *start; + + if(matchExact) + return 0; + + // if we didn't find the exact msgId, take the next-lower one (this makes sense for lastSeen) + if(start == end) // higher than last element + return _lines.last(); + + if(start == _lines.begin()) // not (yet?) in our scene + return 0; + + // return the next-lower line + return *(--start); +} + ChatItem *ChatScene::chatItemAt(const QPointF &scenePos) const { - QGraphicsItem *item = itemAt(scenePos); - return dynamic_cast(item); + foreach(QGraphicsItem *item, items(scenePos, Qt::IntersectsItemBoundingRect, Qt::AscendingOrder)) { + ChatLine *line = qgraphicsitem_cast(item); + if(line) + return line->itemAt(line->mapFromScene(scenePos)); + } + return 0; } bool ChatScene::containsBuffer(const BufferId &id) const { @@ -139,6 +203,35 @@ bool ChatScene::containsBuffer(const BufferId &id) const { return false; } +void ChatScene::setMarkerLineVisible(bool visible) { + _markerLineVisible = visible; + if(visible && _markerLineValid) + _markerLine->setVisible(true); + else + _markerLine->setVisible(false); +} + +void ChatScene::setMarkerLine(MsgId msgId) { + if(msgId.isValid()) { + ChatLine *line = chatLine(msgId, false); + if(line) { + // if this was the last line, we won't see it because it's outside the sceneRect + // .. which is exactly what we want :) + _markerLine->setPos(line->pos() + QPointF(0, line->height())); + + // DayChange messages might have been hidden outside the scene rect, don't make the markerline visible then! + if(_markerLine->pos().y() >= sceneRect().y()) { + _markerLineValid = true; + if(_markerLineVisible) + _markerLine->setVisible(true); + return; + } + } + } + _markerLineValid = false; + _markerLine->setVisible(false); +} + void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { Q_UNUSED(index); @@ -166,7 +259,6 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { qreal width = _sceneRect.width(); bool atBottom = (start == _lines.count()); bool atTop = !atBottom && (start == 0); - bool moveTop = false; if(start < _lines.count()) { y = _lines.value(start)->y(); @@ -226,25 +318,11 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { } // 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)) { - // 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 = end + 1; - } ChatLine *line = 0; - for(int i = moveStart; i <= moveEnd; i++) { + for(int i = 0; i <= end; i++) { line = _lines.at(i); - line->setPos(0, line->pos().y() + offset); + line->setPos(0, line->pos().y() - h); } } @@ -281,9 +359,17 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { _firstLineRow = -1; } updateSceneRect(); - if(atBottom || (!atTop && !moveTop)) { + if(atBottom) { emit lastLineChanged(_lines.last(), h); } + + // now move the marker line if necessary. we don't need to do anything if we appended lines though... + if(isSingleBufferScene()) { + if(!_markerLineValid || !atBottom) { + MsgId msgId = Client::markerLine(singleBufferId()); + setMarkerLine(msgId); + } + } } void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { @@ -377,6 +463,18 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e updateSceneRect(); } +void ChatScene::rowsRemoved() { + // move the marker line if necessary + if(isSingleBufferScene()) { + MsgId msgId = Client::markerLine(singleBufferId()); + setMarkerLine(msgId); + } +} + +void ChatScene::dataChanged(const QModelIndex &tl, const QModelIndex &br) { + layout(tl.row(), br.row(), _sceneRect.width()); +} + void ChatScene::updateForViewport(qreal width, qreal height) { _viewportHeight = height; setWidth(width); @@ -385,21 +483,37 @@ void ChatScene::updateForViewport(qreal width, qreal height) { void ChatScene::setWidth(qreal width) { if(width == _sceneRect.width()) return; + layout(0, _lines.count()-1, width); +} +void ChatScene::layout(int start, int end, qreal width) { // clock_t startT = clock(); // disabling the index while doing this complex updates is about // 2 to 10 times faster! //setItemIndexMethod(QGraphicsScene::NoIndex); - QList::iterator lineIter = _lines.end(); - QList::iterator lineIterBegin = _lines.begin(); - qreal linePos = _sceneRect.y() + _sceneRect.height(); - qreal contentsWidth = width - secondColumnHandle()->sceneRight(); - while(lineIter != lineIterBegin) { - lineIter--; - (*lineIter)->setGeometryByWidth(width, contentsWidth, linePos); + if(end >= 0) { + int row = end; + qreal linePos = _lines.at(row)->scenePos().y() + _lines.at(row)->height(); + qreal contentsWidth = width - secondColumnHandle()->sceneRight(); + while(row >= start) { + _lines.at(row--)->setGeometryByWidth(width, contentsWidth, linePos); + } + + if(row >= 0) { + // remaining items don't need geometry changes, but maybe repositioning? + ChatLine *line = _lines.at(row); + qreal offset = linePos - (line->scenePos().y() + line->height()); + if(offset != 0) { + while(row >= 0) { + line = _lines.at(row--); + line->setPos(0, line->scenePos().y() + offset); + } + } + } } + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); updateSceneRect(width); @@ -414,7 +528,7 @@ void ChatScene::firstHandlePositionChanged(qreal xpos) { if(_firstColHandlePos == xpos) return; - _firstColHandlePos = xpos; + _firstColHandlePos = xpos >= 0 ? xpos : 0; ChatViewSettings viewSettings(this); viewSettings.setValue("FirstColumnHandlePos", _firstColHandlePos); ChatViewSettings defaultSettings; @@ -483,6 +597,7 @@ void ChatScene::secondHandlePositionChanged(qreal xpos) { void ChatScene::setHandleXLimits() { _firstColHandle->setXLimits(0, _secondColHandle->sceneLeft()); _secondColHandle->setXLimits(_firstColHandle->sceneRight(), width() - minContentsWidth); + update(); } void ChatScene::setSelectingItem(ChatItem *item) { @@ -589,6 +704,9 @@ void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { // no item -> default scene actions GraphicalUi::contextMenuActionProvider()->addActions(&menu, filter(), BufferId()); + if (QtUi::mainWindow()->menuBar()->isHidden()) + menu.addAction(QtUi::actionCollection("General")->action("ToggleMenuBar")); + menu.exec(event->screenPos()); } @@ -708,7 +826,12 @@ void ChatScene::selectionToClipboard(QClipboard::Mode mode) { stringToClipboard(selection(), mode); } -void ChatScene::stringToClipboard(const QString &str, QClipboard::Mode mode) { +void ChatScene::stringToClipboard(const QString &str_, QClipboard::Mode mode) { + QString str = str_; + // remove trailing linefeeds + if(str.endsWith('\n')) + str.chop(1); + switch(mode) { case QClipboard::Clipboard: QApplication::clipboard()->setText(str); @@ -735,10 +858,10 @@ QString ChatScene::selection() const { QString result; for(int l = start; l <= end; l++) { if(_selectionMinCol == ChatLineModel::TimestampColumn) - result += _lines[l]->item(ChatLineModel::TimestampColumn).data(MessageModel::DisplayRole).toString() + " "; + 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"; + 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()) @@ -792,12 +915,15 @@ ChatLineModel::ColumnType ChatScene::columnByScenePos(qreal x) const { } 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(); + QList itemList = items(QPointF(0, y)); + + // ChatLine should be at the bottom of the list + for(int i = itemList.count()-1; i >= 0; i--) { + ChatLine *line = qgraphicsitem_cast(itemList.at(i)); + if(line) + return line->row(); + } + return -1; } void ChatScene::updateSceneRect(qreal width) { @@ -853,7 +979,7 @@ bool ChatScene::event(QEvent *e) { // Webkit Only stuff // ======================================== #ifdef HAVE_WEBKIT -void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) { +void ChatScene::loadWebPreview(ChatItem *parentItem, const QUrl &url, const QRectF &urlRect) { if(!_showWebPreview) return; @@ -868,7 +994,7 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q // prepare to load a different URL if(webPreview.previewItem) { if(webPreview.previewItem->scene()) - removeItem(webPreview.previewItem); + removeItem(webPreview.previewItem); delete webPreview.previewItem; webPreview.previewItem = 0; } @@ -916,10 +1042,10 @@ void ChatScene::webPreviewNextStep() { qreal previewY = webPreview.urlRect.bottom(); qreal previewX = webPreview.urlRect.x(); if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom()) - previewY = webPreview.urlRect.y() - webPreview.previewItem->boundingRect().height(); + previewY = webPreview.urlRect.y() - webPreview.previewItem->boundingRect().height(); if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width()) - previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width(); + previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width(); webPreview.previewItem->setPos(previewX, previewY); } @@ -938,7 +1064,7 @@ void ChatScene::webPreviewNextStep() { webPreview.previewItem = 0; } webPreview.parentItem = 0; - webPreview.url = QString(); + webPreview.url = QUrl(); webPreview.urlRect = QRectF(); webPreview.previewState = WebPreview::NoPreview; } @@ -954,7 +1080,7 @@ void ChatScene::clearWebPreview(ChatItem *parentItem) { case WebPreview::ShowPreview: if(parentItem == 0 || webPreview.parentItem == parentItem) { if(webPreview.previewItem && webPreview.previewItem->scene()) - removeItem(webPreview.previewItem); + removeItem(webPreview.previewItem); } // fall through into to set hidden state case WebPreview::DelayPreview: