X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=112a6a268e91a36862c75d9efb7a4c6070d43156;hp=4df6685d57828ef24a1a34bd0905bbdf7ea2f1e0;hb=9950dd55446bedbccba1e7a27c4d042fb896d3c6;hpb=08aac67d4dc813ed541a81d06fb83d9c4fec5834

diff --git a/src/client/client.h b/src/client/client.h
index 4df6685d..112a6a26 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -27,29 +27,37 @@
 #include <QPointer>
 
 #include "buffer.h" // needed for activity lvl
+
 class BufferInfo;
 class Message;
+class MessageModel;
+class AbstractMessageProcessor;
 
 class Identity;
 class Network;
 
-
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class BufferSyncer;
+class ClientBacklogManager;
+class ClientIrcListHelper;
+class BufferViewManager;
 class IrcUser;
 class IrcChannel;
-class NickModel;
 class SignalProxy;
-
-class QTimer;
-
+struct NetworkInfo;
 
 class Client : public QObject {
   Q_OBJECT
 
 public:
+  enum ClientMode {
+    LocalCore,
+    RemoteCore
+  };
+
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
@@ -58,6 +66,7 @@ public:
   static QList<Buffer *> buffers();
   static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
+  static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
@@ -83,27 +92,29 @@ 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 inline NetworkModel *networkModel() { return instance()->_networkModel; }
+  static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
+  static inline MessageModel *messageModel() { return instance()->_messageModel; }
+  static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
+  static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
 
-  static NetworkModel *networkModel();
-  static BufferModel *bufferModel();
-  static NickModel *nickModel();
-  static SignalProxy *signalProxy();
+  static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
+  static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
+  static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
 
-  static AbstractUiMsg *layoutMsg(const Message &);
+  static AccountId currentCoreAccount();
 
   static bool isConnected();
   static bool isSynced();
 
   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();
-
-  enum ClientMode { LocalCore, RemoteCore };
+  static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
+  static void removeBuffer(BufferId id);
 
 signals:
   void sendInput(BufferInfo, QString message);
@@ -116,13 +127,10 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
+  void securedConnection();
   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.
    */
@@ -143,20 +151,24 @@ 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(NetworkId);
 
 public slots:
   //void selectBuffer(Buffer *);
 
-  void setConnectedToCore(QIODevice *socket);
-  void setSyncedToCore();
   void disconnectFromCore();
 
   void setCoreConfiguration(const QVariantMap &settings);
 
-private slots:
-  void recvSessionData(const QString &key, const QVariant &data);
+  void bufferRemoved(BufferId bufferId);
+  void bufferRenamed(BufferId bufferId, const QString &newName);
 
+private slots:
   //void coreSocketError(QAbstractSocket::SocketError);
 
   //void networkConnected(NetworkId);
@@ -164,44 +176,61 @@ private slots:
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
-  void recvBacklogData(BufferInfo, QVariantList, bool);
+  void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
   void updateBufferInfo(BufferInfo);
-
-  void layoutMsg();
+  void updateLastSeenMsg(BufferId id, const MsgId &msgId);
 
   void bufferDestroyed();
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
+  void coreNetworkCreated(NetworkId);
+  void coreNetworkRemoved(NetworkId);
+
+  void setConnectedToCore(QIODevice *socket, AccountId id);
+  void setSyncedToCore();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
   virtual ~Client();
   void init();
 
-  void syncToCore(const QVariantMap &sessionState);
+  static void addNetwork(Network *);
+  static void setCurrentCoreAccount(AccountId);
+  static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
+
+  Buffer *statusBuffer(const NetworkId &networkid) const;
 
   static QPointer<Client> instanceptr;
 
   QPointer<QIODevice> socket;
-  QPointer<SignalProxy> _signalProxy;
-  QPointer<AbstractUi> mainUi;
-  QPointer<NetworkModel> _networkModel;
-  QPointer<BufferModel> _bufferModel;
-  QPointer<NickModel> _nickModel;
+
+  SignalProxy * _signalProxy;
+  AbstractUi * mainUi;
+  NetworkModel * _networkModel;
+  BufferModel * _bufferModel;
+  BufferSyncer * _bufferSyncer;
+  ClientBacklogManager *_backlogManager;
+  BufferViewManager *_bufferViewManager;
+  ClientIrcListHelper *_ircListHelper;
+
+  MessageModel *_messageModel;
+  AbstractMessageProcessor *_messageProcessor;
 
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
 
   QHash<BufferId, Buffer *> _buffers;
+  QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
-  QTimer *layoutTimer;
-  QList<Buffer *> layoutQueue;
+  Buffer *_monitorBuffer;
 
-  QVariantMap sessionData;
+  static AccountId _currentCoreAccount;
 
   friend class ClientSyncer;
 };