X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fnetworkmodelcontroller.h;h=3abc79dd7601ea5a668ae1a489df5d72c6faf56a;hb=0ba56e60f400621ddc291669dc2c03a8e461c224;hp=48fc5eb15810356da80bbfc144cc1f1324abdf97;hpb=04315f46a16fc3627218377071e008b6b9744992;p=quassel.git

diff --git a/src/uisupport/networkmodelcontroller.h b/src/uisupport/networkmodelcontroller.h
index 48fc5eb1..3abc79dd 100644
--- a/src/uisupport/networkmodelcontroller.h
+++ b/src/uisupport/networkmodelcontroller.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -45,8 +45,10 @@ public:
         NetworkMask = 0x0f,
         NetworkConnect = 0x01,
         NetworkDisconnect = 0x02,
-        NetworkConnectAll = 0x03,
-        NetworkDisconnectAll = 0x04,
+        NetworkConnectAllWithDropdown = 0x03,
+        NetworkDisconnectAllWithDropdown = 0x04,
+        NetworkConnectAll = 0x05,
+        NetworkDisconnectAll = 0x06,
 
         // Buffer actions
         BufferMask = 0xf0,
@@ -64,6 +66,7 @@ public:
         HideMode = 0x0500,
         HideDayChange = 0x0600,
         HideTopic = 0x0700,
+        HideJoinPartQuit = 0xd00,
         HideUseDefaults = 0xe00,
         HideApplyToAll = 0xf00,
 
@@ -138,7 +141,7 @@ protected:
     void setSlot(QObject *receiver, const char *method);
 
     Action *registerAction(ActionType type, const QString &text, bool checkable = false);
-    Action *registerAction(ActionType type, const QPixmap &icon, const QString &text, bool checkable = false);
+    Action *registerAction(NetworkModelController::ActionType type, const QIcon &icon, const QString &text, bool checkable = false);
     bool checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
 
     QString nickName(const QModelIndex &index) const;