#include "util.h"
QPointer<Client> Client::instanceptr = 0;
+AccountId Client::_currentCoreAccount = 0;
/*** Initialization/destruction ***/
}
void Client::init() {
-
+ _currentCoreAccount = 0;
_networkModel = new NetworkModel(this);
connect(this, SIGNAL(bufferUpdated(BufferInfo)),
_networkModel, SLOT(bufferUpdated(BufferInfo)));
/*** public static methods ***/
+AccountId Client::currentCoreAccount() {
+ return _currentCoreAccount;
+}
+
+void Client::setCurrentCoreAccount(AccountId id) {
+ _currentCoreAccount = id;
+}
+
QList<BufferInfo> Client::allBufferInfos() {
QList<BufferInfo> bufferids;
foreach(Buffer *buffer, buffers()) {
/*** core connection stuff ***/
-void Client::setConnectedToCore(QIODevice *sock) {
+void Client::setConnectedToCore(QIODevice *sock, AccountId id) {
socket = sock;
signalProxy()->addPeer(socket);
_connectedToCore = true;
+ setCurrentCoreAccount(id);
}
void Client::setSyncedToCore() {
}
_connectedToCore = false;
_syncedToCore = false;
+ setCurrentCoreAccount(0);
emit disconnected();
emit coreConnectionStateChanged(false);
}
void Client::networkDestroyed() {
- // FIXME this is not gonna work, net is a QObject here already!
Network *net = static_cast<Network *>(sender());
- NetworkId networkId = net->networkId();
- if(_networks.contains(networkId))
- _networks.remove(networkId);
+ QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
+ while(netIter != _networks.end()) {
+ if(*netIter == net) {
+ netIter = _networks.erase(netIter);
+ break;
+ } else {
+ netIter++;
+ }
+ }
}
void Client::recvMessage(const Message &msg) {
networkModel()->updateBufferActivity(msg);
if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
- // FIXME: fetch networkName();
- QString sender = ":" + msg.bufferInfo().bufferName() + ":" + msg.sender();
+ const Network *net = network(msg.bufferInfo().networkId());
+ QString networkName = net != 0
+ ? net->networkName() + ":"
+ : QString();
+ QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender();
Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
monitorBuffer()->appendMsg(mmsg);
}
foreach(QVariant v, msgs) {
Message msg = v.value<Message>();
b->prependMsg(msg);
- // networkModel()->updateBufferActivity(msg);
+ networkModel()->updateBufferActivity(msg);
if(!layoutQueue.contains(b)) layoutQueue.append(b);
}
if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();