projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doubleclick on nick now selects the buffer if buffer is available
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
4df6685
..
b51cc50
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-27,6
+27,7
@@
#include <QPointer>
#include "buffer.h" // needed for activity lvl
#include <QPointer>
#include "buffer.h" // needed for activity lvl
+
class BufferInfo;
class Message;
class BufferInfo;
class Message;
@@
-38,10
+39,11
@@
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
+class BufferSyncer;
class IrcUser;
class IrcChannel;
class IrcUser;
class IrcChannel;
-class NickModel;
class SignalProxy;
class SignalProxy;
+struct NetworkInfo;
class QTimer;
class QTimer;
@@
-58,6
+60,7
@@
public:
static QList<Buffer *> buffers();
static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
static QList<Buffer *> buffers();
static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
+ static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
@@
-83,14
+86,15
@@
public:
*/
static void removeIdentity(IdentityId id);
*/
static void removeIdentity(IdentityId id);
- static void addNetwork(NetworkId id);
- static void addNetwork(Network *);
+ 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 SignalProxy *signalProxy() { return instance()->_signalProxy; }
- static NetworkModel *networkModel();
- static BufferModel *bufferModel();
- static NickModel *nickModel();
- static SignalProxy *signalProxy();
+ static AccountId currentCoreAccount();
static AbstractUiMsg *layoutMsg(const Message &);
static AbstractUiMsg *layoutMsg(const Message &);
@@
-99,12
+103,12
@@
public:
static void userInput(BufferInfo bufferInfo, QString message);
static void userInput(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();
-
enum ClientMode { LocalCore, RemoteCore };
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 *);
signals:
void sendInput(BufferInfo, QString message);
void showBuffer(Buffer *);
@@
-119,10
+123,6
@@
signals:
void disconnected();
void coreConnectionStateChanged(bool);
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.
*/
//! The identity with the given ID has been newly created in core and client.
/** \param id The ID of the newly created identity.
*/
@@
-143,20
+143,24
@@
signals:
//! 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);
- void networkAdded(NetworkId id);
+ void networkCreated(NetworkId id);
+ void networkRemoved(NetworkId id);
+
+ void requestCreateNetwork(const NetworkInfo &info);
+ void requestUpdateNetwork(const NetworkInfo &info);
+ void requestRemoveNetwork(NetworkId);
public slots:
//void selectBuffer(Buffer *);
public slots:
//void selectBuffer(Buffer *);
- void setConnectedToCore(QIODevice *socket);
- void setSyncedToCore();
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
-private slots:
- void
recvSessionData(const QString &key, const QVariant &data
);
+ void bufferRemoved(BufferId bufferId);
+ void
bufferRenamed(BufferId bufferId, const QString &newName
);
+private slots:
//void coreSocketError(QAbstractSocket::SocketError);
//void networkConnected(NetworkId);
//void coreSocketError(QAbstractSocket::SocketError);
//void networkConnected(NetworkId);
@@
-166,6
+170,7
@@
private slots:
void recvStatusMsg(QString network, QString message);
void recvBacklogData(BufferInfo, QVariantList, bool);
void updateBufferInfo(BufferInfo);
void recvStatusMsg(QString network, QString message);
void recvBacklogData(BufferInfo, QVariantList, bool);
void updateBufferInfo(BufferInfo);
+ void updateLastSeenMsg(BufferId id, const MsgId &msgId);
void layoutMsg();
void layoutMsg();
@@
-173,35
+178,48
@@
private slots:
void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
+ void coreNetworkCreated(NetworkId);
+ void coreNetworkRemoved(NetworkId);
+
+ void setConnectedToCore(QIODevice *socket, AccountId id);
+ void setSyncedToCore();
private:
Client(QObject *parent = 0);
virtual ~Client();
void init();
private:
Client(QObject *parent = 0);
virtual ~Client();
void init();
- void syncToCore(const QVariantMap &sessionState);
+ static void addNetwork(Network *);
+ 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;
- QPointer<SignalProxy> _signalProxy;
- QPointer<AbstractUi> mainUi;
- QPointer<NetworkModel> _networkModel;
- QPointer<BufferModel> _bufferModel;
- QPointer<NickModel> _nickModel;
+
+ SignalProxy * _signalProxy;
+ AbstractUi * mainUi;
+ NetworkModel * _networkModel;
+ BufferModel * _bufferModel;
+ BufferSyncer * _bufferSyncer;
ClientMode clientMode;
bool _connectedToCore, _syncedToCore;
QHash<BufferId, Buffer *> _buffers;
ClientMode clientMode;
bool _connectedToCore, _syncedToCore;
QHash<BufferId, Buffer *> _buffers;
+ QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
+ Buffer *_monitorBuffer;
+
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
-
QVariantMap sessionData
;
+
static AccountId _currentCoreAccount
;
friend class ClientSyncer;
};
friend class ClientSyncer;
};