/***************************************************************************
- * 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 *
class AbstractMessageProcessor;
class Identity;
+class CertIdentity;
class Network;
class AbstractUi;
class NetworkModel;
class BufferModel;
class BufferSyncer;
+class BufferViewOverlay;
+class ClientAliasManager;
class ClientBacklogManager;
+class ClientBufferViewManager;
+class ClientIgnoreListManager;
class ClientIrcListHelper;
class ClientSyncer;
-class BufferViewManager;
+class ClientUserInputHandler;
class IrcUser;
class IrcChannel;
+class NetworkConfig;
class SignalProxy;
struct NetworkInfo;
RemoteCore
};
+ static bool instanceExists();
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.
*/
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);
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 BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; }
+ static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
+ static inline NetworkConfig *networkConfig() { return instance()->_networkConfig; }
+ static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; }
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);
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 *);
-public slots:
- //void selectBuffer(Buffer *);
+ void logUpdated(const QString &msg);
+public slots:
void disconnectFromCore();
- void setCoreConfiguration(const QVariantMap &settings);
-
void bufferRemoved(BufferId bufferId);
void bufferRenamed(BufferId bufferId, const QString &newName);
+ void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
private slots:
- //void coreSocketError(QAbstractSocket::SocketError);
-
- //void networkConnected(NetworkId);
- //void networkDisconnected(NetworkId);
+ void disconnectedFromCore();
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
- void setConnectedToCore(QIODevice *socket, AccountId id);
+ void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
- void setSecuredConnection();
+ void requestInitialBacklog();
+ void createDefaultBufferView();
+ void sendBufferedUserInput();
private:
Client(QObject *parent = 0);
static QPointer<Client> instanceptr;
- QPointer<QIODevice> socket;
-
SignalProxy * _signalProxy;
- AbstractUi * mainUi;
+ AbstractUi * _mainUi;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
+ ClientAliasManager *_aliasManager;
ClientBacklogManager *_backlogManager;
- BufferViewManager *_bufferViewManager;
+ ClientBufferViewManager *_bufferViewManager;
+ BufferViewOverlay *_bufferViewOverlay;
ClientIrcListHelper *_ircListHelper;
+ ClientUserInputHandler *_inputHandler;
+ NetworkConfig *_networkConfig;
+ ClientIgnoreListManager *_ignoreListManager;
MessageModel *_messageModel;
AbstractMessageProcessor *_messageProcessor;
ClientMode clientMode;
bool _connectedToCore, _syncedToCore;
+ bool _internalCore;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
static AccountId _currentCoreAccount;
+ QString _debugLogBuffer;
+ QTextStream _debugLog;
+
+ QList<QPair<BufferInfo, QString> > _userInputBuffer;
+
friend class ClientSyncer;
};