/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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(Buffer::NoActivity)
{
Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
- if(buf->bufferType() == Buffer::QueryType)
+ if(bufferType() == BufferInfo::QueryBuffer)
flags |= Qt::ItemIsDropEnabled;
+
+ if(bufferType() == BufferInfo::StatusBuffer) {
+ NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
+ connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+ }
setFlags(flags);
}
+const BufferInfo &BufferItem::bufferInfo() const {
+ return _bufferInfo;
+}
+
quint64 BufferItem::id() const {
- return buf->bufferInfo().uid();
+ return qHash(bufferInfo().bufferId());
}
-void BufferItem::setActivity(const Buffer::ActivityLevel &level) {
- activity = level;
+bool BufferItem::isStatusBuffer() const {
+ return bufferType() == BufferInfo::StatusBuffer;
}
-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);
- }
+BufferInfo::Type BufferItem::bufferType() const {
+ return bufferInfo().type();
+}
+
+bool BufferItem::isActive() const {
+ if(bufferType() == BufferInfo::ChannelBuffer)
+ return _ircChannel;
+ else
+ return qobject_cast<NetworkItem *>(parent())->isActive();
+}
+
+bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
+ _activity = level;
+ emit dataChanged();
+ return true;
+}
+
+void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
+ Buffer::ActivityLevel oldActivity = _activity;
+ _activity |= level;
+ if(oldActivity != _activity)
+ emit dataChanged();
}
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 qVariantFromValue(bufferInfo().bufferId());
case NetworkModel::NetworkIdRole:
- return buf->bufferInfo().networkId();
+ return qVariantFromValue(bufferInfo().networkId());
+ case NetworkModel::BufferInfoRole:
+ return qVariantFromValue(bufferInfo());
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();
+ case NetworkModel::BufferActivityRole:
+ return (int)activityLevel();
default:
return PropertyMapItem::data(column, role);
}
}
+bool BufferItem::setData(int column, const QVariant &value, int role) {
+ switch(role) {
+ case NetworkModel::BufferActivityRole:
+ return setActivityLevel((Buffer::ActivityLevel)value.toInt());
+ default:
+ return PropertyMapItem::setData(column, value, role);
+ }
+ return true;
+}
+
+
void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
if(!ircChannel)
return;
this, SLOT(join(IrcUser *)));
connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
this, SLOT(part(IrcUser *)));
+ connect(ircChannel, SIGNAL(destroyed()),
+ this, SLOT(ircChannelDestroyed()));
+ connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
+ this, SLOT(userModeChanged(IrcUser *)));
+ connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
+ this, SLOT(userModeChanged(IrcUser *)));
+ connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
+ this, SLOT(userModeChanged(IrcUser *)));
+
+ if(!ircChannel->ircUsers().isEmpty()) {
+ qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)";
+ foreach(IrcUser *ircUser, ircChannel->ircUsers()) {
+ join(ircUser);
+ }
+ }
+
+ emit dataChanged();
+}
+
+void BufferItem::ircChannelDestroyed() {
+ emit dataChanged();
+ removeAllChilds();
}
QString BufferItem::bufferName() const {
- return buf->name();
+ if(bufferType() == BufferInfo::StatusBuffer)
+ return tr("Status Buffer");
+ else
+ return bufferInfo().bufferName();
}
QString BufferItem::topic() const {
return QString();
}
+void BufferItem::ircUserDestroyed() {
+ // PRIVATE
+ IrcUser *ircUser = static_cast<IrcUser *>(sender());
+ removeUserFromCategory(ircUser);
+ emit dataChanged(2);
+}
+
int BufferItem::nickCount() const {
if(_ircChannel)
return _ircChannel->ircUsers().count();
}
void BufferItem::join(IrcUser *ircUser) {
-// emit newChild(new IrcUserItem(ircUser, this));
-// emit dataChanged(2);
+ if(!ircUser)
+ return;
+
+ addUserToCategory(ircUser);
+ connect(ircUser, SIGNAL(destroyed()),
+ this, SLOT(ircUserDestroyed()));
+ emit dataChanged(2);
+}
+
+void BufferItem::addUserToCategory(IrcUser *ircUser) {
+ Q_ASSERT(_ircChannel);
+
+ UserCategoryItem *categoryItem;
+ int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+ if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
+ categoryItem = new UserCategoryItem(categoryId, this);
+ newChild(categoryItem);
+ }
+ categoryItem->addUser(ircUser);
+
+ int totalusers = 0;
+ for(int i = 0; i < childCount(); i++) {
+ totalusers += child(i)->childCount();
+ }
}
void BufferItem::part(IrcUser *ircUser) {
- Q_UNUSED(ircUser);
+ if(!ircUser) {
+ qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser;
+ return;
+ }
+
+ disconnect(ircUser, 0, this, 0);
+ removeUserFromCategory(ircUser);
emit dataChanged(2);
}
+void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
+ if(!_ircChannel) {
+ // If we parted the channel there might still be some ircUsers connected.
+ // in that case we just ignore the call
+ Q_ASSERT(childCount() == 0);
+ return;
+ }
+
+ bool success = false;
+ UserCategoryItem *categoryItem = 0;
+ for(int i = 0; i < childCount(); i++) {
+ categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+ if(success = categoryItem->removeUser(ircUser)) {
+ if(categoryItem->childCount() == 0)
+ removeChild(i);
+ break;
+ }
+ }
+
+ if(!success) {
+ qDebug() << "didn't find User:" << ircUser << qHash(ircUser);
+ qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
+ for(int i = 0; i < childCount(); i++) {
+ categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+ categoryItem->dumpChildList();
+ }
+ qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
+ }
+ Q_ASSERT(success);
+
+ int totalusers = 0;
+ for(int i = 0; i < childCount(); i++) {
+ totalusers += child(i)->childCount();
+ }
+}
+
+void BufferItem::userModeChanged(IrcUser *ircUser) {
+ Q_ASSERT(_ircChannel);
+
+ UserCategoryItem *categoryItem;
+ int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+ if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
+ return; // already in the right category;
+
+ removeUserFromCategory(ircUser);
+ addUserToCategory(ircUser);
+}
+
+/*
+void BufferItem::setLastMsgInsert(QDateTime msgDate) {
+ if(msgDate.isValid() && msgDate > _lastMsgInsert)
+ _lastMsgInsert = msgDate;
+}
+*/
+/*
+// FIXME emit dataChanged()
+bool BufferItem::setLastSeen() {
+ if(_lastSeen > _lastMsgInsert)
+ return false;
+
+ _lastSeen = _lastMsgInsert;
+ BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
+ return true;
+}
+
+QDateTime BufferItem::lastSeen() {
+ return _lastSeen;
+}
+*/
/*****************************************
* Network Items
*****************************************/
-NetworkItem::NetworkItem(const uint &netid, const QString &network, AbstractTreeItem *parent)
+NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
: PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
- _networkId(netid),
- _networkName(network)
+ _networkId(netid)
{
setFlags(Qt::ItemIsEnabled);
}
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
case NetworkModel::NetworkIdRole:
- return _networkId;
+ return qVariantFromValue(_networkId);
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
+ case NetworkModel::ItemActiveRole:
+ return isActive();
default:
return PropertyMapItem::data(column, role);
}
}
quint64 NetworkItem::id() const {
- return _networkId;
+ return qHash(_networkId);
+}
+
+bool NetworkItem::isActive() const {
+ if(_network)
+ return _network->isConnected();
+ else
+ return false;
}
QString NetworkItem::networkName() const {
- if(_networkInfo)
- return _networkInfo->networkName();
+ if(_network)
+ return _network->networkName();
else
- return _networkName;
+ return QString();
}
QString NetworkItem::currentServer() const {
- if(_networkInfo)
- return _networkInfo->currentServer();
+ if(_network)
+ return _network->currentServer();
else
return QString();
}
int NetworkItem::nickCount() const {
- BufferItem *bufferItem;
- int count = 0;
- for(int i = 0; i < childCount(); i++) {
- bufferItem = qobject_cast<BufferItem *>(child(i));
- if(!bufferItem)
- continue;
- count += bufferItem->nickCount();
- }
- return count;
+ if(_network)
+ return _network->ircUsers().count();
+ else
+ return 0;
}
-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)));
+ connect(network, SIGNAL(connectedSet(bool)),
+ this, SIGNAL(dataChanged()));
+
// 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;
BufferItem *bufferItem;
for(int i = 0; i < childCount(); i++) {
bufferItem = qobject_cast<BufferItem *>(child(i));
- if(bufferItem->bufferName() == ircChannel->name()) {
+ if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
bufferItem->attachIrcChannel(ircChannel);
break;
}
emit dataChanged(1);
}
+/*****************************************
+* User Category Items (like @vh etc.)
+*****************************************/
+// we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to
+// category strings anyway.
+// TODO make this translateable depending on the number of users in a category
+// -> we can't set the real string here, because tr() needs to get the actual number as second param
+// -> tr("%n User(s)", n) needs to be used somewhere where we do know the user number n
+const QList<UserCategoryItem::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
+ << UserCategoryItem::Category('q', tr("Owners"))
+ << UserCategoryItem::Category('a', tr("Admins"))
+ << UserCategoryItem::Category('o', tr("Operators"))
+ << UserCategoryItem::Category('h', tr("Half-Ops"))
+ << UserCategoryItem::Category('v', tr("Voiced"));
+
+UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
+ : PropertyMapItem(QStringList() << "categoryId", parent),
+ _category(category)
+{
+}
+
+QString UserCategoryItem::categoryId() {
+ if(_category < categories.count())
+ return categories[_category].displayString;
+ else
+ return tr("Users");
+}
+
+quint64 UserCategoryItem::id() const {
+ return qHash(_category);
+}
+
+void UserCategoryItem::addUser(IrcUser *ircUser) {
+ newChild(new IrcUserItem(ircUser, this));
+}
+
+bool UserCategoryItem::removeUser(IrcUser *ircUser) {
+ return removeChildById(qHash(ircUser));
+}
+
+int UserCategoryItem::categoryFromModes(const QString &modes) {
+ for(int i = 0; i < categories.count(); i++) {
+ if(modes.contains(categories[i].mode))
+ return i;
+ }
+ return categories.count();
+}
+
+QVariant UserCategoryItem::data(int column, int role) const {
+ switch(role) {
+ case NetworkModel::ItemActiveRole:
+ return true;
+ case NetworkModel::ItemTypeRole:
+ return NetworkModel::UserCategoryItemType;
+ case NetworkModel::BufferIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::NetworkIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::BufferInfoRole:
+ return parent()->data(column, role);
+ default:
+ return PropertyMapItem::data(column, role);
+ }
+}
+
+
/*****************************************
* Irc User Items
*****************************************/
IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "nickName", parent),
- _ircUser(ircUser)
+ _ircUser(ircUser),
+ _id(qHash(ircUser))
{
- connect(ircUser, SIGNAL(destroyed()),
- this, SLOT(ircUserDestroyed()));
+ // we don't need to handle the ircUser's destroyed signal since it's automatically removed
+ // by the IrcChannel::ircUserParted();
connect(ircUser, SIGNAL(nickSet(QString)),
this, SLOT(setNick(QString)));
}
-QString IrcUserItem::nickName() {
- return _ircUser->nick();
+QString IrcUserItem::nickName() const {
+ if(_ircUser)
+ return _ircUser->nick();
+ else
+ return QString();
+}
+
+bool IrcUserItem::isActive() const {
+ if(_ircUser)
+ return !_ircUser->isAway();
+ else
+ return false;
+}
+
+IrcUser *IrcUserItem::ircUser() {
+ return _ircUser;
+}
+
+quint64 IrcUserItem::id() const {
+ return _id;
+}
+
+QVariant IrcUserItem::data(int column, int role) const {
+ switch(role) {
+ case NetworkModel::ItemActiveRole:
+ return isActive();
+ case NetworkModel::ItemTypeRole:
+ return NetworkModel::IrcUserItemType;
+ case NetworkModel::BufferIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::NetworkIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::BufferInfoRole:
+ return parent()->data(column, role);
+ default:
+ return PropertyMapItem::data(column, role);
+ }
+}
+
+QString IrcUserItem::toolTip(int column) const {
+ Q_UNUSED(column);
+ QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
+ if(_ircUser->isAway()) toolTip[0].append(" is away");
+ if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
+ if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
+ if(!_ircUser->ircOperator().isEmpty()) toolTip.append(_ircUser->ircOperator());
+ toolTip.append(_ircUser->hostmask());
+
+ if(_ircUser->idleTime().isValid()) {
+ QDateTime now = QDateTime::currentDateTime();
+ QDateTime idle = _ircUser->idleTime();
+ int idleTime = idle.secsTo(now);
+
+ QList< QPair<int, QString> > timeUnit;
+ timeUnit.append(qMakePair(365*60*60, tr("year")));
+ timeUnit.append(qMakePair(24*60*60, tr("day")));
+ timeUnit.append(qMakePair(60*60, tr("h")));
+ timeUnit.append(qMakePair(60, tr("min")));
+ timeUnit.append(qMakePair(1, tr("sec")));
+
+ QString idleString(' ');
+ for(int i=0; i < timeUnit.size(); i++) {
+ int n = idleTime / timeUnit[i].first;
+ if(n > 0) {
+ idleString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second);
+ }
+ idleTime = idleTime % timeUnit[i].first;
+ }
+ toolTip.append(tr("idling since %1").arg(idleString));
+ }
+
+ if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server()));
+
+ return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
void IrcUserItem::setNick(QString newNick) {
Q_UNUSED(newNick);
emit dataChanged(0);
}
-void IrcUserItem::ircUserDestroyed() {
- deleteLater();
-}
-
/*****************************************
* 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() {
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());
}
+*/
// experimental stuff :)
-QModelIndex NetworkModel::networkIndex(uint networkId) {
- return indexById(networkId);
+QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
+ return indexById(qHash(networkId));
}
-NetworkItem *NetworkModel::network(uint networkId) {
- return qobject_cast<NetworkItem *>(rootItem->childById(networkId));
+NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
+ return qobject_cast<NetworkItem *>(rootItem->childById(networkId.toInt()));
}
-NetworkItem *NetworkModel::newNetwork(uint networkId, const QString &networkName) {
- NetworkItem *networkItem = network(networkId);
+NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
+ NetworkItem *netItem = existsNetworkItem(networkId);
- if(networkItem == 0) {
- networkItem = new NetworkItem(networkId, networkName, rootItem);
- appendChild(rootItem, networkItem);
+ if(netItem == 0) {
+ netItem = new NetworkItem(networkId, rootItem);
+ rootItem->newChild(netItem);
}
- Q_ASSERT(networkItem);
- return networkItem;
+ Q_ASSERT(netItem);
+ return netItem;
}
-QModelIndex NetworkModel::bufferIndex(BufferInfo bufferInfo) {
- QModelIndex networkIdx = networkIndex(bufferInfo.networkId());
- if(!networkIdx.isValid())
- return QModelIndex();
- else
- return indexById(bufferInfo.uid(), networkIdx);
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+ rootItem->removeChildById(qHash(networkId));
}
-BufferItem *NetworkModel::buffer(BufferInfo bufferInfo) {
- QModelIndex bufferIdx = bufferIndex(bufferInfo);
+QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
+ AbstractTreeItem *netItem, *bufferItem;
+ for(int i = 0; i < rootItem->childCount(); i++) {
+ netItem = rootItem->child(i);
+ if((bufferItem = netItem->childById(qHash(bufferId)))) {
+ return indexByItem(bufferItem);
+ }
+ }
+ return QModelIndex();
+}
+
+BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
+ QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
if(bufferIdx.isValid())
return static_cast<BufferItem *>(bufferIdx.internalPointer());
else
return 0;
}
-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);
- appendChild(networkItem, bufferItem);
+BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) {
+ BufferItem *bufItem = existsBufferItem(bufferInfo);
+ if(bufItem == 0) {
+ NetworkItem *netItem = networkItem(bufferInfo.networkId());
+ bufItem = new BufferItem(bufferInfo, netItem);
+ netItem->newChild(bufItem);
}
- Q_ASSERT(bufferItem);
- return bufferItem;
+ Q_ASSERT(bufItem);
+ return bufItem;
}
QStringList NetworkModel::mimeTypes() const {
return mimeData->hasFormat("application/Quassel/BufferItemList");
}
-QList< QPair<uint, uint> > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) {
- QList< QPair<uint, uint> > bufferList;
+QList< QPair<NetworkId, BufferId> > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) {
+ QList< QPair<NetworkId, BufferId> > bufferList;
if(!mimeContainsBufferList(mimeData))
return bufferList;
QStringList rawBufferList = QString::fromAscii(mimeData->data("application/Quassel/BufferItemList")).split(",");
- uint networkId, bufferUid;
+ NetworkId networkId;
+ BufferId bufferUid;
foreach(QString rawBuffer, rawBufferList) {
if(!rawBuffer.contains(":"))
continue;
- networkId = rawBuffer.section(":", 0, 0).toUInt();
- bufferUid = rawBuffer.section(":", 1, 1).toUInt();
+ networkId = rawBuffer.section(":", 0, 0).toInt();
+ bufferUid = rawBuffer.section(":", 1, 1).toInt();
bufferList.append(qMakePair(networkId, bufferUid));
}
return bufferList;
QStringList bufferlist;
QString netid, uid, bufferid;
foreach(QModelIndex index, indexes) {
- netid = QString::number(index.data(NetworkIdRole).toUInt());
- uid = QString::number(index.data(BufferUidRole).toUInt());
+ netid = QString::number(index.data(NetworkIdRole).value<NetworkId>().toInt());
+ uid = QString::number(index.data(BufferIdRole).value<BufferId>().toInt());
bufferid = QString("%1:%2").arg(netid).arg(uid);
if(!bufferlist.contains(bufferid))
bufferlist << bufferid;
return false;
// target must be a query
- Buffer::Type targetType = (Buffer::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
- if(targetType != Buffer::QueryType)
+ BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
+ if(targetType != BufferInfo::QueryBuffer)
return false;
- QList< QPair<uint, uint> > bufferList = mimeDataToBufferList(data);
+ QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
// exactly one buffer has to be dropped
if(bufferList.count() != 1)
return false;
- uint netId = bufferList.first().first;
- uint bufferId = bufferList.first().second;
+ NetworkId netId = bufferList.first().first;
+ BufferId bufferId = bufferList.first().second;
// no self merges (would kill us)
- if(bufferId == parent.data(BufferUidRole).toUInt())
+ if(bufferId == parent.data(BufferIdRole).value<BufferId>())
return false;
- Q_ASSERT(rootItem->childById(netId));
- Q_ASSERT(rootItem->childById(netId)->childById(bufferId));
+ Q_ASSERT(rootItem->childById(qHash(netId)));
+ Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(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)
+ BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt();
+ if(sourceType != BufferInfo::QueryBuffer)
return false;
// TODO: warn user about buffermerge!
- qDebug() << "merging" << bufferId << parent.data(BufferUidRole).toInt();
+ qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value<BufferId>();
removeRow(parent.row(), parent.parent());
return true;
}
-void NetworkModel::attachNetworkInfo(NetworkInfo *networkInfo) {
- NetworkItem *networkItem = network(networkInfo->networkId());
- if(!networkItem) {
- qWarning() << "NetworkModel::attachNetworkInfo(): network is unknown!";
- return;
- }
- networkItem->attachNetworkInfo(networkInfo);
+void NetworkModel::attachNetwork(Network *net) {
+ NetworkItem *netItem = networkItem(net->networkId());
+ netItem->attachNetwork(net);
}
-void NetworkModel::bufferUpdated(Buffer *buffer) {
- BufferItem *bufferItem = newBuffer(buffer->bufferInfo());
- QModelIndex itemindex = indexByItem(bufferItem);
+void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
+ BufferItem *bufItem = bufferItem(bufferInfo);
+ QModelIndex itemindex = indexByItem(bufItem);
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::updateBufferActivity(const Message &msg) {
+ BufferItem *buff = bufferItem(msg.bufferInfo());
+ Q_ASSERT(buff);
-void NetworkModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buf) {
- BufferItem *bufferItem = buffer(buf->bufferInfo());
- if(!bufferItem) {
- qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
+ buff->setLastMsgInsert(msg.timestamp());
+
+ if(buff->lastSeen() >= msg.timestamp())
return;
- }
-
- if(buf != currentBuffer)
- bufferItem->setActivity(level);
- else
- bufferItem->setActivity(Buffer::NoActivity);
- bufferUpdated(buf);
+
+ BufferItem::ActivityLevel level = BufferItem::OtherActivity;
+ if(msg.type() == Message::Plain || msg.type() == Message::Notice)
+ level |= BufferItem::NewMessage;
+
+ if(msg.flags() & Message::Highlight)
+ level |= BufferItem::Highlight;
+
+ bufferItem(msg.bufferInfo())->updateActivity(level);
}
+*/
-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);
+void NetworkModel::setBufferActivity(const BufferInfo &info, Buffer::ActivityLevel level) {
+ BufferItem *buff = bufferItem(info);
+ Q_ASSERT(buff);
+
+ buff->setActivityLevel(level);
}
+
+const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
+ QVariant netVariant = index.data(NetworkIdRole);
+ if(!netVariant.isValid())
+ return 0;
+
+ NetworkId networkId = netVariant.value<NetworkId>();
+ return Client::network(networkId);
+}
+
projects / quassel.git / blobdiff