X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.h;h=c54c1862427b5fc54f4f98f4ca0e524b1d996636;hp=41fb51a97c2f6c43a8f177f8a406a3a902365713;hb=15d94f850d7e82b9f9f65ec162d9db13f750d23f;hpb=db511df7b183771ae444f14d0aca42381ee0ae37

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index 41fb51a9..c54c1862 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-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,6 +36,7 @@ class ChatItem;
 class ChatLine;
 class ChatView;
 class ColumnHandleItem;
+class MarkerLineItem;
 class WebPreviewItem;
 
 class QGraphicsSceneMouseEvent;
@@ -57,7 +58,8 @@ public:
     ContentsChatItemType,
     SearchHighlightType,
     WebPreviewType,
-    ColumnHandleType
+    ColumnHandleType,
+    MarkerLineType
   };
 
   enum ClickMode {
@@ -72,6 +74,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,7 +84,25 @@ public:
 
   ChatView *chatView() const;
   ChatItem *chatItemAt(const QPointF &pos) const;
-  inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
+  inline ChatLine *chatLine(int row) const { return (row < _lines.count()) ? _lines.value(row) : 0; }
+  inline ChatLine *chatLine(const QModelIndex &index) const { return _lines.value(index.row()); }
+
+  //! Find the ChatLine belonging to a MsgId
+  /** Searches for the ChatLine belonging to a MsgId. If there are more than one ChatLine with the same msgId,
+   *  the first one is returned.
+   *  Note that this method performs a binary search, hence it has as complexity of O(log n).
+   *  If matchExact is false, and we don't have an exact match for the given msgId, we return the visible line right
+   *  above the requested one.
+   *  \param msgId      The message ID to look for
+   *  \param matchExact Whether we find only exact matches
+   *  \param ignoreDayChange Whether we ignore day change messages
+   *  \return The ChatLine corresponding to the given MsgId
+   */
+  ChatLine *chatLine(MsgId msgId, bool matchExact = true, bool ignoreDayChange = true) const;
+
+  inline ChatLine *lastLine() const { return _lines.count() ? _lines.last() : 0; }
+
+  inline MarkerLineItem *markerLine() const { return _markerLine; }
 
   inline bool isSingleBufferScene() const { return _singleBufferId.isValid(); }
   inline BufferId singleBufferId() const { return _singleBufferId; }
@@ -102,11 +123,14 @@ public:
 
   bool isScrollingAllowed() const;
 
-  virtual bool event(QEvent *e);
-
  public slots:
   void updateForViewport(qreal width, qreal height);
   void setWidth(qreal width);
+  void layout(int start, int end, qreal width);
+
+  void setMarkerLineVisible(bool visible = true);
+  void setMarkerLine(MsgId msgId = MsgId());
+  void jumpToMarkerLine(bool requestBacklog);
 
   // these are used by the chatitems to notify the scene and manage selections
   void setSelectingItem(ChatItem *item);
@@ -119,8 +143,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);
@@ -138,14 +164,18 @@ 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 rowsRemoved();
+
   void clickTimeout();
 
 private:
@@ -167,6 +197,9 @@ private:
   void updateSceneRect(const QRectF &rect);
   qreal _viewportHeight;
 
+  MarkerLineItem *_markerLine;
+  bool _markerLineVisible, _markerLineValid, _markerLineJumpPending;
+
   ColumnHandleItem *_firstColHandle, *_secondColHandle;
   qreal _firstColHandlePos, _secondColHandlePos;
   CutoffMode _cutoffMode;
@@ -186,16 +219,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