X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnetworkmodelcontroller.h;h=ec27c878ecf756c46c9f9cdb4e18910ed98ecbdf;hp=4333a0c442bd8371696acf74030b2c26ac683e4a;hb=c351c94e52a01571c34a18ddb5947b9e1f771d8c;hpb=84d12083744a7cbe23de09d5110b9d426c58ef19

diff --git a/src/uisupport/networkmodelcontroller.h b/src/uisupport/networkmodelcontroller.h
index 4333a0c4..ec27c878 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,
 
@@ -79,14 +80,27 @@ public:
     NickCtcpVersion = 0x040000,
     NickCtcpPing = 0x050000,
     NickCtcpTime = 0x060000,
-    NickCtcpFinger = 0x070000,
+    NickCtcpClientinfo = 0x070000,
     NickOp = 0x080000,
     NickDeop = 0x090000,
     NickVoice = 0x0a0000,
     NickDevoice = 0x0b0000,
-    NickKick = 0x0c0000,
-    NickBan = 0x0d0000,
-    NickKickBan = 0x0e0000,
+    NickHalfop = 0x0c0000,
+    NickDehalfop = 0x0d0000,
+    NickKick = 0x0e0000,
+    NickBan = 0x0f0000,
+    NickKickBan = 0x100000,
+    NickIgnoreUser = 0x200000,
+    NickIgnoreHost = 0x300000,
+    NickIgnoreDomain = 0x400000,
+    NickIgnoreCustom = 0x500000,
+    // The next 5 types have to stay together
+    // Don't change without reading ContextMenuActionProvider::addIgnoreMenu!
+    NickIgnoreToggleEnabled0 = 0x600000,
+    NickIgnoreToggleEnabled1 = 0x700000,
+    NickIgnoreToggleEnabled2 = 0x800000,
+    NickIgnoreToggleEnabled3 = 0x900000,
+    NickIgnoreToggleEnabled4 = 0xa00000,
 
     // Actions that are handled externally
     // These emit a signal to the action requester, rather than being handled here
@@ -104,6 +118,10 @@ public:
   };
   Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState)
 
+public slots:
+  virtual void connectedToCore() {}
+  virtual void disconnectedFromCore() {}
+
 protected:
   inline ActionCollection *actionCollection() const;
   inline QList<QModelIndex> indexList() const;
@@ -132,13 +150,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 *);
 
@@ -162,9 +180,10 @@ class NetworkModelController::JoinDlg : public QDialog {
   Q_OBJECT
 
 public:
-  JoinDlg(NetworkId id, QWidget *parent = 0);
+  JoinDlg(const QModelIndex &index, QWidget *parent = 0);
 
   QString channelName() const;
+  QString channelPassword() const;
   NetworkId networkId() const;
 
 private slots:
@@ -173,6 +192,7 @@ private slots:
 private:
   QComboBox *networks;
   QLineEdit *channel;
+  QLineEdit *password;
   QDialogButtonBox *buttonBox;
 };