X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=9d463f64eeada64444f741b9287ff8a2295bf5c0;hp=61ee7b98afbb66cc269afdcfde716c2888fb3b47;hb=b5385b3ddf6f0e8df8f0af7275b59dcc1fcd0ed1;hpb=f37791b92e3bf6e78b93036c0669926eeba3347b diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 61ee7b98..9d463f64 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -29,64 +29,57 @@ #include "ircchannel.h" #include "ircuser.h" +#include "buffersettings.h" + #include "util.h" // get rid of this (needed for isChannelName) + /***************************************** * Fancy Buffer Items *****************************************/ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), _bufferInfo(bufferInfo), - _activity(NoActivity) + _bufferName(bufferInfo.bufferName()), + _activity(Buffer::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(bufferType() == QueryType) + if(bufferType() == BufferInfo::QueryBuffer) flags |= Qt::ItemIsDropEnabled; - setFlags(flags); -} - -const BufferInfo &BufferItem::bufferInfo() const { - return _bufferInfo; + if(bufferType() == BufferInfo::StatusBuffer) { + NetworkItem *networkItem = qobject_cast(parent); + connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); + } + setFlags(flags); } quint64 BufferItem::id() const { - return bufferInfo().uid(); -} - -bool BufferItem::isStatusBuffer() const { - return bufferType() == StatusType; + return qHash(bufferInfo().bufferId()); } -BufferItem::Type BufferItem::bufferType() const { - return _type; -} +// bool BufferItem::isStatusBuffer() const { +// return bufferType() == BufferInfo::StatusBuffer; +// } bool BufferItem::isActive() const { - if(bufferType() == ChannelType) + if(bufferType() == BufferInfo::ChannelBuffer) return _ircChannel; else return qobject_cast(parent())->isActive(); } -BufferItem::ActivityLevel BufferItem::activity() const { - return _activity; -} - -void BufferItem::setActivity(const ActivityLevel &level) { +bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) { _activity = level; + emit dataChanged(); + return true; } -void BufferItem::addActivity(const ActivityLevel &level) { +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 { @@ -94,18 +87,33 @@ QVariant BufferItem::data(int column, int role) const { case NetworkModel::ItemTypeRole: return NetworkModel::BufferItemType; case NetworkModel::BufferIdRole: - return bufferInfo().uid(); + return qVariantFromValue(bufferInfo().bufferId()); case NetworkModel::NetworkIdRole: - return bufferInfo().networkId(); + return qVariantFromValue(bufferInfo().networkId()); + case NetworkModel::BufferInfoRole: + return qVariantFromValue(bufferInfo()); case NetworkModel::BufferTypeRole: 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; @@ -114,8 +122,8 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { connect(ircChannel, SIGNAL(topicSet(QString)), this, SLOT(setTopic(QString))); - connect(ircChannel, SIGNAL(ircUserJoined(IrcUser *)), - this, SLOT(join(IrcUser *))); + connect(ircChannel, SIGNAL(ircUsersJoined(QList)), + this, SLOT(join(QList))); connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)), this, SLOT(part(IrcUser *))); connect(ircChannel, SIGNAL(destroyed()), @@ -126,23 +134,33 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { 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 :)"; + join(ircChannel->ircUsers()); + } emit dataChanged(); } void BufferItem::ircChannelDestroyed() { emit dataChanged(); - for(int i = 0; i < childCount(); i++) { - emit childDestroyed(i); - removeChild(i); - } + removeAllChilds(); } QString BufferItem::bufferName() const { - if(bufferType() == StatusType) + if(bufferType() == BufferInfo::StatusBuffer) return tr("Status Buffer"); else - return bufferInfo().buffer(); + return _bufferName; +} + +void BufferItem::setBufferName(const QString &name) { + _bufferName = name; + // as long as we need those bufferInfos, we have to update that one aswell. + // pretty ugly though :/ + _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name); + emit dataChanged(0); } QString BufferItem::topic() const { @@ -152,6 +170,13 @@ QString BufferItem::topic() const { return QString(); } +void BufferItem::ircUserDestroyed() { + // PRIVATE + IrcUser *ircUser = static_cast(sender()); + removeUserFromCategory(ircUser); + emit dataChanged(2); +} + int BufferItem::nickCount() const { if(_ircChannel) return _ircChannel->ircUsers().count(); @@ -164,56 +189,168 @@ void BufferItem::setTopic(const QString &topic) { emit dataChanged(1); } -void BufferItem::join(IrcUser *ircUser) { - if(!ircUser) - return; +void BufferItem::join(const QList &ircUsers) { + addUsersToCategory(ircUsers); - addUserToCategory(ircUser); + foreach(IrcUser *ircUser, ircUsers) { + if(!ircUser) + continue; + connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + } + emit dataChanged(2); } void BufferItem::addUserToCategory(IrcUser *ircUser) { + addUsersToCategory(QList() << ircUser); +} + +void BufferItem::addUsersToCategory(const QList &ircUsers) { Q_ASSERT(_ircChannel); - - UserCategoryItem *categoryItem; - int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { - categoryItem = new UserCategoryItem(categoryId, this); - emit newChild(categoryItem); + + QHash > categories; + foreach(IrcUser *ircUser, ircUsers) { + UserCategoryItem *categoryItem; + int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { + categoryItem = new UserCategoryItem(categoryId, this); + categories[categoryItem] = QList(); + newChild(categoryItem); + } + categories[categoryItem] << ircUser; + } + + QHash >::const_iterator catIter = categories.constBegin(); + while(catIter != categories.constEnd()) { + catIter.key()->addUsers(catIter.value()); + catIter++; } - - categoryItem->addUser(ircUser); } 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; - IrcUserItem *userItem; for(int i = 0; i < childCount(); i++) { categoryItem = qobject_cast(child(i)); - if(userItem = qobject_cast(categoryItem->childById((quint64)ircUser))) { - userItem->deleteLater(); - return; + 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(child(i)); + categoryItem->dumpChildList(); + } + qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "===="; + } + Q_ASSERT(success); } void BufferItem::userModeChanged(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + UserCategoryItem *categoryItem; + int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser))) + return; // already in the right category; + removeUserFromCategory(ircUser); addUserToCategory(ircUser); } +QString BufferItem::toolTip(int column) const { + Q_UNUSED(column); + QStringList toolTip; + + switch(bufferType()) { + case BufferInfo::StatusBuffer: { + QString netName = Client::network(bufferInfo().networkId())->networkName(); + toolTip.append(tr("Status buffer from %1").arg(netName)); + break; + } + case BufferInfo::ChannelBuffer: + toolTip.append(tr("Channel %1").arg(bufferName())); + if(isActive()) { + //TODO: add channel modes + toolTip.append(tr("Users: %1").arg(nickCount())); + + BufferSettings s; + bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool(); + if(showTopic) { + QString _topic = topic(); + if(_topic != "") { + _topic.replace(QString("<"), QString("<")); + _topic.replace(QString(">"), QString(">")); + toolTip.append(QString(" ")); + toolTip.append(tr("Topic: %1").arg(_topic)); + } + } + } else { + toolTip.append(tr("Not active
Double-click to join")); + } + break; + case BufferInfo::QueryBuffer: + toolTip.append(tr("Query with %1").arg(bufferName())); + if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic())); + break; + default: //this should not happen + toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName())); + break; + } + + return tr("

