X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=5a7569532add7f9ae14b81c2b9751f6c1464b4e4;hp=85cc23d685f78b718e250a01bbab7f34caa02a6c;hb=f12dbcd32ef6eff25bd730444e5165935e6b0cf5;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 85cc23d6..5a756953 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -18,73 +18,89 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QColor>  // FIXME Dependency on QtGui!
-
 #include "networkmodel.h"
 
-#include "mappedselectionmodel.h"
 #include <QAbstractItemView>
 
 #include "bufferinfo.h"
 #include "client.h"
 #include "signalproxy.h"
-#include "networkinfo.h"
+#include "network.h"
 #include "ircchannel.h"
 #include "ircuser.h"
 
+#include "util.h" // get rid of this (needed for isChannelName)
+
 /*****************************************
 *  Fancy Buffer Items
 *****************************************/
-BufferItem::BufferItem(Buffer *buffer, AbstractTreeItem *parent)
+BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
-    buf(buffer),
-    activity(Buffer::NoActivity)
+    _bufferInfo(bufferInfo),
+    _activity(NoActivity)
 {
+  // determine BufferType
+  if(bufferInfo.buffer().isEmpty())
+    _type = StatusType;
+  else if(isChannelName(bufferInfo.buffer()))
+    _type = ChannelType;
+  else
+    _type = QueryType;
+
   Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(buf->bufferType() == Buffer::QueryType)
+  if(bufferType() == QueryType)
     flags |= Qt::ItemIsDropEnabled;
   setFlags(flags);
 }
 
+
+const BufferInfo &BufferItem::bufferInfo() const {
+  return _bufferInfo;
+}
+
 quint64 BufferItem::id() const {
-  return buf->bufferInfo().uid();
+  return bufferInfo().uid();
 }
 
-void BufferItem::setActivity(const Buffer::ActivityLevel &level) {
-  activity = level;
+bool BufferItem::isStatusBuffer() const {
+   return bufferType() == StatusType;
 }
 
-QColor BufferItem::foreground(int column) const {
-  Q_UNUSED(column)
-  // for the time beeing we ignore the column :)
-  if(activity & Buffer::Highlight) {
-    return QColor(Qt::red);
-  } else if(activity & Buffer::NewMessage) {
-    return QColor(Qt::darkYellow);
-  } else if(activity & Buffer::OtherActivity) {
-    return QColor(Qt::darkGreen);
-  } else {
-    if(buf->isActive())
-      return QColor(Qt::black);
-    else
-      return QColor(Qt::gray);
-  }
+BufferItem::Type BufferItem::bufferType() const {
+  return _type;
+}
+
+bool BufferItem::isActive() const {
+  if(bufferType() == ChannelType)
+    return _ircChannel;
+  else
+    return qobject_cast<NetworkItem *>(parent())->isActive();
+}
+
+BufferItem::ActivityLevel BufferItem::activity() const {
+  return _activity;
+}
+
+void BufferItem::setActivity(const ActivityLevel &level) {
+  _activity = level;
+}
+
+void BufferItem::addActivity(const ActivityLevel &level) {
+  _activity |= level;
 }
 
 QVariant BufferItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
-  case NetworkModel::BufferUidRole:
-    return buf->bufferInfo().uid();
+  case NetworkModel::BufferIdRole:
+    return bufferInfo().uid();
   case NetworkModel::NetworkIdRole:
-    return buf->bufferInfo().networkId();
+    return bufferInfo().networkId();
   case NetworkModel::BufferTypeRole:
-    return int(buf->bufferType());
-  case NetworkModel::BufferActiveRole:
-    return buf->isActive();
-  case Qt::ForegroundRole:
-    return foreground(column);
+    return int(bufferType());
+  case NetworkModel::ItemActiveRole:
+    return isActive();
   default:
     return PropertyMapItem::data(column, role);
   }
@@ -102,10 +118,25 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
 	  this, SLOT(join(IrcUser *)));
   connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
 	  this, SLOT(part(IrcUser *)));
