hovering over a url now shows a thumbnail preview

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 253268e..2ee0aa4 100644 (file)
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -47,6 +47,7 @@ set(MOC_HDRS
     aboutdlg.h
     bufferwidget.h
     channellistdlg.h
     aboutdlg.h
     bufferwidget.h
     channellistdlg.h

+    chatitem.h

     chatlinemodel.h
     chatmonitorfilter.h
     chatmonitorview.h
     chatlinemodel.h
     chatmonitorfilter.h
     chatmonitorview.h


@@ -75,7 +76,6 @@ set(MOC_HDRS
     verticaldock.h)
 
 set(HEADERS
     verticaldock.h)
 
 set(HEADERS

-    chatitem.h

     chatline.h
     chatlinemodelitem.h
     chatviewsettings.h
     chatline.h
     chatlinemodelitem.h
     chatviewsettings.h

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 13cae26..758de8d 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -26,6 +26,8 @@
 #include <QPainter>
 #include <QPalette>
 #include <QTextLayout>
 #include <QPainter>
 #include <QPalette>
 #include <QTextLayout>

+#include <QWebView>
+#include <QGraphicsProxyWidget>

 
 #include "chatitem.h"
 #include "chatlinemodel.h"
 
 #include "chatitem.h"
 #include "chatlinemodel.h"


@@ -274,9 +276,7 @@ qreal ContentsChatItem::setGeometryByWidth(qreal w) {
 
 void ContentsChatItem::updateLayout() {
   if(!privateData()) {
 
 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);
   }
 
     setPrivateData(data);
   }
 


@@ -378,9 +378,10 @@ QVector<QTextLayout::FormatRange> ContentsChatItem::additionalFormats() const {
 }
 
 void ContentsChatItem::endHoverMode() {
 }
 
 void ContentsChatItem::endHoverMode() {

-  if(privateData()->currentClickable.isValid()) {
+  if(hasLayout() && privateData()->currentClickable.isValid()) {

     setCursor(Qt::ArrowCursor);
     privateData()->currentClickable = Clickable();
     setCursor(Qt::ArrowCursor);
     privateData()->currentClickable = Clickable();

+    privateData()->clearPreview();

     update();
   }
 }
     update();
   }
 }


@@ -398,6 +399,8 @@ void ContentsChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
       QString str = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length);
       switch(click.type) {
         case Clickable::Url:
       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:
           QDesktopServices::openUrl(str);
           break;
         case Clickable::Channel:


@@ -415,7 +418,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
   // 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);
     && (event->buttonDownScreenPos(Qt::LeftButton) - event->screenPos()).manhattanLength() >= QApplication::startDragDistance())
     privateData()->hasDragged = true;
   ChatItem::mouseMoveEvent(event);


@@ -432,9 +435,23 @@ 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) {
   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;
         onClickable = true;

-      else if(click.type == Clickable::Channel) {
+
+       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);
+      } else if(click.type == Clickable::Channel) {

         // TODO: don't make clickable if it's our own name
         //onClickable = true; //FIXME disabled for now
       }
         // TODO: don't make clickable if it's our own name
         //onClickable = true; //FIXME disabled for now
       }


@@ -450,6 +467,89 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
   event->accept();
 }
 
   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();
+
+  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);
+}
+

 /*************************************************************************************************/
 
 ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item)
 /*************************************************************************************************/
 
 ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item)

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index c5bb533..b6e8a9c 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -197,11 +197,50 @@ struct ContentsChatItem::Clickable {
 };
 
 struct ContentsChatItemPrivate : ChatItemPrivate {
 };
 
 struct ContentsChatItemPrivate : ChatItemPrivate {

+  ContentsChatItem *contentsItem;

   QList<ContentsChatItem::Clickable> clickables;
   ContentsChatItem::Clickable currentClickable;
   bool hasDragged;
 
   QList<ContentsChatItem::Clickable> clickables;
   ContentsChatItem::Clickable currentClickable;
   bool hasDragged;
 

-  ContentsChatItemPrivate(QTextLayout *l, const QList<ContentsChatItem::Clickable> &c) : ChatItemPrivate(l), clickables(c), hasDragged(false) {}
+  ContentsChatItemPrivate(QTextLayout *l, const QList<ContentsChatItem::Clickable> &c, ContentsChatItem *parent) : ChatItemPrivate(l), contentsItem(parent), clickables(c), hasDragged(false), controller(0) {}
+  ~ContentsChatItemPrivate();
+
+  void loadWebPreview(const QString &url, const QRectF &urlRect);
+  void clearPreview();
+
+private:
+  class PreviewController;
+  class PreviewItem;
+  PreviewController *controller;
+};
+
+class ContentsChatItemPrivate::PreviewController : public QObject {
+  Q_OBJECT
+public:
+  PreviewController(ContentsChatItem *contentsItem) : contentsItem(contentsItem), previewItem(0) {}
+  ~PreviewController();
+
+  void loadPage(const QString &url, const QRectF &urlRect);
+
+private slots:
+  void pageLoaded(bool success);
+
+private:
+  ContentsChatItem *contentsItem;
+  ContentsChatItemPrivate::PreviewItem *previewItem;
+
+  QString url;
+};
+
+class QWebView;
+class ContentsChatItemPrivate::PreviewItem : public QGraphicsItem {
+public:
+  PreviewItem(QWebView *webView);
+  virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+  virtual inline QRectF boundingRect() const { return _boundingRect; }
+
+private:
+  QRectF _boundingRect;

 };
 
 //inlines regarding ContentsChatItemPrivate
 };
 
 //inlines regarding ContentsChatItemPrivate

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index db4149a..14c782f 100644 (file)
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -51,6 +51,7 @@ ChatLine::ChatLine(int row, QAbstractItemModel *model,
 {
   Q_ASSERT(model);
   QModelIndex index = model->index(row, ChatLineModel::ContentsColumn);
 {
   Q_ASSERT(model);
   QModelIndex index = model->index(row, ChatLineModel::ContentsColumn);

+  setZValue(0);

   setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight);
 }
 
   setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight);
 }
 

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 6037c98..22150dd 100644 (file)
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -50,7 +50,7 @@ void ChatView::init(MessageFilter *filter) {
   setAlignment(Qt::AlignBottom);
   setInteractive(true);
   //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
   setAlignment(Qt::AlignBottom);
   setInteractive(true);
   //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);

-  setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
+  // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);

   setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
   setTransformationAnchor(QGraphicsView::NoAnchor);
 
   setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
   setTransformationAnchor(QGraphicsView::NoAnchor);