%1

").arg(toolTip.join("
")); +} + +/* +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() << "networkName" << "currentServer" << "nickCount", parent), - _networkId(netid), - _networkName(network) + _networkId(netid) { setFlags(Qt::ItemIsEnabled); } @@ -221,7 +358,7 @@ NetworkItem::NetworkItem(const uint &netid, const QString &network, AbstractTree 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: @@ -232,18 +369,21 @@ QVariant NetworkItem::data(int column, int role) const { } quint64 NetworkItem::id() const { - return _networkId; + return qHash(_networkId); } bool NetworkItem::isActive() const { - return _network; + if(_network) + return _network->isConnected(); + else + return false; } QString NetworkItem::networkName() const { if(_network) return _network->networkName(); else - return _networkName; + return QString(); } QString NetworkItem::currentServer() const { @@ -272,7 +412,8 @@ void NetworkItem::attachNetwork(Network *network) { this, SLOT(setCurrentServer(QString))); connect(network, SIGNAL(ircChannelAdded(QString)), this, SLOT(attachIrcChannel(QString))); - // FIXME: connect this and that... + connect(network, SIGNAL(connectedSet(bool)), + this, SIGNAL(dataChanged())); emit dataChanged(); } @@ -287,7 +428,7 @@ void NetworkItem::attachIrcChannel(const QString &channelName) { BufferItem *bufferItem; for(int i = 0; i < childCount(); i++) { bufferItem = qobject_cast(child(i)); - if(bufferItem->bufferName() == ircChannel->name()) { + if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) { bufferItem->attachIrcChannel(ircChannel); break; } @@ -304,44 +445,59 @@ void NetworkItem::setCurrentServer(const QString &serverName) { emit dataChanged(1); } + +QString NetworkItem::toolTip(int column) const { + Q_UNUSED(column); + + QStringList toolTip(QString("%1").arg(networkName())); + toolTip.append(QString("Server: %1").arg(currentServer())); + toolTip.append(QString("Users: %1").arg(nickCount())); + + return QString("