+  connect(ircChannel, SIGNAL(destroyed()),
+	  this, SLOT(ircChannelDestroyed()));
+  
+  emit dataChanged();
+}
+
+void BufferItem::ircChannelDestroyed() {
+  emit dataChanged();
+  for(int i = 0; i < childCount(); i++) {
+    emit childDestroyed(i);
+    removeChild(i);
+  }
 }
 
 QString BufferItem::bufferName() const {
-  return buf->name();
+  if(bufferType() == StatusType)
+    return tr("Status Buffer");
+  else
+    return bufferInfo().buffer();
 }
 
 QString BufferItem::topic() const {
@@ -128,8 +159,8 @@ void BufferItem::setTopic(const QString &topic) {
 }
 
 void BufferItem::join(IrcUser *ircUser) {
-//   emit newChild(new IrcUserItem(ircUser, this));
-//   emit dataChanged(2);
+  emit newChild(new IrcUserItem(ircUser, this));
+  emit dataChanged(2);
 }
 
 void BufferItem::part(IrcUser *ircUser) {
@@ -154,6 +185,8 @@ QVariant NetworkItem::data(int column, int role) const {
     return _networkId;
   case NetworkModel::ItemTypeRole:
     return NetworkModel::NetworkItemType;
+  case NetworkModel::ItemActiveRole:
+    return isActive();
   default:
     return PropertyMapItem::data(column, role);
   }
@@ -163,16 +196,20 @@ quint64 NetworkItem::id() const {
   return _networkId;
 }
 
+bool NetworkItem::isActive() const {
+  return _network;
+}
+
 QString NetworkItem::networkName() const {
-  if(_networkInfo)
-    return _networkInfo->networkName();
+  if(_network)
+    return _network->networkName();
   else
     return _networkName;
 }
 
 QString NetworkItem::currentServer() const {
-  if(_networkInfo)
-    return _networkInfo->currentServer();
+  if(_network)
+    return _network->currentServer();
   else
     return QString();
 }
@@ -189,23 +226,25 @@ int NetworkItem::nickCount() const {
   return count;
 }
 
-void NetworkItem::attachNetworkInfo(NetworkInfo *networkInfo) {
-  if(!networkInfo)
+void NetworkItem::attachNetwork(Network *network) {
+  if(!network)
     return;
   
-  _networkInfo = networkInfo;
+  _network = network;
 
-  connect(networkInfo, SIGNAL(networkNameSet(QString)),
+  connect(network, SIGNAL(networkNameSet(QString)),
 	  this, SLOT(setNetworkName(QString)));
-  connect(networkInfo, SIGNAL(currentServerSet(QString)),
+  connect(network, SIGNAL(currentServerSet(QString)),
 	  this, SLOT(setCurrentServer(QString)));
-  connect(networkInfo, SIGNAL(ircChannelAdded(QString)),
+  connect(network, SIGNAL(ircChannelAdded(QString)),
 	  this, SLOT(attachIrcChannel(QString)));
   // FIXME: connect this and that...
+
+  //emit dataChanged();
 }
 
 void NetworkItem::attachIrcChannel(const QString &channelName) {
-  IrcChannel *ircChannel = _networkInfo->ircChannel(channelName);
+  IrcChannel *ircChannel = _network->ircChannel(channelName);
   if(!ircChannel) {
     qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName;
     return;
@@ -262,19 +301,8 @@ void IrcUserItem::ircUserDestroyed() {
  * NetworkModel
  *****************************************/
 NetworkModel::NetworkModel(QObject *parent)
-  : TreeModel(NetworkModel::defaultHeader(), parent),
-    _selectionModelSynchronizer(new SelectionModelSynchronizer(this)),
-    _propertyMapper(new ModelPropertyMapper(this))
+  : TreeModel(NetworkModel::defaultHeader(), parent)
 {
-  // initialize the Property Mapper
-  _propertyMapper->setModel(this);
-  delete _propertyMapper->selectionModel();
-  MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(this);
-  _propertyMapper->setSelectionModel(mappedSelectionModel);
-  synchronizeSelectionModel(mappedSelectionModel);
-  
-  connect(_selectionModelSynchronizer, SIGNAL(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)),
-	  this, SLOT(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)));
 }
 
 QList<QVariant >NetworkModel::defaultHeader() {
@@ -283,31 +311,13 @@ QList<QVariant >NetworkModel::defaultHeader() {
   return data;
 }
 
-void NetworkModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) {
-  selectionModelSynchronizer()->addSelectionModel(selectionModel);
-}
-
-void NetworkModel::synchronizeView(QAbstractItemView *view) {
-  MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(view->model());
-  selectionModelSynchronizer()->addSelectionModel(mappedSelectionModel);
-  Q_ASSERT(mappedSelectionModel);
-  delete view->selectionModel();
-  view->setSelectionModel(mappedSelectionModel);
-}
-
-void NetworkModel::mapProperty(int column, int role, QObject *target, const QByteArray &property) {
-  propertyMapper()->addMapping(column, role, target, property);
-}
-
 bool NetworkModel::isBufferIndex(const QModelIndex &index) const {
   return index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType;
 }
 
 Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
   BufferItem *item = static_cast<BufferItem *>(index.internalPointer());
-  // FIXME get rid of this
-  Q_ASSERT(item->buffer() == Client::instance()->buffer(item->id()));
-  return item->buffer();
+  return Client::instance()->buffer(item->id());
 }
 
 
@@ -332,16 +342,19 @@ NetworkItem *NetworkModel::newNetwork(uint networkId, const QString &networkName
   return networkItem;
 }
 
-QModelIndex NetworkModel::bufferIndex(BufferInfo bufferInfo) {
-  QModelIndex networkIdx = networkIndex(bufferInfo.networkId());
-  if(!networkIdx.isValid())
-    return QModelIndex();
-  else
-    return indexById(bufferInfo.uid(), networkIdx);
+QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
+  AbstractTreeItem *netItem, *bufferItem;
+  for(int i = 0; i < rootItem->childCount(); i++) {
+    netItem = rootItem->child(i);
+    if((bufferItem = netItem->childById(bufferId))) {
+      return indexById(bufferItem->id(), networkIndex(netItem->id()));
+    }
+  }
+  return QModelIndex();
 }
 
 BufferItem *NetworkModel::buffer(BufferInfo bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo);
+  QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else
@@ -352,10 +365,7 @@ BufferItem *NetworkModel::newBuffer(BufferInfo bufferInfo) {
   BufferItem *bufferItem = buffer(bufferInfo);
   if(bufferItem == 0) {
     NetworkItem *networkItem = newNetwork(bufferInfo.networkId(), bufferInfo.network());
-
-    // FIXME: get rid of the buffer pointer
-    Buffer *buffer = Client::instance()->buffer(bufferInfo.uid());
-    bufferItem = new BufferItem(buffer, networkItem);
+    bufferItem = new BufferItem(bufferInfo, networkItem);
     appendChild(networkItem, bufferItem);
   }
 
@@ -402,7 +412,7 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const {
   QString netid, uid, bufferid;
   foreach(QModelIndex index, indexes) {
     netid = QString::number(index.data(NetworkIdRole).toUInt());
-    uid = QString::number(index.data(BufferUidRole).toUInt());
+    uid = QString::number(index.data(BufferIdRole).toUInt());
     bufferid = QString("%1:%2").arg(netid).arg(uid);
     if(!bufferlist.contains(bufferid))
       bufferlist << bufferid;
@@ -422,8 +432,8 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
     return false;
 
   // target must be a query
-  Buffer::Type targetType = (Buffer::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
-  if(targetType != Buffer::QueryType)
+  BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
+  if(targetType != BufferItem::QueryType)
     return false;
 
   QList< QPair<uint, uint> > bufferList = mimeDataToBufferList(data);
@@ -436,71 +446,46 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   uint bufferId = bufferList.first().second;
 
   // no self merges (would kill us)
-  if(bufferId == parent.data(BufferUidRole).toUInt())
+  if(bufferId == parent.data(BufferIdRole).toUInt())
     return false; 
   
   Q_ASSERT(rootItem->childById(netId));
   Q_ASSERT(rootItem->childById(netId)->childById(bufferId));
 
   // source must be a query too
-  Buffer::Type sourceType = (Buffer::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt();
-  if(sourceType != Buffer::QueryType)
+  BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt();
+  if(sourceType != BufferItem::QueryType)
     return false;
     
   // TODO: warn user about buffermerge!
-  qDebug() << "merging" << bufferId << parent.data(BufferUidRole).toInt();
+  qDebug() << "merging" << bufferId << parent.data(BufferIdRole).toInt();
   removeRow(parent.row(), parent.parent());
   
   return true;
 }
 
-void NetworkModel::attachNetworkInfo(NetworkInfo *networkInfo) {
-  NetworkItem *networkItem = network(networkInfo->networkId());
+void NetworkModel::attachNetwork(Network *net) {
+  NetworkItem *networkItem = network(net->networkId());
   if(!networkItem) {
-    qWarning() << "NetworkModel::attachNetworkInfo(): network is unknown!";
+    qWarning() << "NetworkModel::attachNetwork(): network is unknown!";
     return;
   }
-  networkItem->attachNetworkInfo(networkInfo);
+  networkItem->attachNetwork(net);
 }
 
-void NetworkModel::bufferUpdated(Buffer *buffer) {
-  BufferItem *bufferItem = newBuffer(buffer->bufferInfo());
+void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
+  BufferItem *bufferItem = newBuffer(bufferInfo);
   QModelIndex itemindex = indexByItem(bufferItem);
   emit dataChanged(itemindex, itemindex);
 }
 
-// This Slot indicates that the user has selected a different buffer in the gui
-void NetworkModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) {
-  Q_UNUSED(command)
-  Buffer *newCurrentBuffer;
-  if(isBufferIndex(index) && currentBuffer != (newCurrentBuffer = getBufferByIndex(index))) {
-    currentBuffer = newCurrentBuffer;
-    bufferActivity(Buffer::NoActivity, currentBuffer);
-    emit bufferSelected(currentBuffer);
-    emit selectionChanged(index);
-  }
-}
-
-void NetworkModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buf) {
-  BufferItem *bufferItem = buffer(buf->bufferInfo());
-  if(!bufferItem) {
-    qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
-    return;
-  }
-  
-  if(buf != currentBuffer)
-    bufferItem->setActivity(level);
-  else
-    bufferItem->setActivity(Buffer::NoActivity);
-  bufferUpdated(buf);
+void NetworkModel::bufferActivity(BufferItem::ActivityLevel level, BufferInfo bufferInfo) {
+//   BufferItem *bufferItem = buffer(buf->bufferInfo());
+//   if(!bufferItem) {
+//     qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
+//     return;
+//   }
+//   bufferItem->setActivity(level);
+//   bufferUpdated(buf);
 }
 
-void NetworkModel::selectBuffer(Buffer *buffer) {
-  QModelIndex index = bufferIndex(buffer->bufferInfo());
-  if(!index.isValid()) {
-    qWarning() << "NetworkModel::selectBuffer(): unknown Buffer has been selected.";
-    return;
-  }
-  // SUPER UGLY!
-  setCurrentIndex(index, 0);
-}