X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=38561cc8b895ccd2565f745012b28b5220208c5c;hp=920b2d8fca4e8b301866dc4642a18d579d109041;hb=fe56ff8c7e311d313c487a8a7578a9de87dcfb77;hpb=c48313654848b755982179d1252cc27a8c621b91 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 920b2d8f..38561cc8 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -27,68 +27,169 @@ #include "signalproxy.h" #include "network.h" #include "ircchannel.h" -#include "ircuser.h" + +#include "buffersettings.h" #include "util.h" // get rid of this (needed for isChannelName) /***************************************** -* Fancy Buffer Items +* Network Items *****************************************/ -BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) - : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), - _bufferInfo(bufferInfo), - _activity(NoActivity) +NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) + : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), + _networkId(netid) { - // determine BufferType - if(bufferInfo.buffer().isEmpty()) - _type = StatusType; - else if(isChannelName(bufferInfo.buffer())) - _type = ChannelType; - else - _type = QueryType; + setFlags(Qt::ItemIsEnabled); +} + +QVariant NetworkItem::data(int column, int role) const { + switch(role) { + case NetworkModel::NetworkIdRole: + return qVariantFromValue(_networkId); + case NetworkModel::ItemTypeRole: + return NetworkModel::NetworkItemType; + case NetworkModel::ItemActiveRole: + return isActive(); + default: + return PropertyMapItem::data(column, role); + } +} - Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; - if(bufferType() == QueryType) - flags |= Qt::ItemIsDropEnabled; - setFlags(flags); +BufferItem *NetworkItem::findBufferItem(BufferId bufferId) { + BufferItem *bufferItem = 0; + + for(int i = 0; i < childCount(); i++) { + bufferItem = qobject_cast(child(i)); + if(!bufferItem) + continue; + if(bufferItem->bufferId() == bufferId) + return bufferItem; + } + return 0; +} + + +BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { + BufferItem *bufferItem = findBufferItem(bufferInfo); + if(bufferItem) + return bufferItem; + + switch(bufferInfo.type()) { + case BufferInfo::StatusBuffer: + bufferItem = new StatusBufferItem(bufferInfo, this); + break; + case BufferInfo::ChannelBuffer: + bufferItem = new ChannelBufferItem(bufferInfo, this); + break; + case BufferInfo::QueryBuffer: + bufferItem = new QueryBufferItem(bufferInfo, this); + break; + default: + bufferItem = new BufferItem(bufferInfo, this); + } + + newChild(bufferItem); + return bufferItem; +} + +void NetworkItem::attachNetwork(Network *network) { + if(!network) + return; + + _network = network; + + connect(network, SIGNAL(networkNameSet(QString)), + this, SLOT(setNetworkName(QString))); + connect(network, SIGNAL(currentServerSet(QString)), + this, SLOT(setCurrentServer(QString))); + connect(network, SIGNAL(ircChannelAdded(IrcChannel *)), + this, SLOT(attachIrcChannel(IrcChannel *))); + connect(network, SIGNAL(ircUserAdded(IrcUser *)), + this, SLOT(attachIrcUser(IrcUser *))); + connect(network, SIGNAL(connectedSet(bool)), + this, SIGNAL(dataChanged())); + connect(network, SIGNAL(destroyed()), + this, SIGNAL(dataChanged())); + + emit dataChanged(); } +void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) { + ChannelBufferItem *channelItem; + for(int i = 0; i < childCount(); i++) { + channelItem = qobject_cast(child(i)); + if(!channelItem) + continue; -const BufferInfo &BufferItem::bufferInfo() const { - return _bufferInfo; + if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) { + channelItem->attachIrcChannel(ircChannel); + return; + } + } } -quint64 BufferItem::id() const { - return bufferInfo().uid().toInt(); +void NetworkItem::attachIrcUser(IrcUser *ircUser) { + QueryBufferItem *queryItem = 0; + for(int i = 0; i < childCount(); i++) { + queryItem = qobject_cast(child(i)); + if(!queryItem) + continue; + + if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) { + queryItem->attachIrcUser(ircUser); + break; + } + } } -bool BufferItem::isStatusBuffer() const { - return bufferType() == StatusType; +void NetworkItem::setNetworkName(const QString &networkName) { + Q_UNUSED(networkName); + emit dataChanged(0); } -BufferItem::Type BufferItem::bufferType() const { - return _type; +void NetworkItem::setCurrentServer(const QString &serverName) { + Q_UNUSED(serverName); + emit dataChanged(1); } -bool BufferItem::isActive() const { - if(bufferType() == ChannelType) - return _ircChannel; - else - return qobject_cast(parent())->isActive(); + +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())); + + if(_network) { + toolTip.append(QString("Lag: %1 msecs").arg(_network->latency())); + } + + return QString("

