projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve ChatMonitorFilter to use Message::Backlog rather than the timestamp
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
30a3d16
..
e626d75
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-30,39
+30,42
@@
class BufferInfo;
class Message;
class BufferInfo;
class Message;
+class MessageModel;
+class AbstractMessageProcessor;
class Identity;
class Network;
class Identity;
class Network;
-
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class BufferSyncer;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class BufferSyncer;
+class ClientBacklogManager;
+class ClientIrcListHelper;
+class BufferViewManager;
class IrcUser;
class IrcChannel;
class SignalProxy;
struct NetworkInfo;
class IrcUser;
class IrcChannel;
class SignalProxy;
struct NetworkInfo;
-class QTimer;
-
-
class Client : public QObject {
Q_OBJECT
public:
class Client : public QObject {
Q_OBJECT
public:
+ enum ClientMode {
+ LocalCore,
+ RemoteCore
+ };
+
static Client *instance();
static void destroy();
static void init(AbstractUi *);
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
static Client *instance();
static void destroy();
static void init(AbstractUi *);
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
- static Buffer *buffer(BufferId bufferUid);
+
//
static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
static Buffer *buffer(BufferInfo);
- static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
-
- Buffer *statusBuffer(const NetworkId &networkid) const;
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
@@
-79,9
+82,10
@@
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.
//! 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.
//! 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,21
+98,22
@@
public:
static inline NetworkModel *networkModel() { return instance()->_networkModel; }
static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
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 SignalProxy *signalProxy() { return instance()->_signalProxy; }
- static AccountId currentCoreAccount();
+ static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
+ static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
+ static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
- static A
bstractUiMsg *layoutMsg(const Message &
);
+ static A
ccountId currentCoreAccount(
);
static bool isConnected();
static bool isSynced();
static void userInput(BufferInfo bufferInfo, QString message);
static bool isConnected();
static bool isSynced();
static void userInput(BufferInfo bufferInfo, QString message);
- enum ClientMode { LocalCore, RemoteCore };
-
- static void checkForHighlight(Message &msg);
- static void setBufferLastSeen(BufferId id, const QDateTime &seen); // this is synced to core and other clients
+ static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
static void removeBuffer(BufferId id);
signals:
static void removeBuffer(BufferId id);
signals:
@@
-122,6
+127,7
@@
signals:
void showConfigWizard(const QVariantMap &coredata);
void connected();
void showConfigWizard(const QVariantMap &coredata);
void connected();
+ void securedConnection();
void disconnected();
void coreConnectionStateChanged(bool);
void disconnected();
void coreConnectionStateChanged(bool);
@@
-140,8
+146,6
@@
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 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);
//! Sent to the core when an identity shall be removed. Should not be used elsewhere.
void requestRemoveIdentity(IdentityId);
@@
-149,7
+153,6
@@
signals:
void networkRemoved(NetworkId id);
void requestCreateNetwork(const NetworkInfo &info);
void networkRemoved(NetworkId id);
void requestCreateNetwork(const NetworkInfo &info);
- void requestUpdateNetwork(const NetworkInfo &info);
void requestRemoveNetwork(NetworkId);
public slots:
void requestRemoveNetwork(NetworkId);
public slots:
@@
-170,11
+173,8
@@
private slots:
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
- void rec
vBacklogData(BufferInfo, QVariantList, bool
);
+ void rec
eiveBacklog(BufferId bufferId, const QVariantList &msgs
);
void updateBufferInfo(BufferInfo);
void updateBufferInfo(BufferInfo);
- void updateLastSeen(BufferId id, const QDateTime &lastSeen);
-
- void layoutMsg();
void bufferDestroyed();
void networkDestroyed();
void bufferDestroyed();
void networkDestroyed();
@@
-185,6
+185,8
@@
private slots:
void setConnectedToCore(QIODevice *socket, AccountId id);
void setSyncedToCore();
void setConnectedToCore(QIODevice *socket, AccountId id);
void setSyncedToCore();
+ void setSecuredConnection();
+
private:
Client(QObject *parent = 0);
private:
Client(QObject *parent = 0);
@@
-195,6
+197,8
@@
private:
static void setCurrentCoreAccount(AccountId);
static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
static void setCurrentCoreAccount(AccountId);
static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
+ Buffer *statusBuffer(const NetworkId &networkid) const;
+
static QPointer<Client> instanceptr;
QPointer<QIODevice> socket;
static QPointer<Client> instanceptr;
QPointer<QIODevice> socket;
@@
-204,6
+208,12
@@
private:
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
+ ClientBacklogManager *_backlogManager;
+ BufferViewManager *_bufferViewManager;
+ ClientIrcListHelper *_ircListHelper;
+
+ MessageModel *_messageModel;
+ AbstractMessageProcessor *_messageProcessor;
ClientMode clientMode;
ClientMode clientMode;
@@
-214,11
+224,6
@@
private:
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
- Buffer *_monitorBuffer;
-
- QTimer *layoutTimer;
- QList<Buffer *> layoutQueue;
-
static AccountId _currentCoreAccount;
friend class ClientSyncer;
static AccountId _currentCoreAccount;
friend class ClientSyncer;