X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=ad411a89866d222fe4611ab1a2051dc7b7484231;hp=09d6613000c513319bba0d3483a42052f7c77378;hb=610cf75dbef35c6f90bd9657f3fae56a6067de08;hpb=a14eac175cceda16f50cb4519182f819cf7f6b23

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 09d66130..ad411a89 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -21,13 +21,16 @@
 #ifndef BUFFERVIEW_H_
 #define BUFFERVIEW_H_
 
+#include <QAction>
+#include <QMenu>
 #include <QDockWidget>
 #include <QModelIndex>
 #include <QTreeView>
 #include <QPointer>
 
+#include "actioncollection.h"
 #include "bufferviewconfig.h"
-
+#include "networkmodel.h"
 #include "types.h"
 
 /*****************************************
@@ -35,7 +38,7 @@
  *****************************************/
 class BufferView : public QTreeView {
   Q_OBJECT
-  
+
 public:
   BufferView(QWidget *parent = 0);
   void init();
@@ -46,32 +49,41 @@ public:
 
   void setConfig(BufferViewConfig *config);
   inline BufferViewConfig *config() { return _config; }
-							       
+
+  void addActionsToMenu(QMenu *menu, const QModelIndex &index);
+
 public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
-  void removeSelectedBuffers();
-  
+  void removeSelectedBuffers(bool permanently = false);
+  void menuActionTriggered(QAction *);
+
 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:
   QPointer<BufferViewConfig> _config;
-};
+  QHash<NetworkId, bool> _expandedState;
 
+  void storeExpandedState(NetworkId networkId, bool expanded);
+};
 
 // ==============================
 //  BufferView Dock
@@ -83,9 +95,10 @@ public:
   BufferViewDock(BufferViewConfig *config, QWidget *parent);
   BufferViewDock(QWidget *parent);
 
+  inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
+
 public slots:
   void bufferViewRenamed(const QString &newName);
 };
 
 #endif
-