X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=f42e2a4ac088f62d666832419cb722bb2efa6c24;hp=899991f7c17696c627c572eeebcf87558eb21cec;hb=f6f6f3e368543f0a4dce1dae772f161d7e357064;hpb=99c92e21b3b9eb5ed661632cdfb69aabfc6b2deb

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 899991f7..f42e2a4a 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -103,10 +103,11 @@ Buffer *Client::buffer(BufferInfo id) {
 
 // FIXME switch to netids!
 // WHEN IS THIS NEEDED ANYHOW!?
+// ...only for finding the Buffer for a channel, I guess...
 BufferInfo Client::bufferInfo(QString net, QString buf) {
   foreach(Buffer *buffer_, buffers()) {
     BufferInfo bufferInfo = buffer_->bufferInfo();
-    if(bufferInfo.network() == net && bufferInfo.buffer() == buf)
+    if(!bufferInfo.network().compare(net, Qt::CaseInsensitive) && !bufferInfo.buffer().compare(buf, Qt::CaseInsensitive))
       return bufferInfo;
   }
   Q_ASSERT(false);  // should never happen!
@@ -117,8 +118,8 @@ BufferInfo Client::statusBufferInfo(QString net) {
   return bufferInfo(net, "");
 }
 
-BufferTreeModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+NetworkModel *Client::networkModel() {
+  return instance()->_networkModel;
 }
 
 SignalProxy *Client::signalProxy() {
@@ -133,25 +134,26 @@ Client::Client(QObject *parent)
     socket(0),
     _signalProxy(new SignalProxy(SignalProxy::Client, this)),
     mainUi(0),
-    _bufferModel(0),
+    _networkModel(0),
     connectedToCore(false)
 {
 }
 
 Client::~Client() {
+  
 }
 
 void Client::init() {
   blockSize = 0;
 
-  _bufferModel = new BufferTreeModel(this);
+  _networkModel = new NetworkModel(this);
 
   connect(this, SIGNAL(bufferSelected(Buffer *)),
-	  _bufferModel, SLOT(selectBuffer(Buffer *)));
+	  _networkModel, SLOT(selectBuffer(Buffer *)));
   connect(this, SIGNAL(bufferUpdated(Buffer *)),
-	  _bufferModel, SLOT(bufferUpdated(Buffer *)));
+	  _networkModel, SLOT(bufferUpdated(Buffer *)));
   connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
-	  _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+	  _networkModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
 
   SignalProxy *p = signalProxy();
   p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
@@ -241,7 +243,7 @@ void Client::disconnectFromCore() {
 }
 
 void Client::setCoreConfiguration(const QVariantMap &settings) {
-  writeDataToDevice(socket, settings);
+  SignalProxy::writeDataToDevice(socket, settings);
 }
 
 void Client::coreSocketConnected() {
@@ -251,7 +253,7 @@ void Client::coreSocketConnected() {
   clientInit["GuiProtocol"] = GUI_PROTOCOL;
   clientInit["User"] = coreConnectionInfo["User"].toString();
   clientInit["Password"] = coreConnectionInfo["Password"].toString();
-  writeDataToDevice(socket, clientInit);
+  SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
 void Client::coreSocketDisconnected() {
@@ -261,7 +263,7 @@ void Client::coreSocketDisconnected() {
   blockSize = 0;
 
   /* Clear internal data. Hopefully nothing relies on it at this point. */
-  _bufferModel->clear();
+  _networkModel->clear();
 
   QHash<uint, Buffer *>::iterator bufferIter =  _buffers.begin();
   while(bufferIter != _buffers.end()) {
@@ -281,7 +283,7 @@ void Client::coreSocketDisconnected() {
     net->deleteLater();
   }
   Q_ASSERT(_networkInfo.isEmpty());
-  
+
   coreConnectionInfo.clear();
   sessionData.clear();
   layoutQueue.clear();
@@ -416,7 +418,7 @@ void Client::coreSocketError(QAbstractSocket::SocketError) {
 
 void Client::coreHasData() {
   QVariant item;
-  if(readDataFromDevice(socket, blockSize, item)) {
+  if(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
     emit recvPartialItem(1,1);
     QVariantMap msg = item.toMap();
     if (!msg["StartWizard"].toBool()) {
@@ -442,12 +444,14 @@ void Client::networkConnected(uint netid) {
 
   NetworkInfo *netinfo = new NetworkInfo(netid, this);
   netinfo->setProxy(signalProxy());
+  networkModel()->attachNetworkInfo(netinfo);
   
   if(!isConnected()) {
     connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
     connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
     connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
   }
+  connect(netinfo, SIGNAL(ircChannelAdded(QString)), this, SLOT(ircChannelAdded(QString)));
   connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed()));
   _networkInfo[netid] = netinfo;
 }
@@ -460,7 +464,7 @@ void Client::networkDisconnected(uint networkid) {
     //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME
     buffer->setActive(false);
   }
-  
+
   Q_ASSERT(networkInfo(networkid));
   if(!networkInfo(networkid)->initialized()) {
     qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
@@ -468,6 +472,15 @@ void Client::networkDisconnected(uint networkid) {
   }
 }
 
+void Client::ircChannelAdded(QString chanName) {
+  NetworkInfo *netInfo = qobject_cast<NetworkInfo*>(sender());
+  Q_ASSERT(netInfo);
+  Buffer *buf = buffer(bufferInfo(netInfo->networkName(), chanName));
+  Q_ASSERT(buf);
+  buf->setIrcChannel(netInfo->ircChannel(chanName));
+
+}
+
 void Client::updateBufferInfo(BufferInfo id) {
   buffer(id)->updateBufferInfo(id);
 }