X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=333479202300ef874c2c11a6abee2eea58b2a304;hp=ec9d8d6985512f43723757d678e00c5151d1152d;hb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7;hpb=fee1002dcb914ef9d47ceae97080b8c140e3b1ed diff --git a/src/client/client.h b/src/client/client.h index ec9d8d69..33347920 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,14 @@ class BufferInfo; class Message; -class NetworkInfo; +class Identity; +class Network; class AbstractUi; class AbstractUiMsg; -class BufferTreeModel; +class NetworkModel; +class BufferModel; class SignalProxy; class QTimer; @@ -49,17 +51,37 @@ public: static void destroy(); static void init(AbstractUi *); - static QList networkInfos(); - static NetworkInfo *networkInfo(uint networkid); - + static QList networks(); + static Network *network(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 BufferTreeModel *bufferModel(); + 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 NetworkModel *networkModel(); + static BufferModel *bufferModel(); static SignalProxy *signalProxy(); static AbstractUiMsg *layoutMsg(const Message &); @@ -68,7 +90,7 @@ public: 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(); @@ -78,9 +100,7 @@ public: 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); void requestBacklog(BufferInfo, QVariant, QVariant); void requestNetworkStates(); @@ -90,19 +110,44 @@ signals: 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); + public slots: //void selectBuffer(Buffer *); //void connectToLocalCore(); void connectToCore(const QVariantMap &); void disconnectFromCore(); + void setCoreConfiguration(const QVariantMap &settings); + private slots: void recvCoreState(const QVariant &state); void recvSessionData(const QString &key, const QVariant &data); @@ -111,7 +156,6 @@ private slots: void coreHasData(); void coreSocketConnected(); void coreSocketDisconnected(); - void coreSocketStateChanged(QAbstractSocket::SocketState); void userInput(BufferInfo, QString); @@ -124,32 +168,37 @@ private slots: void recvBacklogData(BufferInfo, QVariantList, bool); void updateBufferInfo(BufferInfo); - void bufferDestroyed(); - 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); static QPointer instanceptr; - + QPointer socket; QPointer _signalProxy; QPointer mainUi; - QPointer _bufferModel; + QPointer _networkModel; + QPointer _bufferModel; ClientMode clientMode; quint32 blockSize; bool connectedToCore; - + QVariantMap coreConnectionInfo; - QHash _buffers; - QHash _networkInfo; + QHash _buffers; + QHash _network; + QHash _identities; QTimer *layoutTimer; QList layoutQueue;