X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnetworkmodelcontroller.h;h=268e783af12f4c3c7f45c73e8813197efe163ccf;hp=0aa5860a9e2cd5f50828c769ea6ab072f486ef6e;hb=f19fea582ace1d8f3dfe29c1096c48758079e56e;hpb=4e9b713cf4941e9d1d8341ed2dea3cbdf4a22a8a

diff --git a/src/uisupport/networkmodelcontroller.h b/src/uisupport/networkmodelcontroller.h
index 0aa5860a..268e783a 100644
--- a/src/uisupport/networkmodelcontroller.h
+++ b/src/uisupport/networkmodelcontroller.h
@@ -62,6 +62,7 @@ public:
     HideNick = 0x0400,
     HideMode = 0x0500,
     HideDayChange = 0x0600,
+    HideTopic = 0x0700,
     HideUseDefaults = 0xe00,
     HideApplyToAll = 0xf00,
 
@@ -87,6 +88,17 @@ public:
     NickKick = 0x0c0000,
     NickBan = 0x0d0000,
     NickKickBan = 0x0e0000,
+    NickIgnoreUser = 0x0f0000,
+    NickIgnoreHost = 0x100000,
+    NickIgnoreDomain = 0x200000,
+    NickIgnoreCustom = 0x300000,
+    // The next 5 types have stay together
+    // Don't change without reading ContextMenuActionProvider::addIgnoreMenu!
+    NickIgnoreToggleEnabled0 = 0x400000,
+    NickIgnoreToggleEnabled1 = 0x500000,
+    NickIgnoreToggleEnabled2 = 0x600000,
+    NickIgnoreToggleEnabled3 = 0x700000,
+    NickIgnoreToggleEnabled4 = 0x800000,
 
     // Actions that are handled externally
     // These emit a signal to the action requester, rather than being handled here
@@ -132,13 +144,13 @@ protected slots:
 
 signals:
   void showChannelList(NetworkId);
-  void showIgnoreList(NetworkId);
+  void showIgnoreList(QString);
 
 protected:
   virtual void handleNetworkAction(ActionType, QAction *);
   virtual void handleBufferAction(ActionType, QAction *);
   virtual void handleHideAction(ActionType, QAction *);
-  virtual void handleNickAction(ActionType, QAction *);
+  virtual void handleNickAction(ActionType, QAction *action);
   virtual void handleGeneralAction(ActionType, QAction *);
   virtual void handleExternalAction(ActionType, QAction *);