X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=333479202300ef874c2c11a6abee2eea58b2a304;hp=d13001a48d8e4c065ab1aeec7649c2b058a76117;hb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016

diff --git a/src/client/client.h b/src/client/client.h
index d13001a4..33347920 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,12 +30,14 @@
 class BufferInfo;
 class Message;
 
-class NetworkInfo;
+class Identity;
+class Network;
 
 
 class AbstractUi;
 class AbstractUiMsg;
-class BufferTreeModel;
+class NetworkModel;
+class BufferModel;
 class SignalProxy;
 
 class QTimer;
@@ -49,17 +51,37 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<NetworkInfo *> networkInfos();
-  static NetworkInfo *networkInfo(uint networkid);
+  static QList<Network *> networks();
+  static Network *network(uint networkid);
 
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
   static Buffer *buffer(uint bufferUid);
   static Buffer *buffer(BufferInfo);
-  static BufferInfo statusBufferInfo(QString net);
-  static BufferInfo bufferInfo(QString net, QString buf);
 
-  static BufferTreeModel *bufferModel();
+  static QList<IdentityId> identityIds();
+  static const Identity * identity(IdentityId);
+
+  //! Request creation of an identity with the given data.
+  /** The request will be sent to the core, and will be propagated back to all the clients
+   *  with a new valid IdentityId.
+   *  \param identity The identity template for the new identity. It does not need to have a valid ID.
+   */
+  static void createIdentity(const Identity &identity);
+
+  //! Request update of an identity with the given data.
+  /** The request will be sent to the core, and will be propagated back to all the clients.
+   *  \param identity The identity to be updated.
+   */
+  static void updateIdentity(const Identity &identity);
+
+  //! Request removal of the identity with the given ID from the core (and all the clients, of course).
+  /** \param id The ID of the identity to be removed.
+   */
+  static void removeIdentity(IdentityId id);
+
+  static NetworkModel *networkModel();
+  static BufferModel *bufferModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -78,9 +100,7 @@ public:
 signals:
   void sendInput(BufferInfo, QString message);
   void showBuffer(Buffer *);
-  void bufferSelected(Buffer *);
-  void bufferUpdated(Buffer *);
-  void bufferActivity(Buffer::ActivityLevel, Buffer *);
+  void bufferUpdated(BufferInfo bufferInfo);
   void backlogReceived(Buffer *, QList<Message>);
   void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
@@ -94,11 +114,32 @@ signals:
 
   void connected();
   void disconnected();
+  void coreConnectionStateChanged(bool);
 
   void sessionDataChanged(const QString &key);
   void sessionDataChanged(const QString &key, const QVariant &data);
   void sendSessionData(const QString &key, const QVariant &data);
 
+  //! The identity with the given ID has been newly created in core and client.
+  /** \param id The ID of the newly created identity.
+   */
+  void identityCreated(IdentityId id);
+
+  //! The identity with the given ID has been removed.
+  /** Upon emitting this signal, the identity is already gone from the core, and it will
+   *  be deleted from the client immediately afterwards, so connected slots need to clean
+   *  up their stuff.
+   *  \param id The ID of the identity about to be removed.
+   */
+  void identityRemoved(IdentityId id);
+
+  //! Sent to the core when an identity shall be created. Should not be used elsewhere.
+  void requestCreateIdentity(const Identity &);
+  //! Sent to the core when an identity shall be updated. Should not be used elsewhere.
+  void requestUpdateIdentity(const Identity &);
+  //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
+  void requestRemoveIdentity(IdentityId);
+
 public slots:
   //void selectBuffer(Buffer *);
   //void connectToLocalCore();
@@ -129,10 +170,10 @@ private slots:
 
   void layoutMsg();
 
-private slots:
   void bufferDestroyed();
-  void networkInfoDestroyed();
-  void ircChannelAdded(QString);
+  void networkDestroyed();
+  void coreIdentityCreated(const Identity &);
+  void coreIdentityRemoved(IdentityId);
 
 private:
   Client(QObject *parent = 0);
@@ -146,7 +187,8 @@ private:
   QPointer<QIODevice> socket;
   QPointer<SignalProxy> _signalProxy;
   QPointer<AbstractUi> mainUi;
-  QPointer<BufferTreeModel> _bufferModel;
+  QPointer<NetworkModel> _networkModel;
+  QPointer<BufferModel> _bufferModel;
 
   ClientMode clientMode;
 
@@ -154,8 +196,9 @@ private:
   bool connectedToCore;
 
   QVariantMap coreConnectionInfo;
-  QHash<uint, Buffer *> _buffers;
-  QHash<uint, NetworkInfo*> _networkInfo;
+  QHash<BufferId, Buffer *> _buffers;
+  QHash<NetworkId, Network *> _network;
+  QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;
   QList<Buffer *> layoutQueue;