%1

").arg(toolTip.join("
")); } -BufferItem::ActivityLevel BufferItem::activity() const { - return _activity; +/***************************************** +* Fancy Buffer Items +*****************************************/ +BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent) + : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), + _bufferInfo(bufferInfo), + _activity(Buffer::NoActivity) +{ + setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled); } -void BufferItem::setActivity(const ActivityLevel &level) { - _activity = level; - emit dataChanged(); +void BufferItem::setActivityLevel(Buffer::ActivityLevel level) { + if(_activity != level) { + _activity = level; + emit dataChanged(); + } } -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 { @@ -96,7 +197,7 @@ 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: @@ -106,33 +207,207 @@ 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); } } bool BufferItem::setData(int column, const QVariant &value, int role) { + qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role; switch(role) { case NetworkModel::BufferActivityRole: - setActivity((ActivityLevel)value.toInt()); + setActivityLevel((Buffer::ActivityLevel)value.toInt()); + return true; default: return PropertyMapItem::setData(column, value, role); } return true; } +void BufferItem::setBufferName(const QString &name) { + _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name); + emit dataChanged(0); +} + +QString BufferItem::toolTip(int column) const { + Q_UNUSED(column); + return tr("

%1 - %2

").arg(bufferInfo().bufferId().toInt()).arg(bufferName()); +} -void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { - if(!ircChannel) +/* +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; +} +*/ + +/***************************************** +* StatusBufferItem +*****************************************/ +StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent) + : BufferItem(bufferInfo, parent) +{ + Q_ASSERT(parent); + connect(parent, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); +} + +QString StatusBufferItem::toolTip(int column) const { + Q_UNUSED(column); + QStringList toolTip; + + QString netName = Client::network(bufferInfo().networkId())->networkName(); + toolTip.append(tr("Status buffer of %1").arg(netName)); + + return tr("

%1

