X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=6daa757cfe5e15cfa5f438e35325f2289c6633e3;hp=7970651feb506d46934ff35e46a0719e80f0ba92;hb=c5cbe5eb77fce2ab954a98399a1450803108217b;hpb=8a618fb4514d83a76cec8e7cd1319b935366a616 diff --git a/src/client/client.h b/src/client/client.h index 7970651f..6daa757c 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -30,12 +30,17 @@ class BufferInfo; class Message; -class NetworkInfo; +class Identity; +class Network; class AbstractUi; class AbstractUiMsg; -class BufferTreeModel; +class NetworkModel; +class BufferModel; +class IrcUser; +class IrcChannel; +class NickModel; class SignalProxy; class QTimer; @@ -49,26 +54,52 @@ public: static void destroy(); static void init(AbstractUi *); - static QList networkInfos(); - static NetworkInfo *networkInfo(uint networkid); - static QList allBufferInfos(); static QList 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 BufferTreeModel *bufferModel(); + static QList networkIds(); + static const Network * network(NetworkId); + + static QList identityIds(); + 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); + + //! 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. + * \param identity The identity to be updated. + */ + static void updateIdentity(const Identity &identity); + + //! Request removal of the identity with the given ID from the core (and all the clients, of course). + /** \param id The ID of the identity to be removed. + */ + 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); static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant()); static QStringList sessionDataKeys(); @@ -78,88 +109,105 @@ public: signals: void sendInput(BufferInfo, QString message); void showBuffer(Buffer *); - void bufferSelected(Buffer *); - void bufferUpdated(Buffer *); - void bufferActivity(Buffer::ActivityLevel, Buffer *); - void bufferDestroyed(Buffer *); + void bufferUpdated(BufferInfo bufferInfo); void backlogReceived(Buffer *, QList); 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. + */ + void identityCreated(IdentityId id); + + //! The identity with the given ID has been removed. + /** Upon emitting this signal, the identity is already gone from the core, and it will + * be deleted from the client immediately afterwards, so connected slots need to clean + * up their stuff. + * \param id The ID of the identity about to be removed. + */ + void identityRemoved(IdentityId id); + + //! Sent to the core when an identity shall be created. Should not be used elsewhere. + void requestCreateIdentity(const Identity &); + //! Sent to the core when an identity shall be updated. Should not be used elsewhere. + void requestUpdateIdentity(const Identity &); + //! Sent to the core when an identity shall be removed. Should not be used elsewhere. + void requestRemoveIdentity(IdentityId); + + void networkAdded(NetworkId id); + 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 coreSocketStateChanged(QAbstractSocket::SocketState); + //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); void updateBufferInfo(BufferInfo); - void removeBuffer(Buffer *); - void layoutMsg(); + void bufferDestroyed(); + void networkDestroyed(); + void coreIdentityCreated(const Identity &); + void coreIdentityRemoved(IdentityId); + private: Client(QObject *parent = 0); virtual ~Client(); void init(); - - void syncToCore(const QVariant &coreState); - QVariant connectToLocalCore(QString user, QString passwd); // defined in main.cpp - void disconnectFromLocalCore(); // defined in main.cpp + + void syncToCore(const QVariantMap &sessionState); static QPointer instanceptr; - + QPointer socket; QPointer _signalProxy; QPointer mainUi; - QPointer _bufferModel; + QPointer _networkModel; + QPointer _bufferModel; + QPointer _nickModel; ClientMode clientMode; - quint32 blockSize; - bool connectedToCore; - - QVariantMap coreConnectionInfo; - QHash _buffers; - QHash _networkInfo; + bool _connectedToCore, _syncedToCore; + + QHash _buffers; + QHash _networks; + QHash _identities; QTimer *layoutTimer; QList layoutQueue; QVariantMap sessionData; - + friend class ClientSyncer; }; #endif