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

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index a06c1f08..187b6973 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -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);
@@ -73,7 +75,6 @@ signals:
     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 *);
@@ -91,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();
@@ -145,16 +170,25 @@ public :
     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;