class AbstractUiMsg;
class NetworkModel;
class BufferModel;
+class IrcUser;
+class IrcChannel;
+class NickModel;
class SignalProxy;
class QTimer;
static void init(AbstractUi *);
static QList<Network *> networks();
- static Network *network(uint networkid);
+ static Network *network(NetworkId networkid);
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
- static Buffer *buffer(uint bufferUid);
+ static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
static QList<IdentityId> identityIds();
*/
static void removeIdentity(IdentityId id);
+ static void addNetwork(NetworkId id);
+ static void addNetwork(Network *);
+
+
static NetworkModel *networkModel();
static BufferModel *bufferModel();
+ static NickModel *nickModel();
static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
+ static bool isSynced();
- static void fakeInput(uint bufferUid, QString message);
+ static void fakeInput(BufferId bufferUid, QString message);
static void fakeInput(BufferInfo bufferInfo, QString message);
static void storeSessionData(const QString &key, const QVariant &data);
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();
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 coreSocketError(QAbstractSocket::SocketError);
void userInput(BufferInfo, QString);
- 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);
virtual ~Client();
void init();
- void syncToCore(const QVariant &coreState);
+ void syncToCore(const QVariantMap &sessionState);
static QPointer<Client> instanceptr;
QPointer<AbstractUi> mainUi;
QPointer<NetworkModel> _networkModel;
QPointer<BufferModel> _bufferModel;
+ QPointer<NickModel> _nickModel;
ClientMode clientMode;
- quint32 blockSize;
- bool connectedToCore;
+ bool _connectedToCore, _syncedToCore;
- QVariantMap coreConnectionInfo;
QHash<BufferId, Buffer *> _buffers;
- QHash<NetworkId, Network *> _network;
+ QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
QTimer *layoutTimer;
QVariantMap sessionData;
-
+ friend class ClientSyncer;
};
#endif