X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=b8faf9fbd20db11233857681952e144332eba39d;hp=349b5ab2891d79bed8d1692b8a7e0d9afe11cc2b;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=b30780406eabbcfdc313721e961ef063ab06c8d4 diff --git a/src/client/client.h b/src/client/client.h index 349b5ab2..b8faf9fb 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 * @@ -18,146 +18,196 @@ * 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; -class Message; +#include "bufferinfo.h" +#include "types.h" -class NetworkInfo; +class Message; +class MessageModel; +class AbstractMessageProcessor; +class Identity; +class Network; class AbstractUi; class AbstractUiMsg; -class BufferTreeModel; +class NetworkModel; +class BufferModel; +class BufferSyncer; +class ClientBacklogManager; +class ClientIrcListHelper; +class ClientSyncer; +class BufferViewManager; +class IrcUser; +class IrcChannel; 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 networkInfos(); - static NetworkInfo *networkInfo(uint networkid); - - static QList allBufferInfos(); - static QList buffers(); - static Buffer *buffer(uint bufferUid); - static Buffer *buffer(BufferInfo); - static BufferInfo statusBufferInfo(QString net); - static BufferInfo bufferInfo(QString net, QString buf); + 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); - static BufferTreeModel *bufferModel(); - static SignalProxy *signalProxy(); + //! 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 id The identity to be updated. + * \param serializedData The identity's content (cf. SyncableObject::toVariantMap()) + */ + static void updateIdentity(IdentityId id, const QVariantMap &serializedData); - static AbstractUiMsg *layoutMsg(const Message &); + //! 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 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 inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } + static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; } + static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } + + static AccountId currentCoreAccount(); 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 }; + 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 bufferSelected(Buffer *); - void bufferUpdated(Buffer *); - void bufferActivity(Buffer::ActivityLevel, Buffer *); - 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 securedConnection(); void disconnected(); + void coreConnectionStateChanged(bool); + + //! 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); - void sessionDataChanged(const QString &key); - void sessionDataChanged(const QString &key, const QVariant &data); - void sendSessionData(const QString &key, const QVariant &data); + //! 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 removed. Should not be used elsewhere. + void requestRemoveIdentity(IdentityId); + + 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 connectToLocalCore(); - void connectToCore(const QVariantMap &); - void disconnectFromCore(); -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 disconnectFromCore(); - void userInput(BufferInfo, QString); + void bufferRemoved(BufferId bufferId); + void bufferRenamed(BufferId bufferId, const QString &newName); - void networkConnected(uint); - void networkDisconnected(uint); +private slots: + void disconnectedFromCore(); - void updateCoreConnectionProgress(); void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); - void recvBacklogData(BufferInfo, QVariantList, bool); - void updateBufferInfo(BufferInfo); - void bufferDestroyed(); - void networkInfoDestroyed(); + 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(); - void layoutMsg(); private: Client(QObject *parent = 0); virtual ~Client(); void init(); - - void syncToCore(const QVariant &coreState); + + 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 _bufferModel; - ClientMode clientMode; + SignalProxy * _signalProxy; + AbstractUi * mainUi; + NetworkModel * _networkModel; + BufferModel * _bufferModel; + BufferSyncer * _bufferSyncer; + ClientBacklogManager *_backlogManager; + BufferViewManager *_bufferViewManager; + ClientIrcListHelper *_ircListHelper; + + MessageModel *_messageModel; + AbstractMessageProcessor *_messageProcessor; - quint32 blockSize; - bool connectedToCore; - - QVariantMap coreConnectionInfo; - QHash _buffers; - QHash _networkInfo; + ClientMode clientMode; - QTimer *layoutTimer; - QList layoutQueue; + bool _connectedToCore, _syncedToCore; - QVariantMap sessionData; + QHash _networks; + QHash _identities; + static AccountId _currentCoreAccount; + friend class ClientSyncer; }; #endif