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

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 10059422..ad411a89 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"
 
 /*****************************************
@@ -42,22 +42,25 @@ class BufferView : public QTreeView {
 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; }
 
+  void addActionsToMenu(QMenu *menu, const QModelIndex &index);
+
 public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
   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);
@@ -75,53 +78,12 @@ private slots:
   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 _hideKillAction;
-  QAction _hideQuitAction;
-  QAction _hideModeAction;
-
   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);
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates)
-
 
 // ==============================
 //  BufferView Dock
@@ -132,10 +94,11 @@ class BufferViewDock : public QDockWidget {
 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
-