X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=3f5f79ddc94bcfe2f582a33461ec2b8d60506d1a;hp=8a68d99769831828308ad59edc15054ab2dbd950;hb=127d1fd9e75d33f1a6a4cd4d30c259b00686c4ff;hpb=4649188af29520951aa7485c577aa7ab912bef1a

diff --git a/src/client/client.h b/src/client/client.h
index 8a68d997..3f5f79dd 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,6 +34,7 @@ class MessageModel;
 class AbstractMessageProcessor;
 
 class Identity;
+class CertIdentity;
 class Network;
 
 class AbstractUi;
@@ -41,10 +42,12 @@ class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
 class BufferSyncer;
+class ClientAliasManager;
 class ClientBacklogManager;
+class ClientBufferViewManager;
 class ClientIrcListHelper;
 class ClientSyncer;
-class BufferViewManager;
+class ClientUserInputHandler;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
@@ -62,19 +65,20 @@ public:
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
+  static AbstractUi *mainUi();
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 
   static QList<IdentityId> identityIds();
-  static const Identity * identity(IdentityId);
+  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);
+  static void createIdentity(const CertIdentity &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.
@@ -88,7 +92,7 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
-  static void createNetwork(const NetworkInfo &info);
+  static void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
@@ -98,31 +102,37 @@ public:
   static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
   static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
 
+  static inline ClientAliasManager *aliasManager() { return instance()->_aliasManager; }
   static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
   static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
-  static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+  static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+  static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
 
   static AccountId currentCoreAccount();
 
   static bool isConnected();
   static bool isSynced();
+  static inline bool internalCore() { return instance()->_internalCore; }
 
-  static void userInput(BufferInfo bufferInfo, QString message);
+  static void userInput(const BufferInfo &bufferInfo, const QString &message);
 
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
+  static void renameBuffer(BufferId bufferId, const QString &newName);
+  static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
+  static void purgeKnownBufferIds();
 
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
+  static inline void registerClientSyncer(ClientSyncer *syncer) { emit instance()->newClientSyncer(syncer); }
+
 signals:
-  void sendInput(BufferInfo, QString message);
   void requestNetworkStates();
 
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
-  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -140,14 +150,14 @@ signals:
   void identityRemoved(IdentityId id);
 
   //! Sent to the core when an identity shall be created. Should not be used elsewhere.
-  void requestCreateIdentity(const Identity &);
+  void requestCreateIdentity(const Identity &, const QVariantMap &);
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 
-  void requestCreateNetwork(const NetworkInfo &info);
+  void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 
   void newClientSyncer(ClientSyncer *);
@@ -155,12 +165,11 @@ signals:
   void logUpdated(const QString &msg);
 
 public slots:
-  //void selectBuffer(Buffer *);
-
   void disconnectFromCore();
 
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private slots:
   void disconnectedFromCore();
@@ -176,8 +185,10 @@ private slots:
 
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
-  void setSecuredConnection();
+  void requestInitialBacklog();
+  void createDefaultBufferView();
 
+  void sendBufferedUserInput();
 
 private:
   Client(QObject *parent = 0);
@@ -191,13 +202,15 @@ private:
   static QPointer<Client> instanceptr;
 
   SignalProxy * _signalProxy;
-  AbstractUi * mainUi;
+  AbstractUi * _mainUi;
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
+  ClientAliasManager *_aliasManager;
   ClientBacklogManager *_backlogManager;
-  BufferViewManager *_bufferViewManager;
+  ClientBufferViewManager *_bufferViewManager;
   ClientIrcListHelper *_ircListHelper;
+  ClientUserInputHandler *_inputHandler;
 
   MessageModel *_messageModel;
   AbstractMessageProcessor *_messageProcessor;
@@ -205,6 +218,7 @@ private:
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
+  bool _internalCore;
 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
@@ -214,6 +228,8 @@ private:
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
+  QList<QPair<BufferInfo, QString> > _userInputBuffer;
+
   friend class ClientSyncer;
 };