X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=3e380d41a96047f0a53d39186b364b66175e8828;hp=2970fb631ca3371cfc944129446910c6ec4da997;hb=8b17f1bad397489b6d1e1fd30b3691c6fdd376ab;hpb=9d12f8189a0dfd8ac76e41aea86ac56bdf907fde diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 2970fb63..3e380d41 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -37,58 +37,53 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), _bufferInfo(bufferInfo), - _activity(NoActivity) + _activity(Buffer::NoActivity) { - // determine BufferType - if(bufferInfo.bufferName().isEmpty()) - _type = StatusType; - else if(isChannelName(bufferInfo.bufferName())) - _type = ChannelType; - else - _type = QueryType; - Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; - if(bufferType() == QueryType) + if(bufferType() == BufferInfo::QueryBuffer) flags |= Qt::ItemIsDropEnabled; + + if(bufferType() == BufferInfo::StatusBuffer) { + NetworkItem *networkItem = qobject_cast(parent); + connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); + } setFlags(flags); } - const BufferInfo &BufferItem::bufferInfo() const { return _bufferInfo; } quint64 BufferItem::id() const { - return bufferInfo().bufferId().toInt(); + return qHash(bufferInfo().bufferId()); } bool BufferItem::isStatusBuffer() const { - return bufferType() == StatusType; + return bufferType() == BufferInfo::StatusBuffer; } -BufferItem::Type BufferItem::bufferType() const { - return _type; +BufferInfo::Type BufferItem::bufferType() const { + return bufferInfo().type(); } 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::updateActivity(const ActivityLevel &level) { +void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) { + Buffer::ActivityLevel oldActivity = _activity; _activity |= level; - emit dataChanged(); + if(oldActivity != _activity) + emit dataChanged(); } QVariant BufferItem::data(int column, int role) const { @@ -106,7 +101,7 @@ QVariant BufferItem::data(int column, int role) const { case NetworkModel::ItemActiveRole: return isActive(); case NetworkModel::BufferActivityRole: - return qVariantFromValue((int)activity()); + return (int)activityLevel(); default: return PropertyMapItem::data(column, role); } @@ -115,7 +110,7 @@ QVariant BufferItem::data(int column, int role) const { bool BufferItem::setData(int column, const QVariant &value, int role) { switch(role) { case NetworkModel::BufferActivityRole: - setActivity((ActivityLevel)value.toInt()); + return setActivityLevel((Buffer::ActivityLevel)value.toInt()); default: return PropertyMapItem::setData(column, value, role); } @@ -160,7 +155,7 @@ void BufferItem::ircChannelDestroyed() { } QString BufferItem::bufferName() const { - if(bufferType() == StatusType) + if(bufferType() == BufferInfo::StatusBuffer) return tr("Status Buffer"); else return bufferInfo().bufferName(); @@ -173,6 +168,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(); @@ -190,6 +192,8 @@ void BufferItem::join(IrcUser *ircUser) { return; addUserToCategory(ircUser); + connect(ircUser, SIGNAL(destroyed()), + this, SLOT(ircUserDestroyed())); emit dataChanged(2); } @@ -216,12 +220,18 @@ void BufferItem::part(IrcUser *ircUser) { return; } + disconnect(ircUser, 0, this, 0); removeUserFromCategory(ircUser); emit dataChanged(2); } void BufferItem::removeUserFromCategory(IrcUser *ircUser) { - Q_ASSERT(_ircChannel); + 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; @@ -235,7 +245,7 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) { } if(!success) { - qDebug() << "didn't find User:" << ircUser << (quint64)ircUser; + 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)); @@ -256,13 +266,34 @@ void BufferItem::userModeChanged(IrcUser *ircUser) { UserCategoryItem *categoryItem; int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser))) + if((categoryItem = qobject_cast(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 *****************************************/ @@ -287,12 +318,7 @@ QVariant NetworkItem::data(int column, int role) const { } quint64 NetworkItem::id() const { - return _networkId.toInt(); -} - -void NetworkItem::setActive(bool connected) { - Q_UNUSED(connected); - emit dataChanged(); + return qHash(_networkId); } bool NetworkItem::isActive() const { @@ -336,7 +362,7 @@ void NetworkItem::attachNetwork(Network *network) { connect(network, SIGNAL(ircChannelAdded(QString)), this, SLOT(attachIrcChannel(QString))); connect(network, SIGNAL(connectedSet(bool)), - this, SLOT(setActive(bool))); + this, SIGNAL(dataChanged())); // FIXME: connect this and that... @@ -353,7 +379,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; } @@ -375,13 +401,15 @@ void NetworkItem::setCurrentServer(const QString &serverName) { *****************************************/ // 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::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"); + << 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), @@ -393,7 +421,7 @@ QString UserCategoryItem::categoryId() { if(_category < categories.count()) return categories[_category].displayString; else - return QString("Users"); + return tr("Users"); } quint64 UserCategoryItem::id() const { @@ -405,7 +433,7 @@ void UserCategoryItem::addUser(IrcUser *ircUser) { } bool UserCategoryItem::removeUser(IrcUser *ircUser) { - return removeChildById((quint64)ircUser); + return removeChildById(qHash(ircUser)); } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -439,7 +467,8 @@ QVariant UserCategoryItem::data(int column, int role) const { *****************************************/ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), - _ircUser(ircUser) + _ircUser(ircUser), + _id(qHash(ircUser)) { // we don't need to handle the ircUser's destroyed signal since it's automatically removed // by the IrcChannel::ircUserParted(); @@ -449,7 +478,17 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) } QString IrcUserItem::nickName() const { - return _ircUser->nick(); + if(_ircUser) + return _ircUser->nick(); + else + return QString(); +} + +bool IrcUserItem::isActive() const { + if(_ircUser) + return !_ircUser->isAway(); + else + return false; } IrcUser *IrcUserItem::ircUser() { @@ -457,13 +496,13 @@ 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 !_ircUser->isAway(); + return isActive(); case NetworkModel::ItemTypeRole: return NetworkModel::IrcUserItemType; case NetworkModel::BufferIdRole: @@ -506,10 +545,10 @@ QString IrcUserItem::toolTip(int column) const { } idleTime = idleTime % timeUnit[i].first; } - toolTip.append(QString("idling since %1").arg(idleString)); + toolTip.append(tr("idling since %1").arg(idleString)); } - if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server())); + if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server())); return QString("

%1

").arg(toolTip.join("
")); } @@ -547,7 +586,7 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const { // experimental stuff :) QModelIndex NetworkModel::networkIndex(NetworkId networkId) { - return indexById(networkId.toInt()); + return indexById(qHash(networkId)); } NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { @@ -566,12 +605,16 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) { 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.toInt()))) { - return indexById(bufferItem->id(), networkIndex(netItem->id())); + if((bufferItem = netItem->childById(qHash(bufferId)))) { + return indexByItem(bufferItem); } } return QModelIndex(); @@ -657,8 +700,8 @@ 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); @@ -674,12 +717,12 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in if(bufferId == parent.data(BufferIdRole).value()) return false; - Q_ASSERT(rootItem->childById(netId.toInt())); - Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt())); + 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.toInt())->childById(bufferId.toInt())->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! @@ -700,15 +743,40 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { emit dataChanged(itemindex, itemindex); } +/* 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; - const Network *net = Client::network(msg.bufferInfo().networkId()); - if(net && msg.text().contains(net->myNick())) - level |= BufferItem::Highlight; - + 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); +}