projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The Core Configuration Wizard is back! teH rul!
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
4df6685
..
40bf332
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;
@@
-58,6
+58,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 Buffer *monitorBuffer();
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
@@
-83,15
+84,16
@@
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 SignalProxy *signalProxy();
+ static AccountId currentCoreAccount();
+
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
@@
-99,10
+101,6
@@
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 };
signals:
enum ClientMode { LocalCore, RemoteCore };
signals:
@@
-119,10
+117,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
+137,21
@@
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);
private slots:
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
private slots:
- void recvSessionData(const QString &key, const QVariant &data);
-
//void coreSocketError(QAbstractSocket::SocketError);
//void networkConnected(NetworkId);
//void coreSocketError(QAbstractSocket::SocketError);
//void networkConnected(NetworkId);
@@
-173,13
+168,20
@@
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 QPointer<Client> instanceptr;
static QPointer<Client> instanceptr;
@@
-188,7
+190,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;
@@
-198,10
+199,12
@@
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;
-
QVariantMap sessionData
;
+
static AccountId _currentCoreAccount
;
friend class ClientSyncer;
};
friend class ClientSyncer;
};