X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=187b69737364eef559979696c45a91bf35163bc9;hp=aaafd615517cbbd556909751995a306295f24bcd;hb=0ba56e60f400621ddc291669dc2c03a8e461c224;hpb=4c0c5a52458009b578a23d4abb4e726a13550c12

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index aaafd615..187b6973 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -26,18 +26,18 @@
 #include <QDockWidget>
 #include <QModelIndex>
 #include <QStyledItemDelegate>
-#include <QTreeView>
 #include <QPointer>
 
 #include "actioncollection.h"
 #include "bufferviewconfig.h"
 #include "networkmodel.h"
+#include "treeviewtouch.h"
 #include "types.h"
 
 /*****************************************
  * The TreeView showing the Buffers
  *****************************************/
-class BufferView : public QTreeView
+class BufferView : public TreeViewTouch
 {
     Q_OBJECT
 
@@ -59,6 +59,8 @@ public:
     void addActionsToMenu(QMenu *menu, const QModelIndex &index);
     void addFilterActions(QMenu *contextMenu, const QModelIndex &index);
 
+    void selectFirstBuffer();
+
 public slots:
     void setRootIndexForNetworkId(const NetworkId &networkId);
     void removeSelectedBuffers(bool permanently = false);
@@ -66,22 +68,19 @@ public slots:
     void nextBuffer();
     void previousBuffer();
     void hideCurrentBuffer();
+    void filterTextChanged(QString filterString);
 
 signals:
     void removeBuffer(const QModelIndex &);
     void removeBufferPermanently(const QModelIndex &);
 
 protected:
-    virtual void keyPressEvent(QKeyEvent *);
     virtual void dropEvent(QDropEvent *event);
     virtual void rowsInserted(const QModelIndex &parent, int start, int end);
     virtual void wheelEvent(QWheelEvent *);
     virtual QSize sizeHint() const;
     virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
     virtual void contextMenuEvent(QContextMenuEvent *event);
-	virtual bool event(QEvent *event);
-	virtual void mouseMoveEvent(QMouseEvent *event);
-	virtual void mousePressEvent(QMouseEvent *event);
 
 #if QT_VERSION < 0x050000
     virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
@@ -93,7 +92,31 @@ private slots:
     void joinChannel(const QModelIndex &index);
     void toggleHeader(bool checked);
 
+    /**
+     * Expand all active networks and collapse inactive ones unless manually changed
+     *
+     * Applies to all networks.  Shouldn't need called except during initialization.
+     */
+    void setExpandedState();
+
+    /**
+     * Save the current display state of the given network
+     *
+     * Tracks expanded or collapsed and active or inactive.
+     *
+     * @see setExpandedState()
+     * @param[in] networkIdx QModelIndex of the root network to store
+     */
     void storeExpandedState(const QModelIndex &networkIdx);
+
+    /**
+     * Set the display state of the given network according to network status and manual changes
+     *
+     * Expands if active or previously expanded, collapses if inactive or previously collapsed.
+     *
+     * @see storeExpandedState()
+     * @param[in] networkIdx QModelIndex of the root network to update
+     */
     void setExpandedState(const QModelIndex &networkIdx);
 
     void on_configChanged();
@@ -103,8 +126,6 @@ private slots:
 
 private:
     QPointer<BufferViewConfig> _config;
-	qint64 _lastTouchStart = 0;
-	bool _touchScrollInProgress = false;
 
     enum ExpandedState {
         WasExpanded = 0x01,
@@ -146,16 +167,29 @@ public :
     BufferViewConfig *config() const;
     inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
     inline bool isActive() const { return _active; }
+    void setWidget(QWidget *newWidget);
+    QWidget *widget() const { return _childWidget; }
+
+    void activateFilter();
 
 public slots:
     void setActive(bool active = true);
 
+protected slots:
+    virtual bool eventFilter(QObject *object, QEvent *event);
+    virtual void focusInEvent(QFocusEvent*event) { qDebug() << event; }
+
 private slots:
     void bufferViewRenamed(const QString &newName);
     void updateTitle();
+    void configChanged();
+    void onFilterReturnPressed();
 
 private:
-
+    QWidget *_childWidget;
+    QWidget *_widget;
+    QPointer<QWidget> _oldFocusItem; // QPointer in case the old item gets deleted
+    QLineEdit *_filterEdit;
     bool _active;
     QString _title;
 };