fixing BR #297 and #309 improved default aliases

[quassel.git] / src / uisupport / bufferview.h

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 82db16d..a8231d9 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -38,73 +38,88 @@
  *****************************************/
 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();
+  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 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();
+
+  void on_collapse(const QModelIndex &index);
+  void on_expand(const QModelIndex &index);
+  void on_configChanged();
 
 private:
-  enum itemActiveState {
-    inactiveState = 0x01,
-    activeState = 0x02
+  enum ItemActiveState {
+    InactiveState = 0x01,
+    ActiveState = 0x02
   };
-  Q_DECLARE_FLAGS(itemActiveStates, itemActiveState);
 
-  QPointer<BufferViewConfig> _config;
+public:
+  Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState)
+  QAction showChannelList;
 
+private:
+  QPointer<BufferViewConfig> _config;
+  
   QAction _connectNetAction;
   QAction _disconnectNetAction;
   QAction _joinChannelAction;
-
+  
   QAction _joinBufferAction;
   QAction _partBufferAction;
-  QAction _hideBufferAction;
+  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 = activeState | inactiveState);
-  void addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState = activeState | inactiveState);
+  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 = activeState | inactiveState);
-  void addSeparatorToMenu(QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState = activeState | inactiveState);
-  QMenu *createHideEventsSubMenu(QMenu &menu);
+  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)
 
 
 // ==============================
@@ -116,7 +131,7 @@ class BufferViewDock : public QDockWidget {
 public:
   BufferViewDock(BufferViewConfig *config, QWidget *parent);
   BufferViewDock(QWidget *parent);
-
+                                
 public slots:
   void bufferViewRenamed(const QString &newName);
 };