X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=e0ab0194bb30e26426b78cec6f643ffbf9fec765;hp=072ae1b08419da6b13e4800375613d37b3572ae9;hb=8e871e8a152cfefff248c9284cc18530a332a58d;hpb=339ed024e6cf074108e39360e7db58ea0961761b

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 072ae1b0..e0ab0194 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -26,10 +26,6 @@
 #include <QPainter>
 #include <QPalette>
 #include <QTextLayout>
-#ifdef HAVE_WEBKIT
-#include <QWebView>
-#endif
-#include <QGraphicsProxyWidget>
 
 #include "chatitem.h"
 #include "chatlinemodel.h"
@@ -123,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<ChatLineModel::WrapList>();
+//     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<MsgId>().toInt());
+//     QPointF bottomPoint = boundingRect().bottomLeft();
+//     bottomPoint.ry() -= 2;
+//     painter->drawText(bottomPoint, msgIdString);
+//   }
+  // 3) draw bounding rect
 //   painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1));
 }
 
@@ -385,9 +392,7 @@ void ContentsChatItem::endHoverMode() {
       setCursor(Qt::ArrowCursor);
       privateData()->currentClickable = Clickable();
     }
-#ifdef HAVE_WEBKIT
     clearWebPreview();
-#endif
     update();
   }
 }
@@ -443,9 +448,7 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
     if(idx >= click.start && idx < click.start + click.length) {
       if(click.type == Clickable::Url) {
         onClickable = true;
-#ifdef HAVE_WEBKIT
 	showWebPreview(click);
-#endif
       } else if(click.type == Clickable::Channel) {
         // TODO: don't make clickable if it's our own name
         //onClickable = true; //FIXME disabled for now
@@ -462,8 +465,8 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
   event->accept();
 }
 
-#ifdef HAVE_WEBKIT
 void ContentsChatItem::showWebPreview(const Clickable &click) {
+#ifdef HAVE_WEBKIT
   if(!hasLayout())
     updateLayout();
 
@@ -472,96 +475,22 @@ void ContentsChatItem::showWebPreview(const Clickable &click) {
   qreal width = line.cursorToX(click.start + click.length) - x;
   qreal height = line.height();
   qreal y = height * line.lineNumber();
-  QRectF urlRect(x, y, width, height);
+
+  QPointF topLeft = scenePos() + QPointF(x, y);
+  QRectF urlRect = QRectF(topLeft.x(), topLeft.y(), width, height);
+
   QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length);
   if(!url.contains("://"))
     url = "http://" + url;
-  privateData()->loadWebPreview(url, urlRect);
+  chatScene()->loadWebPreview(this, url, urlRect);
+#endif
 }
 
 void ContentsChatItem::clearWebPreview() {
-  if(hasLayout())
-    privateData()->clearWebPreview();
-}
-#endif
-
-// ****************************************
-// ContentsChatItemPrivate
-// ****************************************
 #ifdef HAVE_WEBKIT
-ContentsChatItemPrivate::~ContentsChatItemPrivate() {
-  clearWebPreview();
-}
-
-void ContentsChatItemPrivate::loadWebPreview(const QString &url, const QRectF &urlRect) {
-  if(url != previewUrl) {
-    previewUrl = url;
-    // load a new web view and delete the old one (if exists)
-    if(previewItem) {
-      contentsItem->scene()->removeItem(previewItem);
-      delete previewItem;
-    }
-    QWebView *view = new QWebView;
-    view->load(url);
-    previewItem = new ContentsChatItemPrivate::PreviewItem(view);
-    contentsItem->scene()->addItem(previewItem);
-  }
-  if(urlRect != previewUrlRect) {
-    previewUrlRect = urlRect;
-    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);
-  }
-}
-
-void ContentsChatItemPrivate::clearWebPreview() {
-  if(previewItem) {
-    contentsItem->scene()->removeItem(previewItem);
-    delete previewItem;
-    previewItem = 0;
-  }
-  previewUrl = QString();
-  previewUrlRect = QRectF();
-}
-
-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);
+  chatScene()->clearWebPreview(this);
+#endif
 }
-#endif // #ifdef HAVE_WEBKIT
 
 /*************************************************************************************************/