projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is it, the long-awaited huge commit with the new Network handling.
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
26e67cc
..
220e8c8
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-40,8
+40,8
@@
class NetworkModel;
class BufferModel;
class IrcUser;
class IrcChannel;
class BufferModel;
class IrcUser;
class IrcChannel;
-class NickModel;
class SignalProxy;
class SignalProxy;
+struct NetworkInfo;
class QTimer;
class QTimer;
@@
-54,13
+54,14
@@
public:
static void destroy();
static void init(AbstractUi *);
static void destroy();
static void init(AbstractUi *);
- static QList<Network *> networks();
- static Network *network(NetworkId networkid);
-
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
+ static Buffer *monitorBuffer();
+
+ static QList<NetworkId> networkIds();
+ static const Network * network(NetworkId);
static QList<IdentityId> identityIds();
static const Identity * identity(IdentityId);
static QList<IdentityId> identityIds();
static const Identity * identity(IdentityId);
@@
-83,13
+84,12
@@
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 NetworkModel *networkModel();
static BufferModel *bufferModel();
static NetworkModel *networkModel();
static BufferModel *bufferModel();
- static NickModel *nickModel();
static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
@@
-97,8
+97,7
@@
public:
static bool isConnected();
static bool isSynced();
static bool isConnected();
static bool isSynced();
- static void fakeInput(BufferId bufferUid, QString message);
- static void fakeInput(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 void storeSessionData(const QString &key, const QVariant &data);
static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
@@
-144,6
+143,13
@@
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 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 *);
@@
-153,14
+159,11
@@
public slots:
void setCoreConfiguration(const QVariantMap &settings);
void setCoreConfiguration(const QVariantMap &settings);
-
private slots:
void recvSessionData(const QString &key, const QVariant &data);
//void coreSocketError(QAbstractSocket::SocketError);
private slots:
void recvSessionData(const QString &key, const QVariant &data);
//void coreSocketError(QAbstractSocket::SocketError);
- void userInput(BufferInfo, QString);
-
//void networkConnected(NetworkId);
//void networkDisconnected(NetworkId);
//void networkConnected(NetworkId);
//void networkDisconnected(NetworkId);
@@
-175,13
+178,15
@@
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);
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 QPointer<Client> instanceptr;
static QPointer<Client> instanceptr;
@@
-190,7
+195,6
@@
private:
QPointer<AbstractUi> mainUi;
QPointer<NetworkModel> _networkModel;
QPointer<BufferModel> _bufferModel;
QPointer<AbstractUi> mainUi;
QPointer<NetworkModel> _networkModel;
QPointer<BufferModel> _bufferModel;
- QPointer<NickModel> _nickModel;
ClientMode clientMode;
ClientMode clientMode;
@@
-200,6
+204,8
@@
private:
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;