X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=e0ab0194bb30e26426b78cec6f643ffbf9fec765;hp=758de8d0b9d53c86b0d7b2d8eaec7d317cd3456b;hb=8e871e8a152cfefff248c9284cc18530a332a58d;hpb=03d6711ea69594e8a4637b4ea20baeb9a109af9c diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 758de8d0..e0ab0194 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -26,8 +26,6 @@ #include #include #include -#include -#include #include "chatitem.h" #include "chatlinemodel.h" @@ -121,19 +119,30 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, layout()->draw(painter, QPointF(0,0), formats, boundingRect()); // Debuging Stuff - // uncomment the following lines to draw the bounding rect and the row number in alternating colors + // uncomment partially or all of the following stuff: + // + // 0) alternativ painter color for debug stuff // if(row() % 2) // painter->setPen(Qt::red); // else // painter->setPen(Qt::blue); -// QString rowString = QString::number(row()); -// QRect rowRect = painter->fontMetrics().boundingRect(rowString); -// QPointF topPoint = _boundingRect.topLeft(); -// topPoint.ry() += rowRect.height(); -// painter->drawText(topPoint, rowString); -// QPointF bottomPoint = _boundingRect.bottomRight(); -// bottomPoint.rx() -= rowRect.width(); -// painter->drawText(bottomPoint, rowString); + // 1) draw wordwrap points in the first line +// if(column() == 2) { +// ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); +// foreach(ChatLineModel::Word word, wrapList) { +// if(word.endX > width()) +// break; +// painter->drawLine(word.endX, 0, word.endX, height()); +// } +// } + // 2) draw MsgId over the time column +// if(column() == 0) { +// QString msgIdString = QString::number(data(MessageModel::MsgIdRole).value().toInt()); +// QPointF bottomPoint = boundingRect().bottomLeft(); +// bottomPoint.ry() -= 2; +// painter->drawText(bottomPoint, msgIdString); +// } + // 3) draw bounding rect // painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1)); } @@ -378,10 +387,12 @@ QVector ContentsChatItem::additionalFormats() const { } void ContentsChatItem::endHoverMode() { - if(hasLayout() && privateData()->currentClickable.isValid()) { - setCursor(Qt::ArrowCursor); - privateData()->currentClickable = Clickable(); - privateData()->clearPreview(); + if(hasLayout()) { + if(privateData()->currentClickable.isValid()) { + setCursor(Qt::ArrowCursor); + privateData()->currentClickable = Clickable(); + } + clearWebPreview(); update(); } } @@ -437,20 +448,7 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { if(idx >= click.start && idx < click.start + click.length) { if(click.type == Clickable::Url) { onClickable = true; - - if(!hasLayout()) - updateLayout(); - - QTextLine line = layout()->lineForTextPosition(click.start); - qreal x = line.cursorToX(click.start); - qreal width = line.cursorToX(click.start + click.length) - x; - qreal height = line.height(); - qreal y = height * line.lineNumber(); - QRectF urlRect(x, y, width, height); - QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); - if(!url.contains("://")) - url = "http://" + url; - privateData()->loadWebPreview(url, urlRect); + showWebPreview(click); } else if(click.type == Clickable::Channel) { // TODO: don't make clickable if it's our own name //onClickable = true; //FIXME disabled for now @@ -467,87 +465,31 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { event->accept(); } -// **************************************** -// ContentsChatItemPrivate -// **************************************** -ContentsChatItemPrivate::~ContentsChatItemPrivate() { - clearPreview(); -} - -void ContentsChatItemPrivate::loadWebPreview(const QString &url, const QRectF &urlRect) { - if(!controller) - controller = new PreviewController(contentsItem); - controller->loadPage(url, urlRect); -} - -void ContentsChatItemPrivate::clearPreview() { - delete controller; - controller = 0; -} - -ContentsChatItemPrivate::PreviewController::~PreviewController() { - if(previewItem) { - contentsItem->scene()->removeItem(previewItem); - delete previewItem; - } -} - -void ContentsChatItemPrivate::PreviewController::loadPage(const QString &newUrl, const QRectF &urlRect) { - if(newUrl.isEmpty() || newUrl == url) - return; - - url = newUrl; - QWebView *view = new QWebView; - connect(view, SIGNAL(loadFinished(bool)), this, SLOT(pageLoaded(bool))); - view->load(url); - previewItem = new ContentsChatItemPrivate::PreviewItem(view); - - QPointF sPos = contentsItem->scenePos(); - qreal previewY = sPos.y() + urlRect.y() + urlRect.height(); // bottom of url; - qreal previewX = sPos.x() + urlRect.x(); - if(previewY + previewItem->boundingRect().height() > contentsItem->scene()->sceneRect().bottom()) - previewY = sPos.y() + urlRect.y() - previewItem->boundingRect().height(); - - if(previewX + previewItem->boundingRect().width() > contentsItem->scene()->sceneRect().width()) - previewX = contentsItem->scene()->sceneRect().right() - previewItem->boundingRect().width(); +void ContentsChatItem::showWebPreview(const Clickable &click) { +#ifdef HAVE_WEBKIT + if(!hasLayout()) + updateLayout(); - previewItem->setPos(previewX, previewY); - contentsItem->scene()->addItem(previewItem); -} + QTextLine line = layout()->lineForTextPosition(click.start); + qreal x = line.cursorToX(click.start); + qreal width = line.cursorToX(click.start + click.length) - x; + qreal height = line.height(); + qreal y = height * line.lineNumber(); -void ContentsChatItemPrivate::PreviewController::pageLoaded(bool success) { - Q_UNUSED(success) -} + QPointF topLeft = scenePos() + QPointF(x, y); + QRectF urlRect = QRectF(topLeft.x(), topLeft.y(), width, height); -ContentsChatItemPrivate::PreviewItem::PreviewItem(QWebView *webView) - : QGraphicsItem(0), // needs to be a top level item as we otherwise cannot guarantee that it's on top of other chatlines - _boundingRect(0, 0, 400, 300) -{ - qreal frameWidth = 5; - webView->resize(1000, 750); - QGraphicsProxyWidget *proxyItem = new QGraphicsProxyWidget(this); - proxyItem->setWidget(webView); - proxyItem->setAcceptHoverEvents(false); - - qreal xScale = (_boundingRect.width() - 2 * frameWidth) / webView->width(); - qreal yScale = (_boundingRect.height() - 2 * frameWidth) / webView->height(); - proxyItem->scale(xScale, yScale); - proxyItem->setPos(frameWidth, frameWidth); - - setZValue(30); + QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); + if(!url.contains("://")) + url = "http://" + url; + chatScene()->loadWebPreview(this, url, urlRect); +#endif } -void ContentsChatItemPrivate::PreviewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option); Q_UNUSED(widget); - painter->setClipRect(boundingRect()); - painter->setPen(QPen(Qt::black, 5)); - painter->setBrush(Qt::black); - painter->setRenderHints(QPainter::Antialiasing); - painter->drawRoundedRect(boundingRect(), 10, 10); - - painter->setPen(QPen(Qt::green)); - QString text = QString::number(zValue()); - painter->drawText(_boundingRect.center(), text); +void ContentsChatItem::clearWebPreview() { +#ifdef HAVE_WEBKIT + chatScene()->clearWebPreview(this); +#endif } /*************************************************************************************************/