current highlighted search result is no longer reset when the search string changes...

[quassel.git] / src / qtui / bufferwidget.h

diff --git a/src/qtui/bufferwidget.h b/src/qtui/bufferwidget.h
index 40413b3..1d70c27 100644 (file)
--- a/src/qtui/bufferwidget.h
+++ b/src/qtui/bufferwidget.h
@@ -18,63 +18,46 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _BUFFERWIDGET_H_
-#define _BUFFERWIDGET_H_
+#ifndef BUFFERWIDGET_H_
+#define BUFFERWIDGET_H_
 
 #include "ui_bufferwidget.h"
 
-#include "chatview.h"
-#include "types.h"
+#include "abstractbuffercontainer.h"
 
-class Network;
-class ChatView;
-class ChatWidget;
+class QGraphicsItem;
+class ChatViewSearchBar;
+class ChatViewSearchController;
 
-#include "buffermodel.h"
-#include <QItemSelectionModel>
-
-//! Displays the contents of a Buffer.
-/**
-*/
-class BufferWidget : public QWidget {
+class BufferWidget : public AbstractBufferContainer {
   Q_OBJECT
 
 public:
-  BufferWidget(QWidget *parent = 0);
-  virtual ~BufferWidget();
-  void init();
+  BufferWidget(QWidget *parent);
+  ~BufferWidget();
+
+  virtual bool eventFilter(QObject *watched, QEvent *event);
 
-  inline BufferModel *model() { return _bufferModel; }
-  void setModel(BufferModel *bufferModel);
+  inline ChatViewSearchBar *searchBar() const { return ui.searchBar; }
 
-  inline QItemSelectionModel *selectionModel() const { return _selectionModel; }
-  void setSelectionModel(QItemSelectionModel *selectionModel);
+protected:
+  virtual AbstractChatView *createChatView(BufferId);
+  virtual void removeChatView(BufferId);
 
-  inline BufferId currentBuffer() const { return _currentBuffer; }
-  
 protected slots:
-//   virtual void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint);
-//   virtual void commitData(QWidget *editor);
-  virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-//   virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-//   virtual void editorDestroyed(QObject *editor);
-  virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
-//   virtual void rowsInserted(const QModelIndex &parent, int start, int end);
-//   virtual void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+  virtual void showChatView(BufferId);
 
 private slots:
-  void removeBuffer(BufferId bufferId);
-  void setCurrentBuffer(BufferId bufferId);
+  void scrollToHighlight(QGraphicsItem *highlightItem);
+  void zoomIn();
+  void zoomOut();
+  void zoomNormal();
 
 private:
   Ui::BufferWidget ui;
-  QHash<BufferId, ChatWidget *> _chatWidgets;
-  QHash<BufferId, ChatView *> _chatViews;
-
-  QPointer<BufferModel> _bufferModel;
-  QPointer<QItemSelectionModel> _selectionModel;
+  QHash<BufferId, QWidget *> _chatViews;
 
-  BufferId _currentBuffer;
+  ChatViewSearchController *_chatViewSearchController;
 };
 
 #endif