X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=7e26f000bc73a63c3a4293d5c024ec14fc309852;hb=e65e46d007d7f5f59274590dec3bc1d8e5f94e91;hp=261182fa60e9eb8c008e3139c497016ad60e5223;hpb=ceadbf1e4fe94d231778b9aa4bff8717489b0fd5;p=quassel.git diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 261182fa..7e26f000 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -26,6 +26,10 @@ #include #include #include +#ifdef HAVE_WEBKIT +#include +#endif +#include #include "chatitem.h" #include "chatlinemodel.h" @@ -274,9 +278,7 @@ qreal ContentsChatItem::setGeometryByWidth(qreal w) { void ContentsChatItem::updateLayout() { if(!privateData()) { - ContentsChatItemPrivate *data = new ContentsChatItemPrivate(createLayout(QTextOption::WrapAnywhere), - findClickables()); - // data->clickables = findClickables(); + ContentsChatItemPrivate *data = new ContentsChatItemPrivate(createLayout(QTextOption::WrapAnywhere), findClickables(), this); setPrivateData(data); } @@ -378,9 +380,12 @@ QVector ContentsChatItem::additionalFormats() const { } void ContentsChatItem::endHoverMode() { - if(privateData()->currentClickable.isValid()) { + if(hasLayout() && privateData()->currentClickable.isValid()) { setCursor(Qt::ArrowCursor); privateData()->currentClickable = Clickable(); +#ifdef HAVE_WEBKIT + privateData()->clearPreview(); +#endif update(); } } @@ -398,6 +403,8 @@ void ContentsChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { QString str = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); switch(click.type) { case Clickable::Url: + if(!str.contains("://")) + str = "http://" + str; QDesktopServices::openUrl(str); break; case Clickable::Channel: @@ -415,7 +422,7 @@ void ContentsChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { // mouse move events always mean we're not hovering anymore... endHoverMode(); // also, check if we have dragged the mouse - if(!privateData()->hasDragged && event->buttons() & Qt::LeftButton + if(hasLayout() && !privateData()->hasDragged && event->buttons() & Qt::LeftButton && (event->buttonDownScreenPos(Qt::LeftButton) - event->screenPos()).manhattanLength() >= QApplication::startDragDistance()) privateData()->hasDragged = true; ChatItem::mouseMoveEvent(event); @@ -432,9 +439,25 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { for(int i = 0; i < privateData()->clickables.count(); i++) { Clickable click = privateData()->clickables.at(i); if(idx >= click.start && idx < click.start + click.length) { - if(click.type == Clickable::Url) + if(click.type == Clickable::Url) { onClickable = true; - else if(click.type == Clickable::Channel) { + + if(!hasLayout()) + updateLayout(); + +#ifdef HAVE_WEBKIT + 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); +#endif + } else if(click.type == Clickable::Channel) { // TODO: don't make clickable if it's our own name //onClickable = true; //FIXME disabled for now } @@ -450,6 +473,93 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { event->accept(); } +// **************************************** +// ContentsChatItemPrivate +// **************************************** +ContentsChatItemPrivate::~ContentsChatItemPrivate() { +#ifdef HAVE_WEBKIT + clearPreview(); +#endif +} + +#ifdef HAVE_WEBKIT +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(); + + previewItem->setPos(previewX, previewY); + contentsItem->scene()->addItem(previewItem); +} + +void ContentsChatItemPrivate::PreviewController::pageLoaded(bool success) { + Q_UNUSED(success) +} + +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); +} + +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); +} +#endif // #ifdef HAVE_WEBKIT + /*************************************************************************************************/ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) @@ -459,9 +569,6 @@ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) wordidx(0), lineCount(0), choppedTrailing(0) -// lastwrapcol(0), -// lastwrappos(0), -// width(0) { } @@ -508,7 +615,7 @@ qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() { } qint16 pivot = (end + start) / 2; - if(wrapList.at(pivot).endX > targetWidth && wordidx != pivot) { + if(wrapList.at(pivot).endX > targetWidth) { end = pivot; } else { start = pivot;