X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=f111781ba3aac5ddce10d7ca1f29cfd4b4864a37;hp=f85e34445f41f032037c0b4236ee14aaea9b2090;hb=530908dad5e50d43081c91a9e256a5daafcdce34;hpb=aa2d0a85c3e04a99d46c05512165c20414a669ec

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index f85e3444..f111781b 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,7 +24,10 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QPersistentModelIndex>
-#include <QWebView>
+
+#ifdef HAVE_WEBKIT
+#  include <QWebView>
+#endif
 
 #include "chatitem.h"
 #include "chatline.h"
@@ -34,6 +37,7 @@
 #include "client.h"
 #include "clientbacklogmanager.h"
 #include "columnhandleitem.h"
+#include "contextmenuactionprovider.h"
 #include "iconloader.h"
 #include "messagefilter.h"
 #include "qtui.h"
@@ -48,7 +52,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _chatView(parent),
     _idString(idString),
     _model(model),
-    _singleBufferScene(false),
+    _singleBufferId(BufferId()),
     _sceneRect(0, 0, width, 0),
     _firstLineRow(-1),
     _viewportHeight(0),
@@ -61,8 +65,8 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _leftButtonPressed(false)
 {
   MessageFilter *filter = qobject_cast<MessageFilter*>(model);
-  if(filter) {
-    _singleBufferScene = filter->isSingleBufferFilter();
+  if(filter && filter->isSingleBufferFilter()) {
+    _singleBufferId = filter->singleBufferId();
   }
 
   ChatViewSettings defaultSettings;
@@ -88,20 +92,18 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
 
   setHandleXLimits();
 
+  if(model->rowCount() > 0)
+    rowsInserted(QModelIndex(), 0, model->rowCount() - 1);
+
   connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
           this, SLOT(rowsInserted(const QModelIndex &, int, int)));
   connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
           this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
-
-  if(model->rowCount() > 0)
-    rowsInserted(QModelIndex(), 0, model->rowCount() - 1);
+  connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), SLOT(dataChanged(QModelIndex, QModelIndex)));
 
 #ifdef HAVE_WEBKIT
-  webPreview.delayTimer.setSingleShot(true);
-  connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent()));
-  //webPreview.deleteTimer.setInterval(600000);
-  webPreview.deleteTimer.setInterval(10000);
-  connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
+  webPreview.timer.setSingleShot(true);
+  connect(&webPreview.timer, SIGNAL(timeout()), this, SLOT(webPreviewNextStep()));
 #endif
   _showWebPreview = defaultSettings.showWebPreview();
   defaultSettings.notify("ShowWebPreview", this, SLOT(showWebPreviewChanged()));
@@ -168,7 +170,6 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   qreal width = _sceneRect.width();
   bool atBottom = (start == _lines.count());
   bool atTop = !atBottom && (start == 0);
-  bool moveTop = false;
 
   if(start < _lines.count()) {
     y = _lines.value(start)->y();
@@ -228,25 +229,11 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   }
 
   // neither pre- or append means we have to do dirty work: move items...
-  int moveStart = 0;
-  int moveEnd = _lines.count() - 1;
-  qreal offset = h;
   if(!(atTop || atBottom)) {
-    // move top means: moving 0 to end (aka: end + 1)
-    // move top means: moving end + 1 to _lines.count() - 1 (aka: _lines.count() - (end + 1)
-    if(end + 1 < _lines.count() - end - 1) {
-      // move top part
-      moveTop = true;
-      offset = -offset;
-      moveEnd = end;
-    } else {
-      // move bottom part
-      moveStart = end + 1;
-    }
     ChatLine *line = 0;
-    for(int i = moveStart; i <= moveEnd; i++) {
+    for(int i = 0; i <= end; i++) {
       line = _lines.at(i);
-      line->setPos(0, line->pos().y() + offset);
+      line->setPos(0, line->pos().y() - h);
     }
   }
 
@@ -283,7 +270,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     _firstLineRow = -1;
   }
   updateSceneRect();
-  if(atBottom || (!atTop && !moveTop)) {
+  if(atBottom) {
     emit lastLineChanged(_lines.last(), h);
   }
 }
@@ -379,6 +366,10 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
   updateSceneRect();
 }
 
+void ChatScene::dataChanged(const QModelIndex &tl, const QModelIndex &br) {
+  layout(tl.row(), br.row(), _sceneRect.width());
+}
+
 void ChatScene::updateForViewport(qreal width, qreal height) {
   _viewportHeight = height;
   setWidth(width);
@@ -387,21 +378,37 @@ void ChatScene::updateForViewport(qreal width, qreal height) {
 void ChatScene::setWidth(qreal width) {
   if(width == _sceneRect.width())
     return;
+  layout(0, _lines.count()-1, width);
+}
 
+void ChatScene::layout(int start, int end, qreal width) {
   // clock_t startT = clock();
 
   // disabling the index while doing this complex updates is about
   // 2 to 10 times faster!
   //setItemIndexMethod(QGraphicsScene::NoIndex);
 
-  QList<ChatLine *>::iterator lineIter = _lines.end();
-  QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
-  qreal linePos = _sceneRect.y() + _sceneRect.height();
-  qreal contentsWidth = width - secondColumnHandle()->sceneRight();
-  while(lineIter != lineIterBegin) {
-    lineIter--;
-    (*lineIter)->setGeometryByWidth(width, contentsWidth, linePos);
+  if(end >= 0) {
+    int row = end;
+    qreal linePos = _lines.at(row)->scenePos().y() + _lines.at(row)->height();
+    qreal contentsWidth = width - secondColumnHandle()->sceneRight();
+    while(row >= start) {
+      _lines.at(row--)->setGeometryByWidth(width, contentsWidth, linePos);
+    }
+
+    if(row >= 0) {
+      // remaining items don't need geometry changes, but maybe repositioning?
+      ChatLine *line = _lines.at(row);
+      qreal offset = linePos - (line->scenePos().y() + line->height());
+      if(offset != 0) {
+        while(row >= 0) {
+          line = _lines.at(row--);
+          line->setPos(0, line->scenePos().y() + offset);
+        }
+      }
+    }
   }
+
   //setItemIndexMethod(QGraphicsScene::BspTreeIndex);
 
   updateSceneRect(width);
@@ -416,7 +423,7 @@ void ChatScene::firstHandlePositionChanged(qreal xpos) {
   if(_firstColHandlePos == xpos)
     return;
 
-  _firstColHandlePos = xpos;
+  _firstColHandlePos = xpos >= 0 ? xpos : 0;
   ChatViewSettings viewSettings(this);
   viewSettings.setValue("FirstColumnHandlePos", _firstColHandlePos);
   ChatViewSettings defaultSettings;
@@ -587,6 +594,9 @@ void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
   ChatItem *item = chatItemAt(pos);
   if(item)
     item->addActionsToMenu(&menu, item->mapFromScene(pos));
+  else
+    // no item -> default scene actions
+    GraphicalUi::contextMenuActionProvider()->addActions(&menu, filter(), BufferId());
 
   menu.exec(event->screenPos());
 
@@ -595,7 +605,8 @@ void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
 void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
   if(event->buttons() == Qt::LeftButton) {
     if(!_clickHandled && (event->scenePos() - _clickPos).toPoint().manhattanLength() >= QApplication::startDragDistance()) {
-      if(_clickTimer.isActive()) _clickTimer.stop();
+      if(_clickTimer.isActive())
+        _clickTimer.stop();
       if(_clickMode == SingleClick && isPosOverSelection(_clickPos))
         initiateDrag(event->widget());
       else {
@@ -608,7 +619,7 @@ void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
       updateSelection(event->scenePos());
       emit mouseMoveWhileSelecting(event->scenePos());
       event->accept();
-    } else if(_clickHandled)
+    } else if(_clickHandled && _clickMode < DoubleClick)
       QGraphicsScene::mouseMoveEvent(event);
   } else
     QGraphicsScene::mouseMoveEvent(event);
@@ -623,15 +634,19 @@ void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) {
       clearSelection();
     }
     if(_clickMode != NoClick && _clickTimer.isActive()) {
-      _clickMode = (ClickMode)(_clickMode == TripleClick ? DoubleClick : _clickMode + 1);
-      handleClick(Qt::LeftButton, event->scenePos());
+      switch(_clickMode) {
+        case NoClick: _clickMode = SingleClick; break;
+        case SingleClick: _clickMode = DoubleClick; break;
+        case DoubleClick: _clickMode = TripleClick; break;
+        case TripleClick: _clickMode = DoubleClick; break;
+        case DragStartClick: break;
+      }
+      handleClick(Qt::LeftButton, _clickPos);
     } else {
       _clickMode = SingleClick;
       _clickPos = event->scenePos();
     }
     _clickTimer.start();
-  } else if(event->buttons() == Qt::RightButton) {
-    handleClick(Qt::RightButton, event->scenePos());
   }
   if(event->type() == QEvent::GraphicsSceneMouseDoubleClick)
     QGraphicsScene::mouseDoubleClickEvent(event);
@@ -645,7 +660,7 @@ void ChatScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
-  if(!event->buttons() & Qt::LeftButton) {
+  if(event->button() == Qt::LeftButton && _leftButtonPressed) {
     _leftButtonPressed = false;
     if(_clickMode != NoClick) {
       if(_clickMode == SingleClick)
@@ -702,7 +717,12 @@ void ChatScene::selectionToClipboard(QClipboard::Mode mode) {
   stringToClipboard(selection(), mode);
 }
 
-void ChatScene::stringToClipboard(const QString &str, QClipboard::Mode mode) {
+void ChatScene::stringToClipboard(const QString &str_, QClipboard::Mode mode) {
+  QString str = str_;
+  // remove trailing linefeeds
+  if(str.endsWith('\n'))
+    str.chop(1);
+
   switch(mode) {
     case QClipboard::Clipboard:
       QApplication::clipboard()->setText(str);
@@ -843,82 +863,130 @@ bool ChatScene::event(QEvent *e) {
   return QGraphicsScene::event(e);
 }
 
-/******** WEB PREVIEW *****************************************************************************/
-
-void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
-#ifndef HAVE_WEBKIT
-  Q_UNUSED(parentItem)
-  Q_UNUSED(url)
-  Q_UNUSED(urlRect)
-#else
+// ========================================
+//  Webkit Only stuff
+// ========================================
+#ifdef HAVE_WEBKIT
+void ChatScene::loadWebPreview(ChatItem *parentItem, const QUrl &url, const QRectF &urlRect) {
   if(!_showWebPreview)
     return;
 
+  if(webPreview.urlRect != urlRect)
+    webPreview.urlRect = urlRect;
+
   if(webPreview.parentItem != parentItem)
     webPreview.parentItem = parentItem;
 
   if(webPreview.url != url) {
     webPreview.url = url;
-    // load a new web view and delete the old one (if exists)
-    if(webPreview.previewItem && webPreview.previewItem->scene()) {
-      removeItem(webPreview.previewItem);
+    // prepare to load a different URL
+    if(webPreview.previewItem) {
+      if(webPreview.previewItem->scene())
+	removeItem(webPreview.previewItem);
       delete webPreview.previewItem;
+      webPreview.previewItem = 0;
     }
-    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;
-    qreal previewY = urlRect.bottom();
-    qreal previewX = urlRect.x();
-    if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom())
-      previewY = urlRect.y() - webPreview.previewItem->boundingRect().height();
-
-    if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width())
-      previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width();
-
-    webPreview.previewItem->setPos(previewX, previewY);
+    webPreview.previewState = WebPreview::NoPreview;
   }
-#endif
-}
 
-void ChatScene::showWebPreviewEvent() {
-#ifdef HAVE_WEBKIT
-  if(webPreview.previewItem)
-    addItem(webPreview.previewItem);
-#endif
-}
+  if(webPreview.url.isEmpty())
+    return;
 
-void ChatScene::clearWebPreview(ChatItem *parentItem) {
-#ifndef HAVE_WEBKIT
-  Q_UNUSED(parentItem)
-#else
-  if(parentItem == 0 || webPreview.parentItem == parentItem) {
-    if(webPreview.previewItem && webPreview.previewItem->scene()) {
+  // qDebug() << Q_FUNC_INFO << webPreview.previewState;
+  switch(webPreview.previewState) {
+  case WebPreview::NoPreview:
+    webPreview.previewState = WebPreview::NewPreview;
+    webPreview.timer.start(500);
+    break;
+  case WebPreview::NewPreview:
+  case WebPreview::DelayPreview:
+  case WebPreview::ShowPreview:
+    // we're already waiting for the next step or showing the preview
+    break;
+  case WebPreview::HidePreview:
+    // we still have a valid preview
+    webPreview.previewState = WebPreview::DelayPreview;
+    webPreview.timer.start(1000);
+    break;
+  }
+  // qDebug() << "  new State:" << webPreview.previewState << webPreview.timer.isActive();
+}
+
+void ChatScene::webPreviewNextStep() {
+  // qDebug() << Q_FUNC_INFO << webPreview.previewState;
+  switch(webPreview.previewState) {
+  case WebPreview::NoPreview:
+    break;
+  case WebPreview::NewPreview:
+    Q_ASSERT(!webPreview.previewItem);
+    webPreview.previewItem = new WebPreviewItem(webPreview.url);
+    webPreview.previewState = WebPreview::DelayPreview;
+    webPreview.timer.start(1000);
+    break;
+  case WebPreview::DelayPreview:
+    Q_ASSERT(webPreview.previewItem);
+    // calc position and show
+    {
+      qreal previewY = webPreview.urlRect.bottom();
+      qreal previewX = webPreview.urlRect.x();
+      if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom())
+	previewY = webPreview.urlRect.y() - webPreview.previewItem->boundingRect().height();
+
+      if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width())
+	previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width();
+
+      webPreview.previewItem->setPos(previewX, previewY);
+    }
+    addItem(webPreview.previewItem);
+    webPreview.previewState = WebPreview::ShowPreview;
+    break;
+  case WebPreview::ShowPreview:
+    qWarning() << "ChatScene::webPreviewNextStep() called while in ShowPreview Step!";
+    qWarning() << "removing preview";
+    if(webPreview.previewItem && webPreview.previewItem->scene())
       removeItem(webPreview.previewItem);
-      webPreview.deleteTimer.start();
+    // Fall through to deletion!
+  case WebPreview::HidePreview:
+    if(webPreview.previewItem) {
+      delete webPreview.previewItem;
+      webPreview.previewItem = 0;
     }
-    webPreview.delayTimer.stop();
+    webPreview.parentItem = 0;
+    webPreview.url = QUrl();
+    webPreview.urlRect = QRectF();
+    webPreview.previewState = WebPreview::NoPreview;
   }
-#endif
+  // qDebug() << "  new State:" << webPreview.previewState << webPreview.timer.isActive();
 }
 
-void ChatScene::deleteWebPreviewEvent() {
-#ifdef HAVE_WEBKIT
-  if(webPreview.previewItem) {
-    delete webPreview.previewItem;
-    webPreview.previewItem = 0;
-  }
-  webPreview.parentItem = 0;
-  webPreview.url = QString();
-  webPreview.urlRect = QRectF();
-#endif
+void ChatScene::clearWebPreview(ChatItem *parentItem) {
+  // qDebug() << Q_FUNC_INFO << webPreview.previewState;
+  switch(webPreview.previewState) {
+  case WebPreview::NewPreview:
+    webPreview.previewState = WebPreview::NoPreview; // we haven't loaded anything yet
+    break;
+  case WebPreview::ShowPreview:
+    if(parentItem == 0 || webPreview.parentItem == parentItem) {
+      if(webPreview.previewItem && webPreview.previewItem->scene())
+	removeItem(webPreview.previewItem);
+    }
+    // fall through into to set hidden state
+  case WebPreview::DelayPreview:
+    // we're just loading, so haven't shown the preview yet.
+    webPreview.previewState = WebPreview::HidePreview;
+    webPreview.timer.start(5000);
+    break;
+  case WebPreview::NoPreview:
+  case WebPreview::HidePreview:
+    break;
+  }
+  // qDebug() << "  new State:" << webPreview.previewState << webPreview.timer.isActive();
 }
+#endif
+
+// ========================================
+//  end of webkit only
+// ========================================
 
 void ChatScene::showWebPreviewChanged() {
   ChatViewSettings settings;