class Message;
class Identity;
-class NetworkInfo;
+class Network;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
+class IrcUser;
+class IrcChannel;
class SignalProxy;
+struct NetworkInfo;
class QTimer;
static void destroy();
static void init(AbstractUi *);
- static QList<NetworkInfo *> networkInfos();
- static NetworkInfo *networkInfo(uint networkid);
-
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
- static Buffer *buffer(uint bufferUid);
+ static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
- static BufferInfo statusBufferInfo(QString net);
- static BufferInfo bufferInfo(QString net, QString buf);
+ static Buffer *monitorBuffer();
+
+ static QList<NetworkId> networkIds();
+ static const Network * network(NetworkId);
static QList<IdentityId> identityIds();
static const Identity * identity(IdentityId);
*/
static void removeIdentity(IdentityId id);
+ static void createNetwork(const NetworkInfo &info);
+ static void updateNetwork(const NetworkInfo &info);
+ static void removeNetwork(NetworkId id);
+
static NetworkModel *networkModel();
static BufferModel *bufferModel();
static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
+ static bool isSynced();
- static void fakeInput(uint bufferUid, QString message);
- static void fakeInput(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();
+ static void userInput(BufferInfo bufferInfo, QString message);
enum ClientMode { LocalCore, RemoteCore };
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();
- void recvPartialItem(uint avail, uint size);
- void coreConnectionError(QString errorMsg);
- void coreConnectionMsg(const QString &msg);
- void coreConnectionProgress(uint part, uint total);
-
void showConfigWizard(const QVariantMap &coredata);
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.
*/
//! 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 requestUpdateNetwork(const NetworkInfo &info);
+ void requestRemoveNetwork(NetworkId);
+
public slots:
//void selectBuffer(Buffer *);
- //void connectToLocalCore();
- void connectToCore(const QVariantMap &);
+
+ void setConnectedToCore(QIODevice *socket);
+ void setSyncedToCore();
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
private slots:
- void recvCoreState(const QVariant &state);
- void recvSessionData(const QString &key, const QVariant &data);
-
- void coreSocketError(QAbstractSocket::SocketError);
- void coreHasData();
- void coreSocketConnected();
- void coreSocketDisconnected();
-
- void userInput(BufferInfo, QString);
+ //void coreSocketError(QAbstractSocket::SocketError);
- void networkConnected(uint);
- void networkDisconnected(uint);
+ //void networkConnected(NetworkId);
+ //void networkDisconnected(NetworkId);
- void updateCoreConnectionProgress();
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void recvBacklogData(BufferInfo, QVariantList, bool);
void layoutMsg();
void bufferDestroyed();
- void networkInfoDestroyed();
- void ircChannelAdded(QString);
+ void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
+ void coreNetworkCreated(NetworkId);
+ void coreNetworkRemoved(NetworkId);
private:
Client(QObject *parent = 0);
virtual ~Client();
void init();
- void syncToCore(const QVariant &coreState);
+ static void addNetwork(Network *);
static QPointer<Client> instanceptr;
ClientMode clientMode;
- quint32 blockSize;
- bool connectedToCore;
+ bool _connectedToCore, _syncedToCore;
- QVariantMap coreConnectionInfo;
QHash<BufferId, Buffer *> _buffers;
- QHash<NetworkId, NetworkInfo *> _networkInfo;
+ QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
+ Buffer *_monitorBuffer;
+
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
- QVariantMap sessionData;
-
-
+ friend class ClientSyncer;
};
#endif