%1

").arg(toolTip.join("
")); +} + + /***************************************** * 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. -const QList UserCategoryItem::categories = QList() << UserCategoryItem::Category('q', "Owners") - << UserCategoryItem::Category('a', "Admins") - << UserCategoryItem::Category('a', "Admins") - << UserCategoryItem::Category('o', "Operators") - << UserCategoryItem::Category('h', "Half-Ops") - << UserCategoryItem::Category('v', "Voiced"); +// 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::categories = QList() + << 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) { - connect(this, SIGNAL(childDestroyed(int)), - this, SLOT(checkNoChilds())); } QString UserCategoryItem::categoryId() { if(_category < categories.count()) return categories[_category].displayString; else - return QString("Users"); -} - -void UserCategoryItem::checkNoChilds() { - if(childCount() == 0) - deleteLater(); + return tr("Users"); } quint64 UserCategoryItem::id() const { return qHash(_category); } -void UserCategoryItem::addUser(IrcUser *ircUser) { - emit newChild(new IrcUserItem(ircUser, this)); +void UserCategoryItem::addUsers(const QList &ircUsers) { + QList userItems; + foreach(IrcUser *ircUser, ircUsers) + userItems << new IrcUserItem(ircUser, this); + newChilds(userItems); +} + +bool UserCategoryItem::removeUser(IrcUser *ircUser) { + return removeChildById(qHash(ircUser)); } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -351,23 +507,54 @@ int UserCategoryItem::categoryFromModes(const QString &modes) { } 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))); + connect(ircUser, SIGNAL(awaySet(bool)), + this, SLOT(setAway(bool))); } -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() { @@ -375,15 +562,59 @@ IrcUser *IrcUserItem::ircUser() { } quint64 IrcUserItem::id() const { - return (quint64)_ircUser; + 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("%1").arg(nickName())); + if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes())); + 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().remove(0, _ircUser->hostmask().indexOf("!")+1)); + + if(_ircUser->idleTime().isValid()) { + QDateTime now = QDateTime::currentDateTime(); + QDateTime idle = _ircUser->idleTime(); + int idleTime = idle.secsTo(now); + toolTip.append(tr("idling since %1").arg(secondsToString(idleTime))); + } + if(_ircUser->loginTime().isValid()) { + toolTip.append(tr("login time: %1").arg(_ircUser->loginTime().toString())); + } + + if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server())); + + return QString("

%1

