X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=ff28ea4a6eea050edd2c6be66e93670e27ef741e;hp=67415cc3b7f658cbf8255e5424d81be1351e8535;hb=80fcc77b8883ef496fcf0ee9b43cf678232e175c;hpb=22128f214112de5e4f3111e0a90f7d5d99e82dac

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 67415cc3..ff28ea4a 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -22,6 +22,7 @@
 #include <QClipboard>
 #include <QGraphicsSceneMouseEvent>
 #include <QPersistentModelIndex>
+#include <QWebView>
 
 #include "chatitem.h"
 #include "chatline.h"
@@ -38,11 +39,6 @@
 
 const qreal minContentsWidth = 200;
 
-class ClearWebPreviewEvent : public QEvent {
-public:
-  inline ClearWebPreviewEvent() : QEvent(QEvent::User) {}
-};
-
 ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent)
   : QGraphicsScene(0, 0, width, 0, parent),
     _idString(idString),
@@ -66,20 +62,20 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
   int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt();
 
   ChatViewSettings viewSettings(this);
-  firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt();
-  secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt();
+  _firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt();
+  _secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt();
 
-  firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator());
-  addItem(firstColHandle);
-  firstColHandle->setXPos(firstColHandlePos);
-  connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
-  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), firstColHandle, SLOT(sceneRectChanged(const QRectF &)));
+  _firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator());
+  addItem(_firstColHandle);
+  _firstColHandle->setXPos(_firstColHandlePos);
+  connect(_firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
+  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _firstColHandle, SLOT(sceneRectChanged(const QRectF &)));
 
-  secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator());
-  addItem(secondColHandle);
-  secondColHandle->setXPos(secondColHandlePos);
-  connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
-  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), secondColHandle, SLOT(sceneRectChanged(const QRectF &)));
+  _secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator());
+  addItem(_secondColHandle);
+  _secondColHandle->setXPos(_secondColHandlePos);
+  connect(_secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
+  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _secondColHandle, SLOT(sceneRectChanged(const QRectF &)));
 
   setHandleXLimits();
 
@@ -91,8 +87,12 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
   if(model->rowCount() > 0)
     rowsInserted(QModelIndex(), 0, model->rowCount() - 1);
 
+#ifdef HAVE_WEBKIT
   webPreview.delayTimer.setSingleShot(true);
-  connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreview()));
+  connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent()));
+  webPreview.deleteTimer.setInterval(600000);
+  connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
+#endif
 }
 
 ChatScene::~ChatScene() {
@@ -188,6 +188,10 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     }
   }
 
+  // check if all went right
+  Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y());
+  Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y());
+
   if(!atBottom) {
     if(start < _firstLineRow) {
       int prevFirstLineRow = _firstLineRow + (end - start + 1);
@@ -202,7 +206,6 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   if(atBottom || (!atTop && !moveTop)) {
     emit lastLineChanged(_lines.last(), h);
   }
-
 }
 
 void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
@@ -263,6 +266,8 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
     }
   }
 
+  Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y());
+  Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y());
 
   // update sceneRect
   // when searching for the first non-date-line we have to take into account that our
@@ -301,6 +306,10 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
 
 //   clock_t startT = clock();
 
+  // disabling the index while doing this complex updates is about
+  // 2 to 10 times faster!
+  setItemIndexMethod(QGraphicsScene::NoIndex);
+
   qreal linePos = _sceneRect.y() + _sceneRect.height();
   QList<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
@@ -329,6 +338,7 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
       line->setPos(0, linePos);
     }
   }
+  setItemIndexMethod(QGraphicsScene::BspTreeIndex);
 
   updateSceneRect(width);
   setHandleXLimits();
