X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=032cd0fe162fd749a8697c69599c32c77ed26133;hp=82db16d0b6a5723858531d98b791ff0f4c0e5f85;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=4fdf00a414eba03fb95cade3aca3ba53705c7b97

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 82db16d0..032cd0fe 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -28,9 +28,9 @@
 #include <QTreeView>
 #include <QPointer>
 
+#include "actioncollection.h"
 #include "bufferviewconfig.h"
 #include "networkmodel.h"
-
 #include "types.h"
 
 /*****************************************
@@ -38,7 +38,7 @@
  *****************************************/
 class BufferView : public QTreeView {
   Q_OBJECT
-  
+
 public:
   BufferView(QWidget *parent = 0);
   void init();
@@ -49,63 +49,42 @@ 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 dropEvent(QDropEvent *event);
+  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
-  };
-  Q_DECLARE_FLAGS(itemActiveStates, itemActiveState);
+  void on_collapse(const QModelIndex &index);
+  void on_expand(const QModelIndex &index);
+  void on_configChanged();
 
+private:
   QPointer<BufferViewConfig> _config;
+  QHash<NetworkId, bool> _expandedState;
 
-  QAction _connectNetAction;
-  QAction _disconnectNetAction;
-  QAction _joinChannelAction;
-
-  QAction _joinBufferAction;
-  QAction _partBufferAction;
-  QAction _hideBufferAction;
-  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);
-  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 storeExpandedState(NetworkId networkId, bool expanded);
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::itemActiveStates);
-
 
 // ==============================
 //  BufferView Dock
@@ -117,9 +96,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
-