").arg(toolTip.join("
")); } void IrcUserItem::setNick(QString newNick) { Q_UNUSED(newNick); emit dataChanged(0); } -void IrcUserItem::ircUserDestroyed() { - deleteLater(); + +void IrcUserItem::setAway(bool away) { + Q_UNUSED(away); + emit dataChanged(0); } /***************************************** @@ -404,62 +635,68 @@ 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(index.internalPointer()); 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(rootItem->childById(networkId)); +NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { + return qobject_cast(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; +} + +void NetworkModel::networkRemoved(const NetworkId &networkId) { + rootItem->removeChildById(qHash(networkId)); } 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())); + if((bufferItem = netItem->childById(qHash(bufferId)))) { + return indexByItem(bufferItem); } } return QModelIndex(); } -BufferItem *NetworkModel::buffer(BufferInfo bufferInfo) { - QModelIndex bufferIdx = bufferIndex(bufferInfo.uid()); +BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { + QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId()); if(bufferIdx.isValid()) return static_cast(bufferIdx.internalPointer()); else return 0; } -BufferItem *NetworkModel::newBuffer(BufferInfo bufferInfo) { - BufferItem *bufferItem = buffer(bufferInfo); - if(bufferItem == 0) { - NetworkItem *networkItem = newNetwork(bufferInfo.networkId(), bufferInfo.network()); - bufferItem = new BufferItem(bufferInfo, 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 { @@ -475,19 +712,20 @@ bool NetworkModel::mimeContainsBufferList(const QMimeData *mimeData) { return mimeData->hasFormat("application/Quassel/BufferItemList"); } -QList< QPair > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) { - QList< QPair > bufferList; +QList< QPair > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) { + QList< QPair > 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; @@ -500,8 +738,8 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const { QStringList bufferlist; QString netid, uid, bufferid; foreach(QModelIndex index, indexes) { - netid = QString::number(index.data(NetworkIdRole).toUInt()); - uid = QString::number(index.data(BufferIdRole).toUInt()); + netid = QString::number(index.data(NetworkIdRole).value().toInt()); + uid = QString::number(index.data(BufferIdRole).value().toInt()); bufferid = QString("%1:%2").arg(netid).arg(uid); if(!bufferlist.contains(bufferid)) bufferlist << bufferid; @@ -521,60 +759,94 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in return false; // target must be a query - BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); - if(targetType != BufferItem::QueryType) + BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); + if(targetType != BufferInfo::QueryBuffer) return false; - QList< QPair > bufferList = mimeDataToBufferList(data); + QList< QPair > 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(BufferIdRole).toUInt()) + if(bufferId == parent.data(BufferIdRole).value()) 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 - BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt(); - if(sourceType != BufferItem::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(BufferIdRole).toInt(); + qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value(); removeRow(parent.row(), parent.parent()); return true; } void NetworkModel::attachNetwork(Network *net) { - NetworkItem *networkItem = network(net->networkId()); - if(!networkItem) { - qWarning() << "NetworkModel::attachNetwork(): network is unknown!"; - return; - } - networkItem->attachNetwork(net); + NetworkItem *netItem = networkItem(net->networkId()); + netItem->attachNetwork(net); } void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { - BufferItem *bufferItem = newBuffer(bufferInfo); - QModelIndex itemindex = indexByItem(bufferItem); + BufferItem *bufItem = bufferItem(bufferInfo); + QModelIndex itemindex = indexByItem(bufItem); emit dataChanged(itemindex, itemindex); } -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::removeBuffer(BufferId bufferId) { + const int numNetworks = rootItem->childCount(); + if(numNetworks == 0) + return; + + for(int i = 0; i < numNetworks; i++) { + if(rootItem->child(i)->removeChildById(qHash(bufferId))) + break; + } +} + +/* +void NetworkModel::updateBufferActivity(const Message &msg) { + BufferItem *buff = bufferItem(msg.bufferInfo()); + Q_ASSERT(buff); + + buff->setLastMsgInsert(msg.timestamp()); + + if(buff->lastSeen() >= msg.timestamp()) + return; + + 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::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(); + return Client::network(networkId); }