X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=e0ad4eced9ae38a8298a426bf43d726100afbcca;hp=d6ae6c08d4c3683bc19342ca14f547eb6a2d2a57;hb=16c2a9940b223cf5538efdcb8a6eb011b8258150;hpb=28e33cd3255a838a045303bed073f4f9c40a3af4 diff --git a/src/client/client.h b/src/client/client.h index d6ae6c08..e0ad4ece 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -27,8 +27,10 @@ #include #include "buffer.h" // needed for activity lvl + class BufferInfo; class Message; +class MessageModel; class Identity; class Network; @@ -38,6 +40,9 @@ class AbstractUi; class AbstractUiMsg; class NetworkModel; class BufferModel; +class BufferSyncer; +class ClientBacklogManager; +class BufferViewManager; class IrcUser; class IrcChannel; class SignalProxy; @@ -45,7 +50,6 @@ struct NetworkInfo; class QTimer; - class Client : public QObject { Q_OBJECT @@ -58,7 +62,7 @@ public: static QList buffers(); static Buffer *buffer(BufferId bufferUid); static Buffer *buffer(BufferInfo); - static Buffer *monitorBuffer(); + static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; } static QList networkIds(); static const Network * network(NetworkId); @@ -88,9 +92,14 @@ public: static void updateNetwork(const NetworkInfo &info); static void removeNetwork(NetworkId id); - static NetworkModel *networkModel(); - static BufferModel *bufferModel(); - static SignalProxy *signalProxy(); + static inline NetworkModel *networkModel() { return instance()->_networkModel; } + static inline BufferModel *bufferModel() { return instance()->_bufferModel; } + static inline SignalProxy *signalProxy() { return instance()->_signalProxy; } + + static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } + static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } + + static AccountId currentCoreAccount(); static AbstractUiMsg *layoutMsg(const Message &); @@ -101,6 +110,10 @@ public: 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); + signals: void sendInput(BufferInfo, QString message); void showBuffer(Buffer *); @@ -108,10 +121,12 @@ signals: void backlogReceived(Buffer *, QList); void requestBacklog(BufferInfo, QVariant, QVariant); void requestNetworkStates(); + void messageReceived(const Message &msg); void showConfigWizard(const QVariantMap &coredata); void connected(); + void securedConnection(); void disconnected(); void coreConnectionStateChanged(bool); @@ -145,12 +160,13 @@ signals: public slots: //void selectBuffer(Buffer *); - void setConnectedToCore(QIODevice *socket); - void setSyncedToCore(); void disconnectFromCore(); void setCoreConfiguration(const QVariantMap &settings); + void bufferRemoved(BufferId bufferId); + void bufferRenamed(BufferId bufferId, const QString &newName); + private slots: //void coreSocketError(QAbstractSocket::SocketError); @@ -159,8 +175,9 @@ private slots: void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); - void recvBacklogData(BufferInfo, QVariantList, bool); + void receiveBacklog(BufferId bufferId, const QVariantList &msgs); void updateBufferInfo(BufferInfo); + void updateLastSeenMsg(BufferId id, const MsgId &msgId); void layoutMsg(); @@ -171,26 +188,42 @@ private slots: void coreNetworkCreated(NetworkId); void coreNetworkRemoved(NetworkId); + void setConnectedToCore(QIODevice *socket, AccountId id); + void setSyncedToCore(); + void setSecuredConnection(); + + private: Client(QObject *parent = 0); virtual ~Client(); void init(); static void addNetwork(Network *); + static void setCurrentCoreAccount(AccountId); + static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } + + Buffer *statusBuffer(const NetworkId &networkid) const; static QPointer instanceptr; QPointer socket; - QPointer _signalProxy; - QPointer mainUi; - QPointer _networkModel; - QPointer _bufferModel; + + SignalProxy * _signalProxy; + AbstractUi * mainUi; + NetworkModel * _networkModel; + BufferModel * _bufferModel; + BufferSyncer * _bufferSyncer; + ClientBacklogManager *_backlogManager; + BufferViewManager *_bufferViewManager; + + MessageModel *_messageModel; ClientMode clientMode; bool _connectedToCore, _syncedToCore; QHash _buffers; + QHash _statusBuffers; // fast lookup QHash _networks; QHash _identities; @@ -199,6 +232,8 @@ private: QTimer *layoutTimer; QList layoutQueue; + static AccountId _currentCoreAccount; + friend class ClientSyncer; };