X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=5d19a1386532f9e8f6ac847ea9d0c108e26aad28;hp=d0ac2100091b2507bc541b1704ae37f4a17b0eeb;hb=32bd64194bedc5c184717ece765922a826bebfd3;hpb=8b896450a5fc56a2bde37b44e81dc5af6c338be1

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index d0ac2100..5d19a138 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,12 +25,13 @@
 #include <QMenu>
 #include <QDockWidget>
 #include <QModelIndex>
+#include <QStyledItemDelegate>
 #include <QTreeView>
 #include <QPointer>
 
+#include "actioncollection.h"
 #include "bufferviewconfig.h"
 #include "networkmodel.h"
-
 #include "types.h"
 
 /*****************************************
@@ -50,9 +51,13 @@ public:
   void setConfig(BufferViewConfig *config);
   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 &);
@@ -60,6 +65,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 *);
@@ -71,58 +77,37 @@ private slots:
   void joinChannel(const QModelIndex &index);
   void toggleHeader(bool checked);
 
-  void on_collapse(const QModelIndex &index);
-  void on_expand(const QModelIndex &index);
+  void storeExpandedState(const QModelIndex &networkIdx);
+  void setExpandedState(const QModelIndex &networkIdx);
+
   void on_configChanged();
+  void on_layoutChanged();
 
 private:
-  enum ItemActiveState {
-    InactiveState = 0x01,
-    ActiveState = 0x02
+  QPointer<BufferViewConfig> _config;
+
+  enum ExpandedState {
+    WasExpanded = 0x01,
+    WasActive = 0x02
   };
+  QHash<NetworkId, short> _expandedState;
 
-public:
-  Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState)
-  QAction showChannelList;
+};
 
-private:
-  QPointer<BufferViewConfig> _config;
+// ******************************
+//  BufferViewDelgate
+// ******************************
 
-  QAction _connectNetAction;
-  QAction _disconnectNetAction;
-  QAction _joinChannelAction;
-
-  QAction _joinBufferAction;
-  QAction _partBufferAction;
-  QAction _hideBufferTemporarilyAction;
-  QAction _hideBufferPermanentlyAction;
-  QAction _removeBufferAction;
-  QAction _ignoreListAction;
-
-  QAction _hideJoinAction;
-  QAction _hidePartAction;
-  QAction _hideQuitAction;
-  QAction _hideNickAction;
-  QAction _hideModeAction;
-  QAction _hideDayChangeAction;
-
-  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, BufferId bufferId);
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates)
+class BufferViewDelegate : public QStyledItemDelegate {
+  Q_OBJECT
 
+public:
+  BufferViewDelegate(QObject *parent = 0);
+  bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
+
+protected:
+  virtual void customEvent(QEvent *event);
+};
 
 // ==============================
 //  BufferView Dock
@@ -132,8 +117,9 @@ class BufferViewDock : public QDockWidget {
 
 public:
   BufferViewDock(BufferViewConfig *config, QWidget *parent);
-  BufferViewDock(QWidget *parent);
 
+  int bufferViewId() const;
+  BufferViewConfig *config() const;
   inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
 
 public slots: