X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=ed90582c1642c4785b61fd3d3d4486f47636d007;hp=895481557c4446781df45cf6403ab356979c18af;hb=8e9f08aa0f4e663473b634511b1bcc40145e9ba9;hpb=122b548bc61795a71aba52cb3c4876280295c4bc diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 89548155..ed90582c 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" @@ -34,6 +44,7 @@ #include "client.h" #include "clientbacklogmanager.h" #include "columnhandleitem.h" +#include "contextmenuactionprovider.h" #include "iconloader.h" #include "messagefilter.h" #include "qtui.h" @@ -88,13 +99,14 @@ 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(dataChanged(QModelIndex, QModelIndex)), SLOT(dataChanged(QModelIndex, QModelIndex))); #ifdef HAVE_WEBKIT webPreview.timer.setSingleShot(true); @@ -126,8 +138,10 @@ ColumnHandleItem *ChatScene::secondColumnHandle() const { } ChatItem *ChatScene::chatItemAt(const QPointF &scenePos) const { - QGraphicsItem *item = itemAt(scenePos); - return dynamic_cast(item); + ChatLine *line = qgraphicsitem_cast(itemAt(scenePos)); + if(line) + return line->itemAt(line->mapFromScene(scenePos)); + return 0; } bool ChatScene::containsBuffer(const BufferId &id) const { @@ -165,7 +179,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(); @@ -225,25 +238,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); } } @@ -280,7 +279,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { _firstLineRow = -1; } updateSceneRect(); - if(atBottom || (!atTop && !moveTop)) { + if(atBottom) { emit lastLineChanged(_lines.last(), h); } } @@ -376,6 +375,10 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e updateSceneRect(); } +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); @@ -384,21 +387,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); @@ -413,7 +432,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; @@ -586,7 +605,10 @@ void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { item->addActionsToMenu(&menu, item->mapFromScene(pos)); else // no item -> default scene actions - Client::mainUi()->actionProvider()->addActions(&menu, filter(), BufferId()); + GraphicalUi::contextMenuActionProvider()->addActions(&menu, filter(), BufferId()); + + if (QtUi::mainWindow()->menuBar()->isHidden()) + menu.addAction(QtUi::actionCollection("General")->action("ToggleMenuBar")); menu.exec(event->screenPos()); @@ -707,7 +729,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); @@ -734,10 +761,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()) @@ -791,12 +818,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) { @@ -852,7 +882,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; @@ -867,7 +897,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; } @@ -915,10 +945,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); } @@ -937,7 +967,7 @@ void ChatScene::webPreviewNextStep() { webPreview.previewItem = 0; } webPreview.parentItem = 0; - webPreview.url = QString(); + webPreview.url = QUrl(); webPreview.urlRect = QRectF(); webPreview.previewState = WebPreview::NoPreview; } @@ -953,7 +983,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: