X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=d0ac2100091b2507bc541b1704ae37f4a17b0eeb;hp=b47904a6ba3e34a0dd7738ae292c3c45aa0da9f6;hb=8b896450a5fc56a2bde37b44e81dc5af6c338be1;hpb=a1bcca1c86e88406a0c5495b08731e6b11dd987e

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index b47904a6..d0ac2100 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -37,97 +37,107 @@
  * The TreeView showing the Buffers
  *****************************************/
 class BufferView : public QTreeView {
-    Q_OBJECT
-
-  public:
-    BufferView(QWidget *parent = 0);
-    void init();
-
-    void setModel(QAbstractItemModel *model);
-    void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
-    virtual void setSelectionModel(QItemSelectionModel *selectionModel);
-
-    void setConfig(BufferViewConfig *config);
-    inline BufferViewConfig *config() { return _config; }
-
-  public slots:
-    void setRootIndexForNetworkId(const NetworkId &networkId);
-    void removeSelectedBuffers(bool permanently = false);
-
-  signals:
-    void removeBuffer(const QModelIndex &);
-    void removeBufferPermanently(const QModelIndex &);
-
-  protected:
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual void rowsInserted(const QModelIndex & parent, int start, int end);
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-    virtual void wheelEvent(QWheelEvent *);
-    virtual QSize sizeHint() const;
-    virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
-    virtual void contextMenuEvent(QContextMenuEvent *event);
-
-  private slots:
-    void joinChannel(const QModelIndex &index);
-    void toggleHeader(bool checked);
-    //  void showContextMenu(const QPoint &);
-    void layoutChanged();
-
-  private:
-    enum ItemActiveState {
-      InactiveState = 0x01,
-      ActiveState = 0x02
-    };
-  public:
-    Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState);
-
-  private:
-    QPointer<BufferViewConfig> _config;
-
-    QAction _connectNetAction;
-    QAction _disconnectNetAction;
-    QAction _joinChannelAction;
-
-    QAction _joinBufferAction;
-    QAction _partBufferAction;
-    QAction _hideBufferTemporarilyAction;
-    QAction _hideBufferPermanentlyAction;
-    QAction _removeBufferAction;
-    QAction _ignoreListAction;
-
-    QAction _hideJoinAction;
-    QAction _hidePartAction;
-    QAction _hideKillAction;
-    QAction _hideQuitAction;
-    QAction _hideModeAction;
-
-    bool checkRequirements(const QModelIndex &index,
-                           ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
-    void addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index,
-                       ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
-    void addItemToMenu(QAction &action, QMenu &menu, bool condition = true);
-    void addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index,
-                       ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
-    void addSeparatorToMenu(QMenu &menu, const QModelIndex &index,
-                            ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
-    QMenu *createHideEventsSubMenu(QMenu &menu);
+  Q_OBJECT
+
+public:
+  BufferView(QWidget *parent = 0);
+  void init();
+
+  void setModel(QAbstractItemModel *model);
+  void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
+  virtual void setSelectionModel(QItemSelectionModel *selectionModel);
+
+  void setConfig(BufferViewConfig *config);
+  inline BufferViewConfig *config() { return _config; }
+
+public slots:
+  void setRootIndexForNetworkId(const NetworkId &networkId);
+  void removeSelectedBuffers(bool permanently = false);
+
+signals:
+  void removeBuffer(const QModelIndex &);
+  void removeBufferPermanently(const QModelIndex &);
+
+protected:
+  virtual void keyPressEvent(QKeyEvent *);
+  virtual void rowsInserted(const QModelIndex & parent, int start, int end);
+  virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+  virtual void wheelEvent(QWheelEvent *);
+  virtual QSize sizeHint() const;
+  virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
+  virtual void contextMenuEvent(QContextMenuEvent *event);
+
+private slots:
+  void joinChannel(const QModelIndex &index);
+  void toggleHeader(bool checked);
+
+  void on_collapse(const QModelIndex &index);
+  void on_expand(const QModelIndex &index);
+  void on_configChanged();
+
+private:
+  enum ItemActiveState {
+    InactiveState = 0x01,
+    ActiveState = 0x02
+  };
+
+public:
+  Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState)
+  QAction showChannelList;
+
+private:
+  QPointer<BufferViewConfig> _config;
+
+  QAction _connectNetAction;
+  QAction _disconnectNetAction;
+  QAction _joinChannelAction;
+
+  QAction _joinBufferAction;
+  QAction _partBufferAction;
+  QAction _hideBufferTemporarilyAction;
+  QAction _hideBufferPermanentlyAction;
+  QAction _removeBufferAction;
+  QAction _ignoreListAction;
+
+  QAction _hideJoinAction;
+  QAction _hidePartAction;
+  QAction _hideQuitAction;
+  QAction _hideNickAction;
+  QAction _hideModeAction;
+  QAction _hideDayChangeAction;
+
+  QHash<NetworkId, bool> _expandedState;
+
+  void storeExpandedState(NetworkId networkId, bool expanded);
+
+  bool checkRequirements(const QModelIndex &index,
+			 ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
+  void addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index,
+		     ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
+  void addItemToMenu(QAction &action, QMenu &menu, bool condition = true);
+  void addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index,
+		     ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
+  void addSeparatorToMenu(QMenu &menu, const QModelIndex &index,
+			  ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
+  QMenu *createHideEventsSubMenu(QMenu &menu, BufferId bufferId);
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates);
+Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates)
 
 
 // ==============================
 //  BufferView Dock
 // ==============================
 class BufferViewDock : public QDockWidget {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    BufferViewDock(BufferViewConfig *config, QWidget *parent);
-    BufferViewDock(QWidget *parent);
+public:
+  BufferViewDock(BufferViewConfig *config, QWidget *parent);
+  BufferViewDock(QWidget *parent);
 
-  public slots:
-    void bufferViewRenamed(const QString &newName);
+  inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
+
+public slots:
+  void bufferViewRenamed(const QString &newName);
 };
 
 #endif
-