").arg(toolTip.join("
")); +} + +/***************************************** +* QueryBufferItem +*****************************************/ +QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent) + : BufferItem(bufferInfo, parent), + _ircUser(0) +{ + setFlags(flags() | Qt::ItemIsDropEnabled); + + const Network *net = Client::network(bufferInfo.networkId()); + if(!net) return; + + IrcUser *ircUser = net->ircUser(bufferInfo.bufferName()); + if(ircUser) + attachIrcUser(ircUser); +} + +QVariant QueryBufferItem::data(int column, int role) const { + switch(role) { + case NetworkModel::UserAwayRole: + return (bool)_ircUser ? _ircUser->isAway() : false; + default: + return BufferItem::data(column, role); + } +} + +QString QueryBufferItem::toolTip(int column) const { + // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this... + Q_UNUSED(column); + QStringList toolTip; + + toolTip.append(tr("Query with %1").arg(bufferName())); + + if(_ircUser) { + if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes())); + if(_ircUser->isAway()) { + toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString())); + } + if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName()); + if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(_ircUser->nick()).arg(_ircUser->ircOperator())); + if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost()); + if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply()); + + 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 QueryBufferItem::attachIrcUser(IrcUser *ircUser) { + _ircUser = ircUser; + connect(_ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); + emit dataChanged(); +} + +void QueryBufferItem::ircUserDestroyed() { + _ircUser = 0; + emit dataChanged(); +} + +/***************************************** +* ChannelBufferItem +*****************************************/ +ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent) + : BufferItem(bufferInfo, parent), + _ircChannel(0) +{ + const Network *net = Client::network(bufferInfo.networkId()); + if(!net) + return; + + IrcChannel *ircChannel = net->ircChannel(bufferInfo.bufferName()); + if(ircChannel) + attachIrcChannel(ircChannel); +} + +QString ChannelBufferItem::toolTip(int column) const { + Q_UNUSED(column); + QStringList toolTip; + + toolTip.append(tr("Channel %1").arg(bufferName())); + if(isActive()) { + //TODO: add channel modes + toolTip.append(tr("Users: %1").arg(nickCount())); + if(_ircChannel) { + QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result + if(!channelMode.isEmpty()) + toolTip.append(tr("Mode: %1").arg(channelMode)); + } + + 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")); + } + + return tr("

%1

").arg(toolTip.join("
")); +} + +void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) { + Q_ASSERT(!_ircChannel && ircChannel); _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()), @@ -143,224 +418,131 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { this, SLOT(userModeChanged(IrcUser *))); connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)), this, SLOT(userModeChanged(IrcUser *))); + + if(!ircChannel->ircUsers().isEmpty()) + join(ircChannel->ircUsers()); emit dataChanged(); } -void BufferItem::ircChannelDestroyed() { +void ChannelBufferItem::ircChannelDestroyed() { + Q_CHECK_PTR(_ircChannel); + disconnect(_ircChannel, 0, this, 0); + _ircChannel = 0; emit dataChanged(); removeAllChilds(); } -QString BufferItem::bufferName() const { - if(bufferType() == StatusType) - return tr("Status Buffer"); - else - return bufferInfo().buffer(); -} - -QString BufferItem::topic() const { - if(_ircChannel) - return _ircChannel->topic(); - else - return QString(); -} - -int BufferItem::nickCount() const { - if(_ircChannel) - return _ircChannel->ircUsers().count(); - else - return 0; +void ChannelBufferItem::join(const QList &ircUsers) { + addUsersToCategory(ircUsers); + emit dataChanged(2); } -void BufferItem::setTopic(const QString &topic) { - Q_UNUSED(topic); - emit dataChanged(1); +UserCategoryItem *ChannelBufferItem::findCategoryItem(int categoryId) { + UserCategoryItem *categoryItem = 0; + + for(int i = 0; i < childCount(); i++) { + categoryItem = qobject_cast(child(i)); + if(!categoryItem) + continue; + if(categoryItem->categoryId() == categoryId) + return categoryItem; + } + return 0; } -void BufferItem::join(IrcUser *ircUser) { - if(!ircUser) - return; - - addUserToCategory(ircUser); - emit dataChanged(2); +void ChannelBufferItem::addUserToCategory(IrcUser *ircUser) { + addUsersToCategory(QList() << ircUser); } -void BufferItem::addUserToCategory(IrcUser *ircUser) { +void ChannelBufferItem::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); - newChild(categoryItem); + QHash > categories; + + int categoryId = -1; + UserCategoryItem *categoryItem = 0; + + foreach(IrcUser *ircUser, ircUsers) { + categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + categoryItem = findCategoryItem(categoryId); + if(!categoryItem) { + categoryItem = new UserCategoryItem(categoryId, this); + categories[categoryItem] = QList(); + newChild(categoryItem); + } + categories[categoryItem] << ircUser; } - categoryItem->addUser(ircUser); - int totalusers = 0; - for(int i = 0; i < childCount(); i++) { - totalusers += child(i)->childCount(); + QHash >::const_iterator catIter = categories.constBegin(); + while(catIter != categories.constEnd()) { + catIter.key()->addUsers(catIter.value()); + catIter++; } } -void BufferItem::part(IrcUser *ircUser) { +void ChannelBufferItem::part(IrcUser *ircUser) { if(!ircUser) { - qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser; + qWarning() << bufferName() << "ChannelBufferItem::part(): unknown User" << ircUser; return; } + disconnect(ircUser, 0, this, 0); removeUserFromCategory(ircUser); emit dataChanged(2); } -void BufferItem::removeUserFromCategory(IrcUser *ircUser) { - Q_ASSERT(_ircChannel); +void ChannelBufferItem::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(child(i)); - if(success = categoryItem->removeChildById((quint64)ircUser)) { + if(categoryItem->removeUser(ircUser)) { if(categoryItem->childCount() == 0) removeChild(i); break; } } - - - if(!success) { - 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) { +void ChannelBufferItem::userModeChanged(IrcUser *ircUser) { Q_ASSERT(_ircChannel); - UserCategoryItem *categoryItem; int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser))) - return; // already in the right category; - - removeUserFromCategory(ircUser); - addUserToCategory(ircUser); -} - -/***************************************** -* Network Items -*****************************************/ -NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) - : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), - _networkId(netid) -{ - setFlags(Qt::ItemIsEnabled); -} - -QVariant NetworkItem::data(int column, int role) const { - switch(role) { - case NetworkModel::NetworkIdRole: - return qVariantFromValue(_networkId); - case NetworkModel::ItemTypeRole: - return NetworkModel::NetworkItemType; - case NetworkModel::ItemActiveRole: - return isActive(); - default: - return PropertyMapItem::data(column, role); + UserCategoryItem *categoryItem = findCategoryItem(categoryId); + + if(categoryItem) { + if(categoryItem->findIrcUser(ircUser)) { + return; // already in the right category; + } + } else { + categoryItem = new UserCategoryItem(categoryId, this); + newChild(categoryItem); } -} - -quint64 NetworkItem::id() const { - return _networkId.toInt(); -} - -void NetworkItem::setActive(bool connected) { - Q_UNUSED(connected); - emit dataChanged(); -} -bool NetworkItem::isActive() const { - if(_network) - return _network->isConnected(); - else - return false; -} - -QString NetworkItem::networkName() const { - if(_network) - return _network->networkName(); - else - return QString(); -} - -QString NetworkItem::currentServer() const { - if(_network) - return _network->currentServer(); - else - return QString(); -} - -int NetworkItem::nickCount() const { - if(_network) - return _network->ircUsers().count(); - else - return 0; -} - -void NetworkItem::attachNetwork(Network *network) { - if(!network) - return; - - _network = network; - - connect(network, SIGNAL(networkNameSet(QString)), - this, SLOT(setNetworkName(QString))); - connect(network, SIGNAL(currentServerSet(QString)), - this, SLOT(setCurrentServer(QString))); - connect(network, SIGNAL(ircChannelAdded(QString)), - this, SLOT(attachIrcChannel(QString))); - connect(network, SIGNAL(connectedSet(bool)), - this, SLOT(setActive(bool))); - - // FIXME: connect this and that... - - emit dataChanged(); -} - -void NetworkItem::attachIrcChannel(const QString &channelName) { - IrcChannel *ircChannel = _network->ircChannel(channelName); - if(!ircChannel) { - qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName; - return; - } - - BufferItem *bufferItem; + // find the item that needs reparenting + IrcUserItem *ircUserItem = 0; for(int i = 0; i < childCount(); i++) { - bufferItem = qobject_cast(child(i)); - if(bufferItem->bufferName() == ircChannel->name()) { - bufferItem->attachIrcChannel(ircChannel); + UserCategoryItem *oldCategoryItem = qobject_cast(child(i)); + Q_ASSERT(oldCategoryItem); + IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser); + if(userItem) { + ircUserItem = userItem; break; } } -} -void NetworkItem::setNetworkName(const QString &networkName) { - Q_UNUSED(networkName); - emit dataChanged(0); -} - -void NetworkItem::setCurrentServer(const QString &serverName) { - Q_UNUSED(serverName); - emit dataChanged(1); + if(!ircUserItem) { + qWarning() << "ChannelBufferItem::userModeChanged(IrcUser *): unable to determine old category of" << ircUser; + return; + } + ircUserItem->reParent(categoryItem); } /***************************************** @@ -368,38 +550,63 @@ 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"); +const QList UserCategoryItem::categories = QList() << 'q' << 'a' << 'o' << 'h' << 'v'; UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) - : PropertyMapItem(QStringList() << "categoryId", parent), + : PropertyMapItem(QStringList() << "categoryName", parent), _category(category) { + setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved); + setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category)); +} + +// caching this makes no sense, since we display the user number dynamically +QString UserCategoryItem::categoryName() const { + int n = childCount(); + switch(_category) { + case 0: return tr("%n Owner(s)", 0, n); + case 1: return tr("%n Admin(s)", 0, n); + case 2: return tr("%n Operator(s)", 0, n); + case 3: return tr("%n Half-Op(s)", 0, n); + case 4: return tr("%n Voiced", 0, n); + default: return tr("%n User(s)", 0, n); + } } -QString UserCategoryItem::categoryId() { - if(_category < categories.count()) - return categories[_category].displayString; - else - return QString("Users"); +IrcUserItem *UserCategoryItem::findIrcUser(IrcUser *ircUser) { + IrcUserItem *userItem = 0; + + for(int i = 0; i < childCount(); i++) { + userItem = qobject_cast(child(i)); + if(!userItem) + continue; + if(userItem->ircUser() == ircUser) + return userItem; + } + return 0; } -quint64 UserCategoryItem::id() const { - return qHash(_category); +void UserCategoryItem::addUsers(const QList &ircUsers) { + QList userItems; + foreach(IrcUser *ircUser, ircUsers) + userItems << new IrcUserItem(ircUser, this); + newChilds(userItems); + emit dataChanged(0); } -void UserCategoryItem::addUser(IrcUser *ircUser) { - newChild(new IrcUserItem(ircUser, this)); +bool UserCategoryItem::removeUser(IrcUser *ircUser) { + IrcUserItem *userItem = findIrcUser(ircUser); + bool success = (bool)userItem; + if(success) { + removeChild(userItem); + emit dataChanged(0); + } + return success; } int UserCategoryItem::categoryFromModes(const QString &modes) { for(int i = 0; i < categories.count(); i++) { - if(modes.contains(categories[i].mode)) + if(modes.contains(categories[i])) return i; } return categories.count(); @@ -407,6 +614,10 @@ int UserCategoryItem::categoryFromModes(const QString &modes) { QVariant UserCategoryItem::data(int column, int role) const { switch(role) { + case TreeModel::SortRole: + return _category; + case NetworkModel::ItemActiveRole: + return true; case NetworkModel::ItemTypeRole: return NetworkModel::UserCategoryItemType; case NetworkModel::BufferIdRole: @@ -420,7 +631,7 @@ QVariant UserCategoryItem::data(int column, int role) const { } } - + /***************************************** * Irc User Items *****************************************/ @@ -428,27 +639,16 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), _ircUser(ircUser) { - // 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() const { - return _ircUser->nick(); -} - -IrcUser *IrcUserItem::ircUser() { - return _ircUser; -} - -quint64 IrcUserItem::id() const { - return (quint64)_ircUser; + setObjectName(ircUser->nick()); + connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged())); + connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); } QVariant IrcUserItem::data(int column, int role) const { switch(role) { + case NetworkModel::ItemActiveRole: + return isActive(); case NetworkModel::ItemTypeRole: return NetworkModel::IrcUserItemType; case NetworkModel::BufferIdRole: @@ -464,20 +664,51 @@ QVariant IrcUserItem::data(int column, int role) const { QString IrcUserItem::toolTip(int column) const { Q_UNUSED(column); - return "

