/***************************************************************************
- * 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 BufferModel;
class BufferSyncer;
class ClientBacklogManager;
+class ClientBufferViewManager;
class ClientIrcListHelper;
class ClientSyncer;
-class BufferViewManager;
+class ClientUserInputHandler;
class IrcUser;
class IrcChannel;
class SignalProxy;
*/
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 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);
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 *);
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();
void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
void requestInitialBacklog();
- void setSecuredConnection();
-
+ void createDefaultBufferView();
private:
Client(QObject *parent = 0);
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
- BufferViewManager *_bufferViewManager;
+ ClientBufferViewManager *_bufferViewManager;
ClientIrcListHelper *_ircListHelper;
+ ClientUserInputHandler *_inputHandler;
MessageModel *_messageModel;
AbstractMessageProcessor *_messageProcessor;
ClientMode clientMode;
bool _connectedToCore, _syncedToCore;
+ bool _internalCore;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;