X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=6bbca4ef88836df8ca32d99029799139777aa2d9;hp=a98f41ff1de8f7c8d640561673ec97a76df19206;hb=09fea00d02da49748b6a040752759eab16ccd392;hpb=ed6c4d268fd8e4aa2982b2ab8c1e11033fc0f9e5

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index a98f41ff..6bbca4ef 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -31,7 +31,6 @@
 #include "actioncollection.h"
 #include "bufferviewconfig.h"
 #include "networkmodel.h"
-
 #include "types.h"
 
 /*****************************************
@@ -52,10 +51,12 @@ public:
   inline BufferViewConfig *config() { return _config; }
 
   void addActionsToMenu(QMenu *menu, const QModelIndex &index);
+  void addFilterActions(QMenu *contextMenu, const QModelIndex &index);
 
 public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
   void removeSelectedBuffers(bool permanently = false);
+  void menuActionTriggered(QAction *);
 
 signals:
   void removeBuffer(const QModelIndex &);
@@ -63,6 +64,7 @@ signals:
 
 protected:
   virtual void keyPressEvent(QKeyEvent *);
+  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 *);
@@ -73,42 +75,30 @@ protected:
 private slots:
   void joinChannel(const QModelIndex &index);
   void toggleHeader(bool checked);
-  void actionTriggered(QAction *);
 
   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;
-  ActionCollection _menuActions;
-  QModelIndex _menuIndex;
   QHash<NetworkId, bool> _expandedState;
 
   void storeExpandedState(NetworkId networkId, bool expanded);
-  void setupMenuActions();
-  bool checkRequirements(const QModelIndex &index,
-                          ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
-  void addItemToMenu(QAction *action, QMenu *menu, const QModelIndex &index,
-                     ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
-  void addItemToMenu(QAction *action, QMenu *menu, bool condition = true);
-  void addItemToMenu(QMenu *subMenu, QMenu *menu, const QModelIndex &index,
-                     ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
-  void addSeparatorToMenu(QMenu *menu, const QModelIndex &index,
-                          ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
-  QMenu *createHideEventsSubMenu(QMenu *menu, BufferId bufferId);
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates)
+
+// ******************************
+//  TristateDelgate
+// ******************************
+#include <QStyledItemDelegate>
+
+class TristateDelegate : public QStyledItemDelegate {
+  Q_OBJECT
+
+public:
+  TristateDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) {}
+  bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
+};
 
 
 // ==============================