X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=f2b3ec3c5a5cfb46f8ba8de8cc5d23335c4da458;hp=32ae3a9247f2cf7c37df4cafb6bbe1ea43db05ef;hb=5d9e6f82037c37c560827bfd9d71bc9467fa7ccc;hpb=453731c6d3c5eac2df5e98c4f179afabed4451a1

diff --git a/src/client/client.h b/src/client/client.h
index 32ae3a92..f2b3ec3c 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -40,8 +40,8 @@ class NetworkModel;
 class BufferModel;
 class IrcUser;
 class IrcChannel;
-class NickModel;
 class SignalProxy;
+struct NetworkInfo;
 
 class QTimer;
 
@@ -58,6 +58,7 @@ public:
   static QList<Buffer *> buffers();
   static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
+  static Buffer *monitorBuffer();
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
@@ -83,13 +84,12 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
-  static void addNetwork(NetworkId id);
-  static void addNetwork(Network *);
-
+  static void createNetwork(const NetworkInfo &info);
+  static void updateNetwork(const NetworkInfo &info);
+  static void removeNetwork(NetworkId id);
 
   static NetworkModel *networkModel();
   static BufferModel *bufferModel();
-  static NickModel *nickModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -97,13 +97,14 @@ public:
   static bool isConnected();
   static bool isSynced();
 
-  static void fakeInput(BufferId bufferUid, QString message);
-  static void fakeInput(BufferInfo bufferInfo, QString message);
+  static void userInput(BufferInfo bufferInfo, QString message);
 
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
   static QStringList sessionDataKeys();
 
+  static void disconnectFromNetwork(NetworkId);
+
   enum ClientMode { LocalCore, RemoteCore };
 
 signals:
@@ -144,7 +145,12 @@ signals:
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
-  void networkAdded(NetworkId id);
+  void networkCreated(NetworkId id);
+  void networkRemoved(NetworkId id);
+
+  void requestCreateNetwork(const NetworkInfo &info);
+  void requestUpdateNetwork(const NetworkInfo &info);
+  void requestRemoveNetwork(const NetworkInfo &info);
 
 public slots:
   //void selectBuffer(Buffer *);
@@ -155,8 +161,6 @@ public slots:
 
   void setCoreConfiguration(const QVariantMap &settings);
 
-  void userInput(BufferInfo, QString);
-
 private slots:
   void recvSessionData(const QString &key, const QVariant &data);
 
@@ -182,7 +186,7 @@ private:
   virtual ~Client();
   void init();
 
-  void syncToCore(const QVariantMap &sessionState);
+  static void addNetwork(Network *);
 
   static QPointer<Client> instanceptr;
 
@@ -191,7 +195,6 @@ private:
   QPointer<AbstractUi> mainUi;
   QPointer<NetworkModel> _networkModel;
   QPointer<BufferModel> _bufferModel;
-  QPointer<NickModel> _nickModel;
 
   ClientMode clientMode;
 
@@ -201,6 +204,8 @@ private:
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
+  Buffer *_monitorBuffer;
+
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;