X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=3e380d41a96047f0a53d39186b364b66175e8828;hp=227382b947a21b447e3c1efdfb62f555e9d24a1d;hb=8b17f1bad397489b6d1e1fd30b3691c6fdd376ab;hpb=7df7429c009d2bea4c516e87f1ec4c956c722e09 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 227382b9..3e380d41 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -37,56 +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.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; + + 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().uid().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::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 +91,33 @@ QVariant BufferItem::data(int column, int role) const { case NetworkModel::ItemTypeRole: return NetworkModel::BufferItemType; case NetworkModel::BufferIdRole: - return qVariantFromValue(bufferInfo().uid()); + return qVariantFromValue(bufferInfo().bufferId()); case NetworkModel::NetworkIdRole: 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; @@ -126,6 +138,13 @@ 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 :)"; + foreach(IrcUser *ircUser, ircChannel->ircUsers()) { + join(ircUser); + } + } emit dataChanged(); } @@ -136,10 +155,10 @@ void BufferItem::ircChannelDestroyed() { } QString BufferItem::bufferName() const { - if(bufferType() == StatusType) + if(bufferType() == BufferInfo::StatusBuffer) return tr("Status Buffer"); else - return bufferInfo().buffer(); + return bufferInfo().bufferName(); } QString BufferItem::topic() const { @@ -149,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(); @@ -166,6 +192,8 @@ void BufferItem::join(IrcUser *ircUser) { return; addUserToCategory(ircUser); + connect(ircUser, SIGNAL(destroyed()), + this, SLOT(ircUserDestroyed())); emit dataChanged(2); } @@ -176,42 +204,96 @@ void BufferItem::addUserToCategory(IrcUser *ircUser) { int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { categoryItem = new UserCategoryItem(categoryId, this); - emit newChild(categoryItem); + newChild(categoryItem); } categoryItem->addUser(ircUser); + + int totalusers = 0; + for(int i = 0; i < childCount(); i++) { + totalusers += child(i)->childCount(); + } } void BufferItem::part(IrcUser *ircUser) { - if(!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)); - categoryItem->removeChildById((quint64)ircUser); - if(categoryItem->childCount() == 0) - removeChild(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(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(childById(qHash(categoryId))))) + 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 *****************************************/ @@ -236,11 +318,14 @@ QVariant NetworkItem::data(int column, int role) const { } quint64 NetworkItem::id() const { - return _networkId.toInt(); + return qHash(_networkId); } bool NetworkItem::isActive() const { - return _network; + if(_network) + return _network->isConnected(); + else + return false; } QString NetworkItem::networkName() const { @@ -276,6 +361,9 @@ void NetworkItem::attachNetwork(Network *network) { this, SLOT(setCurrentServer(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(); @@ -291,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; } @@ -313,12 +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. -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), @@ -330,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 { @@ -338,7 +429,11 @@ quint64 UserCategoryItem::id() const { } void UserCategoryItem::addUser(IrcUser *ircUser) { - emit newChild(new IrcUserItem(ircUser, this)); + newChild(new IrcUserItem(ircUser, this)); +} + +bool UserCategoryItem::removeUser(IrcUser *ircUser) { + return removeChildById(qHash(ircUser)); } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -348,23 +443,52 @@ 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))); } -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() { @@ -372,17 +496,67 @@ 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->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 > 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("

%1

").arg(toolTip.join("
")); } void IrcUserItem::setNick(QString newNick) { Q_UNUSED(newNick); emit dataChanged(0); } -void IrcUserItem::ircUserDestroyed() { - parent()->removeChildById(id()); - // deleteLater(); -} /***************************************** * NetworkModel @@ -412,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) { @@ -424,26 +598,30 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) { if(netItem == 0) { netItem = new NetworkItem(networkId, rootItem); - appendChild(rootItem, netItem); + rootItem->newChild(netItem); } 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.toInt()))) { - return indexById(bufferItem->id(), networkIndex(netItem->id())); + if((bufferItem = netItem->childById(qHash(bufferId)))) { + return indexByItem(bufferItem); } } return QModelIndex(); } BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { - QModelIndex bufferIdx = bufferIndex(bufferInfo.uid()); + QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId()); if(bufferIdx.isValid()) return static_cast(bufferIdx.internalPointer()); else @@ -455,7 +633,7 @@ BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) { if(bufItem == 0) { NetworkItem *netItem = networkItem(bufferInfo.networkId()); bufItem = new BufferItem(bufferInfo, netItem); - appendChild(netItem, bufItem); + netItem->newChild(bufItem); } Q_ASSERT(bufItem); @@ -522,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); @@ -539,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! @@ -565,13 +743,40 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { 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::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); }