X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.h;h=66e09085f0d2237989ee727106fb9cde526326b0;hp=51b6ff0a1d4c4fd6ae92865ebee8f952bf02264a;hb=4ff76cab24698482ce759cb40a903b9bc26c8fae;hpb=49f966fd9c04f3aa3149be73bb61b8e1781ce1c2

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index 51b6ff0a..66e09085 100644
--- a/src/qtui/chatviewsearchcontroller.h
+++ b/src/qtui/chatviewsearchcontroller.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,90 +15,104 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef CHATVIEWSEARCHCONTROLLER_H
 #define CHATVIEWSEARCHCONTROLLER_H
 
-#include <QObject>
+#include <QGraphicsItem>
 #include <QHash>
 #include <QPointer>
 #include <QString>
 #include <QTimeLine>
 
+#include "chatscene.h"
 #include "message.h"
 
 class QGraphicsItem;
 class ChatLine;
-class ChatScene;
 class SearchHighlightItem;
 
-class ChatViewSearchController : public QObject {
-  Q_OBJECT
+class ChatViewSearchController : public QObject
+{
+    Q_OBJECT
 
 public:
-  ChatViewSearchController(QObject *parent = 0);
+    ChatViewSearchController(QObject *parent = 0);
 
-  inline const QString &searchString() const { return _searchString; }
+    inline const QString &searchString() const { return _searchString; }
 
-  void setScene(ChatScene *scene);
+    void setScene(ChatScene *scene);
 
 public slots:
-  void setSearchString(const QString &searchString);
-  void setCaseSensitive(bool caseSensitive);
-  void setSearchSenders(bool searchSenders);
-  void setSearchMsgs(bool searchMsgs);
-  void setSearchOnlyRegularMsgs(bool searchOnlyRegularMsgs);
+    void setSearchString(const QString &searchString);
+    void setCaseSensitive(bool caseSensitive);
+    void setSearchSenders(bool searchSenders);
+    void setSearchMsgs(bool searchMsgs);
+    void setSearchOnlyRegularMsgs(bool searchOnlyRegularMsgs);
 
-  void highlightNext();
-  void highlightPrev();
+    void highlightNext();
+    void highlightPrev();
 
 private slots:
-  void sceneDestroyed();
-  void updateHighlights(bool reuse = false);
+    void sceneDestroyed();
+    void updateHighlights(bool reuse = false);
+
+    void repositionHighlights();
+    void repositionHighlights(ChatLine *line);
 
 signals:
-  void newCurrentHighlight(QGraphicsItem *highlightItem);
+    void newCurrentHighlight(QGraphicsItem *highlightItem);
 
 private:
-  QString _searchString;
-  ChatScene *_scene;
-  QList<SearchHighlightItem *> _highlightItems;
-  int _currentHighlight;
+    QString _searchString;
+    ChatScene *_scene;
+    QList<SearchHighlightItem *> _highlightItems;
+    int _currentHighlight;
 
-  bool _caseSensitive;
-  bool _searchSenders;
-  bool _searchMsgs;
-  bool _searchOnlyRegularMsgs;
+    bool _caseSensitive;
+    bool _searchSenders;
+    bool _searchMsgs;
+    bool _searchOnlyRegularMsgs;
 
-  inline Qt::CaseSensitivity caseSensitive() const { return _caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; }
+    inline Qt::CaseSensitivity caseSensitive() const { return _caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; }
 
-  inline bool checkType(Message::Type type) const { return type & (Message::Plain | Message::Notice | Message::Action); }
-  void highlightLine(ChatLine *line);
+    inline bool checkType(Message::Type type) const { return type & (Message::Plain | Message::Notice | Message::Action); }
+
+    void checkMessagesForHighlight(int start = 0, int end = -1);
+    void highlightLine(ChatLine *line);
+    void updateHighlights(ChatLine *line);
 };
 
 
 // Highlight Items
-#include <QGraphicsItem>
+class SearchHighlightItem : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
 
-class SearchHighlightItem : public QObject, public QGraphicsItem {
-  Q_OBJECT
+public :
+        SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent = 0);
+    virtual inline QRectF boundingRect() const { return _boundingRect; }
+    void updateGeometry(qreal width, qreal height);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+    enum { Type = ChatScene::SearchHighlightType };
+    virtual inline int type() const { return Type; }
 
-public:
-  SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent = 0);
-  inline virtual QRectF boundingRect() const { return _boundingRect; }
-  virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-  void setHighlighted(bool highlighted);
+    void setHighlighted(bool highlighted);
+
+    static bool firstInLine(QGraphicsItem *item1, QGraphicsItem *item2);
 
 private slots:
-  void updateHighlight(qreal value);
+    void updateHighlight(qreal value);
 
 private:
-  QRectF _boundingRect;
-  bool _highlighted;
-  qreal _alpha;
-  QTimeLine _timeLine;
+    QRectF _boundingRect;
+    bool _highlighted;
+    int _alpha;
+    QTimeLine _timeLine;
 };
 
+
 #endif //CHATVIEWSEARCHCONTROLLER_H