X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=b8faf9fbd20db11233857681952e144332eba39d;hp=c1567642d3f6d10b5ab86f5a0fa712bcca9314fd;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=bf9530ddf0b227b6737e9cc672d40a703516c7ea diff --git a/src/client/client.h b/src/client/client.h index c1567642..b8faf9fb 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -18,47 +18,51 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _CLIENT_H_ -#define _CLIENT_H_ +#ifndef CLIENT_H_ +#define CLIENT_H_ #include #include #include #include -#include "buffer.h" // needed for activity lvl -class BufferInfo; +#include "bufferinfo.h" +#include "types.h" + class Message; +class MessageModel; +class AbstractMessageProcessor; class Identity; class Network; - class AbstractUi; class AbstractUiMsg; class NetworkModel; class BufferModel; +class BufferSyncer; +class ClientBacklogManager; +class ClientIrcListHelper; +class ClientSyncer; +class BufferViewManager; class IrcUser; class IrcChannel; -class NickModel; class SignalProxy; - -class QTimer; - +struct NetworkInfo; class Client : public QObject { Q_OBJECT public: + enum ClientMode { + LocalCore, + RemoteCore + }; + static Client *instance(); static void destroy(); static void init(AbstractUi *); - static QList allBufferInfos(); - static QList buffers(); - static Buffer *buffer(BufferId bufferUid); - static Buffer *buffer(BufferInfo); - static QList networkIds(); static const Network * network(NetworkId); @@ -74,55 +78,51 @@ public: //! 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. + * \param id The identity to be updated. + * \param serializedData The identity's content (cf. SyncableObject::toVariantMap()) */ - static void updateIdentity(const Identity &identity); + static void updateIdentity(IdentityId id, const QVariantMap &serializedData); //! 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 void createNetwork(const NetworkInfo &info); + static void updateNetwork(const NetworkInfo &info); + static void removeNetwork(NetworkId id); + static inline NetworkModel *networkModel() { return instance()->_networkModel; } + static inline BufferModel *bufferModel() { return instance()->_bufferModel; } + static inline MessageModel *messageModel() { return instance()->_messageModel; } + static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; } + static inline SignalProxy *signalProxy() { return instance()->_signalProxy; } - static NetworkModel *networkModel(); - static BufferModel *bufferModel(); - static NickModel *nickModel(); - static SignalProxy *signalProxy(); + static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } + static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; } + static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } - static AbstractUiMsg *layoutMsg(const Message &); + static AccountId currentCoreAccount(); static bool isConnected(); static bool isSynced(); - static void fakeInput(BufferId bufferUid, 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 }; + static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients + static void removeBuffer(BufferId id); signals: void sendInput(BufferInfo, QString message); - void showBuffer(Buffer *); - void bufferUpdated(BufferInfo bufferInfo); - void backlogReceived(Buffer *, QList); - void requestBacklog(BufferInfo, QVariant, QVariant); void requestNetworkStates(); void showConfigWizard(const QVariantMap &coredata); void connected(); + void securedConnection(); 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. */ @@ -138,72 +138,74 @@ signals: //! 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); + void networkCreated(NetworkId id); + void networkRemoved(NetworkId id); + + void requestCreateNetwork(const NetworkInfo &info); + void requestRemoveNetwork(NetworkId); + + void newClientSyncer(ClientSyncer *); public slots: //void selectBuffer(Buffer *); - void setConnectedToCore(QIODevice *socket); - void setSyncedToCore(); void disconnectFromCore(); - void setCoreConfiguration(const QVariantMap &settings); - - void userInput(BufferInfo, QString); + void bufferRemoved(BufferId bufferId); + void bufferRenamed(BufferId bufferId, const QString &newName); private slots: - void recvSessionData(const QString &key, const QVariant &data); - - //void coreSocketError(QAbstractSocket::SocketError); - - //void networkConnected(NetworkId); - //void networkDisconnected(NetworkId); + void disconnectedFromCore(); void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); - void recvBacklogData(BufferInfo, QVariantList, bool); - void updateBufferInfo(BufferInfo); - - void layoutMsg(); - void bufferDestroyed(); void networkDestroyed(); void coreIdentityCreated(const Identity &); void coreIdentityRemoved(IdentityId); + void coreNetworkCreated(NetworkId); + void coreNetworkRemoved(NetworkId); + + void setConnectedToCore(QIODevice *socket, AccountId id); + void setConnectedToInternalCore(); + void setSyncedToCore(); + void setSecuredConnection(); + private: Client(QObject *parent = 0); virtual ~Client(); void init(); - void syncToCore(const QVariantMap &sessionState); + static void addNetwork(Network *); + static void setCurrentCoreAccount(AccountId); + static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } static QPointer instanceptr; - QPointer socket; - QPointer _signalProxy; - QPointer mainUi; - QPointer _networkModel; - QPointer _bufferModel; - QPointer _nickModel; + SignalProxy * _signalProxy; + AbstractUi * mainUi; + NetworkModel * _networkModel; + BufferModel * _bufferModel; + BufferSyncer * _bufferSyncer; + ClientBacklogManager *_backlogManager; + BufferViewManager *_bufferViewManager; + ClientIrcListHelper *_ircListHelper; + + MessageModel *_messageModel; + AbstractMessageProcessor *_messageProcessor; ClientMode clientMode; bool _connectedToCore, _syncedToCore; - QHash _buffers; QHash _networks; QHash _identities; - QTimer *layoutTimer; - QList layoutQueue; - - QVariantMap sessionData; + static AccountId _currentCoreAccount; friend class ClientSyncer; };