X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcontextmenuactionprovider.h;h=bdac641d2d58a34ffb6a03252f0c2f06c24bc296;hp=8cd519f1ed68cee7ebfc1a8db6b5b9b2d3163fe0;hb=57058eabefe58082635c0ff83bbd4714baa5b6a9;hpb=a540a0285feef171e16fd6225b0e045fc5fc52e4

diff --git a/src/uisupport/contextmenuactionprovider.h b/src/uisupport/contextmenuactionprovider.h
index 8cd519f1..bdac641d 100644
--- a/src/uisupport/contextmenuactionprovider.h
+++ b/src/uisupport/contextmenuactionprovider.h
@@ -18,76 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef NETWORKMODELACTIONPROVIDER_H
-#define NETWORKMODELACTIONPROVIDER_H
+#ifndef CONTEXTMENUACTIONPROVIDER_H
+#define CONTEXTMENUACTIONPROVIDER_H
 
-#include "action.h"
-#include "actioncollection.h"
-#include "messagefilter.h"
+#include "networkmodelcontroller.h"
 
-class ContextMenuActionProvider : public QObject {
+class ContextMenuActionProvider : public NetworkModelController {
   Q_OBJECT
 
 public:
   ContextMenuActionProvider(QObject *parent = 0);
-  ~ContextMenuActionProvider();
-
-  // don't change enums without doublechecking masks etc. in code
-  enum ActionType {
-    // Network actions
-    NetworkMask = 0x0f,
-    NetworkConnect = 0x01,
-    NetworkDisconnect = 0x02,
-
-    // Buffer actions
-    BufferMask = 0xf0,
-    BufferJoin = 0x10,
-    BufferPart = 0x20,
-    BufferSwitchTo = 0x30,
-    BufferRemove = 0x40,
-
-    // Hide actions
-    HideMask = 0x0f00,
-    HideJoin = 0x0100,
-    HidePart = 0x0200,
-    HideQuit = 0x0300,
-    HideNick = 0x0400,
-    HideMode = 0x0500,
-    HideDayChange = 0x0600,
-    HideUseDefaults = 0xe00,
-    HideApplyToAll = 0xf00,
-
-    // General actions
-    GeneralMask = 0xf000,
-    JoinChannel = 0x1000,
-    ShowChannelList = 0x2000,
-    ShowIgnoreList = 0x3000,
-
-    // Nick actions
-    NickMask = 0xff0000,
-    NickWhois = 0x010000,
-    NickQuery = 0x020000,
-    NickSwitchTo = 0x030000,
-    NickCtcpVersion = 0x040000,
-    NickCtcpPing = 0x050000,
-    NickCtcpTime = 0x060000,
-    NickCtcpFinger = 0x070000,
-    NickOp = 0x080000,
-    NickDeop = 0x090000,
-    NickVoice = 0x0a0000,
-    NickDevoice = 0x0b0000,
-    NickKick = 0x0c0000,
-    NickBan = 0x0d0000,
-    NickKickBan = 0x0e0000,
-
-    // Actions that are handled externally
-    // These emit a signal to the action requester, rather than being handled here
-    ExternalMask = 0xff000000,
-    HideBufferTemporarily = 0x01000000,
-    HideBufferPermanently = 0x02000000
-  };
-
-  inline Action *action(ActionType type) const;
+  virtual ~ContextMenuActionProvider();
 
   //! Provide a list of actions applying to the given item
   /**
@@ -107,40 +48,11 @@ public:
   void addActions(QMenu *, MessageFilter *filter, BufferId msgBuffer, QObject *receiver = 0, const char *slot = 0);
   void addActions(QMenu *, MessageFilter *filter, BufferId msgBuffer, const QString &chanOrNick, QObject *receiver = 0, const char *slot = 0);
 
-signals:
-  void showChannelList(NetworkId);
-  void showIgnoreList(NetworkId);
-
-protected:
-  inline ActionCollection *actionCollection() const;
-
-protected slots:
-  void actionTriggered(QAction *);
-
 private:
-  enum ItemActiveState {
-    InactiveState = 0x01,
-    ActiveState = 0x02
-  };
-
-public:
-  Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState)
-
-private:
-  void registerAction(ActionType type, const QString &text, bool checkable = false);
-  void registerAction(ActionType type, const QPixmap &icon, const QString &text, bool checkable = false);
-
-  void handleNetworkAction(ActionType, QAction *);
-  void handleBufferAction(ActionType, QAction *);
-  void handleHideAction(ActionType, QAction *);
-  void handleNickAction(ActionType, QAction *);
-  void handleGeneralAction(ActionType, QAction *);
-  void handleExternalAction(ActionType, QAction *);
 
   void addActions(QMenu *, const QList<QModelIndex> &indexList, MessageFilter *filter, const QString &chanOrNick,
                   QObject *receiver, const char *slot, bool allowBufferHide);
 
-  bool checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
   Action * addAction(ActionType, QMenu *, bool condition = true);
   Action * addAction(Action * , QMenu *, bool condition = true);
   Action * addAction(ActionType, QMenu *, const QModelIndex &index, ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
@@ -154,28 +66,9 @@ private:
   void addBufferItemActions(QMenu *, const QModelIndex &, bool isCustomBufferView = false);
   void addIrcUserActions(QMenu *, const QModelIndex &);
 
-  QString nickName(const QModelIndex &index) const;
-  BufferId findQueryBuffer(const QModelIndex &index, const QString &predefinedNick = QString()) const;
-  BufferId findQueryBuffer(NetworkId, const QString &nickName) const;
-  void removeBuffers(const QModelIndexList &indexList);
-
-  NetworkModel *_model;
-
-  ActionCollection *_actionCollection;
-  QHash<ActionType, Action *> _actionByType;
-
   Action *_hideEventsMenuAction;
   Action *_nickCtcpMenuAction;
   Action *_nickModeMenuAction;
-
-  QList<QModelIndex> _indexList;
-  MessageFilter *_messageFilter;
-  QString _contextItem;   ///< Channel name or nick to provide context menu for
-  QObject *_receiver;
-  const char *_method;
 };
 
-// inlines
-ActionCollection *ContextMenuActionProvider::actionCollection() const { return _actionCollection; }
-Action *ContextMenuActionProvider::action(ActionType type) const { return _actionByType.value(type, 0); }
 #endif