X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.h;h=7bf5be3ad2ec292c1e931d6d1833604d078e90d5;hp=b40561e7ea077e16cd8ca3d16fc5e59334b364a6;hb=e052c6532456d818b804ce726c8a6e66c81ad8a0;hpb=a06b72f5cc0ff48e7f00de7a7e45ee11c2bba16b

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index b40561e7..7bf5be3a 100644
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -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  *
@@ -62,8 +62,8 @@ public:
 
   enum ClickMode {
     NoClick,
-    SingleClick,
     DragStartClick,
+    SingleClick,
     DoubleClick,
     TripleClick
   };
@@ -72,6 +72,7 @@ public:
   virtual ~ChatScene();
 
   inline QAbstractItemModel *model() const { return _model; }
+  inline MessageFilter *filter() const { return qobject_cast<MessageFilter*>(_model); }
   inline QString idString() const { return _idString; }
 
   int rowByScenePos(qreal y) const;
@@ -81,10 +82,11 @@ public:
 
   ChatView *chatView() const;
   ChatItem *chatItemAt(const QPointF &pos) const;
+  inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
 
-  inline bool isSingleBufferScene() const { return _singleBufferScene; }
+  inline bool isSingleBufferScene() const { return _singleBufferId.isValid(); }
+  inline BufferId singleBufferId() const { return _singleBufferId; }
   bool containsBuffer(const BufferId &id) const;
-  inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
 
   ColumnHandleItem *firstColumnHandle() const;
   ColumnHandleItem *secondColumnHandle() const;
@@ -106,6 +108,7 @@ public:
  public slots:
   void updateForViewport(qreal width, qreal height);
   void setWidth(qreal width);
+  void layout(int start, int end, qreal width);
 
   // these are used by the chatitems to notify the scene and manage selections
   void setSelectingItem(ChatItem *item);
@@ -118,8 +121,10 @@ public:
 
   void requestBacklog();
 
-  void loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect);
+#ifdef HAVE_WEBKIT
+  void loadWebPreview(ChatItem *parentItem, const QUrl &url, const QRectF &urlRect);
   void clearWebPreview(ChatItem *parentItem = 0);
+#endif
 
 signals:
   void lastLineChanged(QGraphicsItem *item, qreal offset);
@@ -137,12 +142,14 @@ protected:
 protected slots:
   void rowsInserted(const QModelIndex &, int, int);
   void rowsAboutToBeRemoved(const QModelIndex &, int, int);
+  void dataChanged(const QModelIndex &, const QModelIndex &);
 
 private slots:
   void firstHandlePositionChanged(qreal xpos);
   void secondHandlePositionChanged(qreal xpos);
-  void showWebPreviewEvent();
-  void deleteWebPreviewEvent();
+#ifdef HAVE_WEBKIT
+  void webPreviewNextStep();
+#endif
   void showWebPreviewChanged();
 
   void clickTimeout();
@@ -155,7 +162,7 @@ private:
   QString _idString;
   QAbstractItemModel *_model;
   QList<ChatLine *> _lines;
-  bool _singleBufferScene;
+  BufferId _singleBufferId;
 
   // calls to QChatScene::sceneRect() are very expensive. As we manage the scenerect ourselves
   // we store the size in a member variable.
@@ -185,16 +192,25 @@ private:
 
   bool _showWebPreview;
 
+#ifdef HAVE_WEBKIT
   struct WebPreview {
+    enum PreviewState {
+      NoPreview,
+      NewPreview,
+      DelayPreview,
+      ShowPreview,
+      HidePreview
+    };
     ChatItem *parentItem;
     QGraphicsItem *previewItem;
-    QString url;
+    QUrl url;
     QRectF urlRect;
-    QTimer delayTimer;
-    QTimer deleteTimer;
-    WebPreview() : parentItem(0), previewItem(0) {}
+    PreviewState previewState;
+    QTimer timer;
+    WebPreview() : parentItem(0), previewItem(0), previewState(NoPreview) {}
   };
   WebPreview webPreview;
+#endif // HAVE_WEBKIT
 };
 
 #endif