@@ -338,33 +348,33 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
 }
 
 void ChatScene::handlePositionChanged(qreal xpos) {
-  bool first = (sender() == firstColHandle);
+  bool first = (sender() == _firstColHandle);
   qreal oldx;
   if(first) {
-    oldx = firstColHandlePos;
-    firstColHandlePos = xpos;
+    oldx = _firstColHandlePos;
+    _firstColHandlePos = xpos;
   } else {
-    oldx = secondColHandlePos;
-    secondColHandlePos = xpos;
+    oldx = _secondColHandlePos;
+    _secondColHandlePos = xpos;
   }
 
   ChatViewSettings viewSettings(this);
-  viewSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
-  viewSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
+  viewSettings.setValue("FirstColumnHandlePos", _firstColHandlePos);
+  viewSettings.setValue("SecondColumnHandlePos", _secondColHandlePos);
 
   ChatViewSettings defaultSettings;
-  defaultSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
-  defaultSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
+  defaultSettings.setValue("FirstColumnHandlePos", _firstColHandlePos);
+  defaultSettings.setValue("SecondColumnHandlePos", _secondColHandlePos);
 
   setWidth(width(), true);  // readjust all chatlines
   // we get ugly redraw errors if we don't update this explicitly... :(
-  // width() should be the same for both handles, so just use firstColHandle regardless
+  // width() should be the same for both handles, so just use _firstColHandle regardless
   //update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height());
 }
 
 void ChatScene::setHandleXLimits() {
-  firstColHandle->setXLimits(0, secondColHandle->sceneLeft());
-  secondColHandle->setXLimits(firstColHandle->sceneRight(), width() - minContentsWidth);
+  _firstColHandle->setXLimits(0, _secondColHandle->sceneLeft());
+  _secondColHandle->setXLimits(_firstColHandle->sceneRight(), width() - minContentsWidth);
 }
 
 void ChatScene::setSelectingItem(ChatItem *item) {
@@ -383,13 +393,13 @@ void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) {
 void ChatScene::updateSelection(const QPointF &pos) {
   // This is somewhat hacky... we look at the contents item that is at the cursor's y position (ignoring x), since
   // it has the full height. From this item, we can then determine the row index and hence the ChatLine.
-  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(secondColHandle->sceneRight() + 1, pos.y())));
+  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(_secondColHandle->sceneRight() + 1, pos.y())));
   if(!contentItem) return;
 
   int curRow = contentItem->row();
   int curColumn;
-  if(pos.x() > secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn;
-  else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn;
+  if(pos.x() > _secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn;
+  else if(pos.x() > _firstColHandlePos) curColumn = ChatLineModel::SenderColumn;
   else curColumn = ChatLineModel::TimestampColumn;
 
   ChatLineModel::ColumnType minColumn = (ChatLineModel::ColumnType)qMin(curColumn, _selectionStartCol);
@@ -511,9 +521,9 @@ void ChatScene::requestBacklog() {
 }
 
 int ChatScene::sectionByScenePos(int x) {
-  if(x < firstColHandle->x())
+  if(x < _firstColHandle->x())
     return ChatLineModel::TimestampColumn;
-  if(x < secondColHandle->x())
+  if(x < _secondColHandle->x())
     return ChatLineModel::SenderColumn;
 
   return ChatLineModel::ContentsColumn;
@@ -557,14 +567,14 @@ void ChatScene::updateSceneRect(qreal width) {
 void ChatScene::updateSceneRect(const QRectF &rect) {
   _sceneRect = rect;
   setSceneRect(rect);
+  update();
 }
 
 void ChatScene::customEvent(QEvent *event) {
-  if(event->type() != QEvent::User)
+  switch(event->type()) {
+  default:
     return;
-
-  event->accept();
-  clearWebPreviewEvent();
+  }
 }
 
 void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
@@ -579,12 +589,17 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
   if(webPreview.url != url) {
     webPreview.url = url;
     // load a new web view and delete the old one (if exists)
-    if(webPreview.previewItem) {
+    if(webPreview.previewItem && webPreview.previewItem->scene()) {
       removeItem(webPreview.previewItem);
       delete webPreview.previewItem;
     }
     webPreview.previewItem = new WebPreviewItem(url);
     webPreview.delayTimer.start(2000);
+    webPreview.deleteTimer.stop();
+  } else if(webPreview.previewItem && !webPreview.previewItem->scene()) {
+      // we just have to readd the item to the scene
+      webPreview.delayTimer.start(2000);
+      webPreview.deleteTimer.stop();
   }
   if(webPreview.urlRect != urlRect) {
     webPreview.urlRect = urlRect;
@@ -601,31 +616,30 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
 #endif
 }
 
+void ChatScene::showWebPreviewEvent() {
+#ifdef HAVE_WEBKIT
+  if(webPreview.previewItem)
+    addItem(webPreview.previewItem);
+#endif
+}
+
 void ChatScene::clearWebPreview(ChatItem *parentItem) {
 #ifndef HAVE_WEBKIT
   Q_UNUSED(parentItem)
 #else
   if(parentItem == 0 || webPreview.parentItem == parentItem) {
-    // posting an event ensures that the item will not be removed as
-    // the result of another event. this could result in bad segfaults
-    QCoreApplication::postEvent(this, new ClearWebPreviewEvent());
+    if(webPreview.previewItem && webPreview.previewItem->scene()) {
+      removeItem(webPreview.previewItem);
+      webPreview.deleteTimer.start();
+    }
+    webPreview.delayTimer.stop();
   }
 #endif
 }
 
-void ChatScene::showWebPreview() {
-#ifdef HAVE_WEBKIT
-  if(webPreview.previewItem)
-    addItem(webPreview.previewItem);
-#endif
-}
-
-void ChatScene::clearWebPreviewEvent() {
+void ChatScene::deleteWebPreviewEvent() {
 #ifdef HAVE_WEBKIT
   if(webPreview.previewItem) {
-    if(webPreview.previewItem->scene()) {
-      removeItem(webPreview.previewItem);
-    }
     delete webPreview.previewItem;
     webPreview.previewItem = 0;
   }