" + nickName() + "
" + _ircUser->hostmask() + "

"; -} + 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(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator())); + if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost()); + if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply()); + + 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())); + } -void IrcUserItem::setNick(QString newNick) { - Q_UNUSED(newNick); - emit dataChanged(0); + if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server())); + + return QString("

%1

").arg(toolTip.join("
")); } +// void IrcUserItem::ircUserDestroyed() { +// parent()->removeChild(this); +// if(parent()->childCount() == 0) +// parent()->parent()->removeChild(parent()); +// } + /***************************************** * NetworkModel *****************************************/ NetworkModel::NetworkModel(QObject *parent) : TreeModel(NetworkModel::defaultHeader(), parent) { + connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + this, SLOT(checkForNewBuffers(const QModelIndex &, int, int))); + connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), + this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int))); } QListNetworkModel::defaultHeader() { @@ -497,57 +728,83 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const { } */ +int NetworkModel::networkRow(NetworkId networkId) { + NetworkItem *netItem = 0; + for(int i = 0; i < rootItem->childCount(); i++) { + netItem = qobject_cast(rootItem->child(i)); + if(!netItem) + continue; + if(netItem->networkId() == networkId) + return i; + } + return -1; +} -// experimental stuff :) QModelIndex NetworkModel::networkIndex(NetworkId networkId) { - return indexById(networkId.toInt()); + int netRow = networkRow(networkId); + if(netRow == -1) + return QModelIndex(); + else + return indexByItem(qobject_cast(rootItem->child(netRow))); } -NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { - return qobject_cast(rootItem->childById(networkId.toInt())); +NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) { + int netRow = networkRow(networkId); + if(netRow == -1) + return 0; + else + return qobject_cast(rootItem->child(netRow)); } NetworkItem *NetworkModel::networkItem(NetworkId networkId) { - NetworkItem *netItem = existsNetworkItem(networkId); + NetworkItem *netItem = findNetworkItem(networkId); if(netItem == 0) { netItem = new NetworkItem(networkId, rootItem); rootItem->newChild(netItem); } - - Q_ASSERT(netItem); return netItem; } -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())); - } +void NetworkModel::networkRemoved(const NetworkId &networkId) { + int netRow = networkRow(networkId); + if(netRow != -1) { + rootItem->removeChild(netRow); } - return QModelIndex(); } -BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { - QModelIndex bufferIdx = bufferIndex(bufferInfo.uid()); - if(bufferIdx.isValid()) - return static_cast(bufferIdx.internalPointer()); +QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { + BufferItem *bufferItem = findBufferItem(bufferId); + if(bufferItem) + return indexByItem(bufferItem); else + return QModelIndex(); +} + +BufferItem *NetworkModel::findBufferItem(const BufferInfo &bufferInfo) { + NetworkItem *netItem = findNetworkItem(bufferInfo.networkId()); + if(!netItem) return 0; + + BufferItem *bufferItem = netItem->findBufferItem(bufferInfo); + return 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); +BufferItem *NetworkModel::findBufferItem(BufferId bufferId) { + NetworkItem *netItem; + BufferItem *bufferItem; + + for(int i = 0; i < rootItem->childCount(); i++) { + netItem = qobject_cast(rootItem->child(i)); + if((bufferItem = netItem->findBufferItem(bufferId))) + return bufferItem; } + return 0; +} - Q_ASSERT(bufItem); - return bufItem; +BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) { + NetworkItem *netItem = networkItem(bufferInfo.networkId()); + return netItem->bufferItem(bufferInfo); } QStringList NetworkModel::mimeTypes() const { @@ -610,8 +867,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); @@ -626,13 +883,15 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in // no self merges (would kill us) if(bufferId == parent.data(BufferIdRole).value()) return false; - - Q_ASSERT(rootItem->childById(netId.toInt())); - Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt())); + + NetworkItem *netItem = findNetworkItem(netId); + Q_ASSERT(netItem); + + BufferItem *bufferItem = netItem->findBufferItem(bufferId); + Q_ASSERT(bufferItem); // 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) + if(bufferItem->bufferType() != BufferInfo::QueryBuffer) return false; // TODO: warn user about buffermerge! @@ -653,14 +912,102 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { emit dataChanged(itemindex, itemindex); } +void NetworkModel::removeBuffer(BufferId bufferId) { + BufferItem *bufferItem = findBufferItem(bufferId); + if(bufferItem) + bufferItem->parent()->removeChild(bufferItem); +} + +/* 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; + 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); +} + + + +void NetworkModel::checkForRemovedBuffers(const QModelIndex &parent, int start, int end) { + if(parent.data(ItemTypeRole) != NetworkItemType) + return; - bufferItem(msg.buffer())->updateActivity(level); + for(int row = start; row <= end; row++) { + _bufferItemCache.remove(parent.child(row, 0).data(BufferIdRole).value()); + } +} + +void NetworkModel::checkForNewBuffers(const QModelIndex &parent, int start, int end) { + if(parent.data(ItemTypeRole) != NetworkItemType) + return; + + for(int row = start; row <= end; row++) { + QModelIndex child = parent.child(row, 0); + _bufferItemCache[child.data(BufferIdRole).value()] = static_cast(child.internalPointer()); + } +} + +QString NetworkModel::bufferName(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return QString(); + + return _bufferItemCache[bufferId]->bufferName(); } +NetworkId NetworkModel::networkId(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return NetworkId(); + + NetworkItem *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); + if(netItem) + return netItem->networkId(); + else + return NetworkId(); +} + +QString NetworkModel::networkName(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return QString(); + + NetworkItem *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); + if(netItem) + return netItem->networkName(); + else + return QString(); +} + +BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return BufferInfo::InvalidBuffer; + + return _bufferItemCache[bufferId]->bufferType(); +}