X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=362b523348dfeaf4d57317bb406fa46f46adc959;hp=4e7eb0e203bbb80304c57a32c3f9fb47d9a30285;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=cc7f376eb105f7bf931fb7f96c9601a7b3f69511 diff --git a/src/client/client.h b/src/client/client.h index 4e7eb0e2..362b5233 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -18,21 +18,23 @@ * 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 +#include "bufferinfo.h" +#include "types.h" -class BufferInfo; class Message; class MessageModel; +class AbstractMessageProcessor; class Identity; +class CertIdentity; class Network; class AbstractUi; @@ -41,46 +43,47 @@ class NetworkModel; class BufferModel; class BufferSyncer; class ClientBacklogManager; +class ClientIrcListHelper; +class ClientSyncer; class BufferViewManager; class IrcUser; class IrcChannel; class SignalProxy; struct NetworkInfo; -class QTimer; - 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 inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; } + static AbstractUi *mainUi(); static QList networkIds(); static const Network * network(NetworkId); static QList identityIds(); - static const Identity * identity(IdentityId); + 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 void createIdentity(const CertIdentity &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. + * \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. @@ -94,34 +97,31 @@ public: 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 AbstractUiMsg *layoutMsg(const Message &); + static AccountId currentCoreAccount(); static bool isConnected(); static bool isSynced(); static void userInput(BufferInfo bufferInfo, QString message); - enum ClientMode { LocalCore, RemoteCore }; - - static void checkForHighlight(Message &msg); static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients static void removeBuffer(BufferId id); + static void renameBuffer(BufferId bufferId, const QString &newName); + static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2); + + static void logMessage(QtMsgType type, const char *msg); + static inline const QString &debugLog() { return instance()->_debugLogBuffer; } 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 messageReceived(const Message &msg); void showConfigWizard(const QVariantMap &coredata); @@ -144,9 +144,7 @@ signals: 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 &); + void requestCreateIdentity(const Identity &, const QVariantMap &); //! Sent to the core when an identity shall be removed. Should not be used elsewhere. void requestRemoveIdentity(IdentityId); @@ -154,42 +152,36 @@ signals: void networkRemoved(NetworkId id); void requestCreateNetwork(const NetworkInfo &info); - void requestUpdateNetwork(const NetworkInfo &info); void requestRemoveNetwork(NetworkId); + void newClientSyncer(ClientSyncer *); + + void logUpdated(const QString &msg); + public slots: //void selectBuffer(Buffer *); void disconnectFromCore(); - void setCoreConfiguration(const QVariantMap &settings); - void bufferRemoved(BufferId bufferId); void bufferRenamed(BufferId bufferId, const QString &newName); + void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2); private slots: - //void coreSocketError(QAbstractSocket::SocketError); - - //void networkConnected(NetworkId); - //void networkDisconnected(NetworkId); + void disconnectedFromCore(); void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); - void receiveBacklog(BufferId bufferId, const QVariantList &msgs); - void updateBufferInfo(BufferInfo); - void updateLastSeenMsg(BufferId id, const MsgId &msgId); - 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 setConnectedToCore(AccountId id, QIODevice *socket = 0); void setSyncedToCore(); + void requestInitialBacklog(); void setSecuredConnection(); @@ -202,38 +194,32 @@ private: static void setCurrentCoreAccount(AccountId); static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } - Buffer *statusBuffer(const NetworkId &networkid) const; - static QPointer instanceptr; - QPointer socket; - SignalProxy * _signalProxy; - AbstractUi * mainUi; + 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 _statusBuffers; // fast lookup QHash _networks; QHash _identities; - Buffer *_monitorBuffer; - - QTimer *layoutTimer; - QLinkedList layoutQueue; - static AccountId _currentCoreAccount; + QString _debugLogBuffer; + QTextStream _debugLog; + friend class ClientSyncer; };