X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=de43a0b6b55d39244bc8ed04d46836035e124bc7;hp=34c903ea9f1646a2da99b38138528f1aeee2bf48;hb=770b7ef54b03f3ebd1e29a58b4757505e1809b2d;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 34c903ea..de43a0b6 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -122,18 +122,6 @@ void Client::init() {
 
 /*** public static methods ***/
 
-
-QList<Network *> Client::networks() {
-  return instance()->_networks.values();
-}
-
-Network *Client::network(uint networkid) {
-  if(instance()->_networks.contains(networkid))
-    return instance()->_networks[networkid];
-  else
-    return 0;
-}
-
 QList<BufferInfo> Client::allBufferInfos() {
   QList<BufferInfo> bufferids;
   foreach(Buffer *buffer, buffers()) {
@@ -162,9 +150,6 @@ Buffer *Client::buffer(BufferInfo id) {
   if(!buff) {
     Client *client = Client::instance();
     buff = new Buffer(id, client);
-
-    connect(buff, SIGNAL(userInput(BufferInfo, QString)),
-	    client, SLOT(userInput(BufferInfo, QString)));
     connect(buff, SIGNAL(destroyed()),
 	    client, SLOT(bufferDestroyed()));
     client->_buffers[id.uid()] = buff;
@@ -200,6 +185,17 @@ bool Client::isSynced() {
   return instance()->_syncedToCore;
 }
 
+/*** Network handling ***/
+
+QList<NetworkId> Client::networkIds() {
+  return instance()->_networks.keys();
+}
+
+const Network * Client::network(NetworkId networkid) {
+  if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
+  else return 0;
+}
+
 /*** Identity handling ***/
 
 QList<IdentityId> Client::identityIds() {
@@ -244,17 +240,8 @@ void Client::coreIdentityRemoved(IdentityId id) {
 }
 
 /***  ***/
-
-void Client::fakeInput(uint bufferUid, QString message) {
-  Buffer *buff = buffer(bufferUid);
-  if(!buff)
-    qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
-  else
-    emit instance()->sendInput(buff->bufferInfo(), message);
-}
-
-void Client::fakeInput(BufferInfo bufferInfo, QString message) {
-  fakeInput(bufferInfo, message);
+void Client::userInput(BufferInfo bufferInfo, QString message) {
+  emit instance()->sendInput(bufferInfo, message);
 }
 
 /*** core connection stuff ***/
@@ -284,16 +271,6 @@ void Client::disconnectFromCore() {
   // Clear internal data. Hopefully nothing relies on it at this point.
   _networkModel->clear();
 
-  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
-  while(bufferIter != _buffers.end()) {
-    Buffer *buffer = bufferIter.value();
-    disconnect(buffer, SIGNAL(destroyed()), this, 0);
-    bufferIter = _buffers.erase(bufferIter);
-    buffer->deleteLater();
-  }
-  Q_ASSERT(_buffers.isEmpty());
-
-
   QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
   while(netIter != _networks.end()) {
     Network *net = netIter.value();
@@ -303,6 +280,15 @@ void Client::disconnectFromCore() {
   }
   Q_ASSERT(_networks.isEmpty());
 
+  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
+  while(bufferIter != _buffers.end()) {
+    Buffer *buffer = bufferIter.value();
+    disconnect(buffer, SIGNAL(destroyed()), this, 0);
+    bufferIter = _buffers.erase(bufferIter);
+    buffer->deleteLater();
+  }
+  Q_ASSERT(_buffers.isEmpty());
+
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
     Identity *id = idIter.value();
@@ -387,6 +373,7 @@ void Client::addNetwork(Network *net) {
   networkModel()->attachNetwork(net);
   connect(net, SIGNAL(destroyed()), instance(), SLOT(networkDestroyed()));
   instance()->_networks[net->networkId()] = net;
+  emit instance()->networkAdded(net->networkId());
   //if(net->networkId() == 1) net->requestConnect(); // FIXME
 }
 
@@ -417,17 +404,8 @@ void Client::networkDestroyed() {
 
 void Client::recvMessage(const Message &msg) {
   Buffer *b = buffer(msg.buffer());
-
-//   Buffer::ActivityLevel level = Buffer::OtherActivity;
-//   if(msg.type() == Message::Plain || msg.type() == Message::Notice){
-//     level |= Buffer::NewMessage;
-//   }
-//   if(msg.flags() & Message::Highlight){
-//     level |= Buffer::Highlight;
-//   }
-//   emit bufferActivity(level, b);
-
   b->appendMsg(msg);
+  networkModel()->updateBufferActivity(msg);
 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
@@ -439,6 +417,7 @@ void Client::recvBacklogData(BufferInfo id, QVariantList msgs, bool /*done*/) {
   foreach(QVariant v, msgs) {
     Message msg = v.value<Message>();
     b->prependMsg(msg);
+    // networkModel()->updateBufferActivity(msg);
     if(!layoutQueue.contains(b)) layoutQueue.append(b);
   }
   if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
@@ -459,7 +438,3 @@ AbstractUiMsg *Client::layoutMsg(const Message &msg) {
   return instance()->mainUi->layoutMsg(msg);
 }
 
-void Client::userInput(BufferInfo id, QString msg) {
-  emit sendInput(id, msg);
-}
-