X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=920b2d8fca4e8b301866dc4642a18d579d109041;hp=48a6b8c4c31a777d04a4c3ea72b0b3cbe3f86b5d;hb=c48313654848b755982179d1252cc27a8c621b91;hpb=c4507cf512b6fd04e5c75a7ac00b9c2888fb646f diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 48a6b8c4..920b2d8f 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -83,10 +83,12 @@ BufferItem::ActivityLevel BufferItem::activity() const { void BufferItem::setActivity(const ActivityLevel &level) { _activity = level; + emit dataChanged(); } -void BufferItem::addActivity(const ActivityLevel &level) { +void BufferItem::updateActivity(const ActivityLevel &level) { _activity |= level; + emit dataChanged(); } QVariant BufferItem::data(int column, int role) const { @@ -97,15 +99,30 @@ QVariant BufferItem::data(int column, int role) const { return qVariantFromValue(bufferInfo().uid()); 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 qVariantFromValue((int)activity()); default: return PropertyMapItem::data(column, role); } } +bool BufferItem::setData(int column, const QVariant &value, int role) { + switch(role) { + case NetworkModel::BufferActivityRole: + setActivity((ActivityLevel)value.toInt()); + default: + return PropertyMapItem::setData(column, value, role); + } + return true; +} + + void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { if(!ircChannel) return; @@ -171,40 +188,68 @@ void BufferItem::join(IrcUser *ircUser) { void BufferItem::addUserToCategory(IrcUser *ircUser) { 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); + newChild(categoryItem); } - categoryItem->addUser(ircUser); + + int totalusers = 0; + for(int i = 0; i < childCount(); i++) { + totalusers += child(i)->childCount(); + } } void BufferItem::part(IrcUser *ircUser) { - Q_UNUSED(ircUser); + if(!ircUser) { + qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser; + return; + } + + removeUserFromCategory(ircUser); emit dataChanged(2); } void BufferItem::removeUserFromCategory(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + 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->removeChildById((quint64)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) { 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((quint64)(ircUser))) return; // already in the right category; removeUserFromCategory(ircUser); @@ -238,8 +283,16 @@ quint64 NetworkItem::id() const { return _networkId.toInt(); } +void NetworkItem::setActive(bool connected) { + Q_UNUSED(connected); + emit dataChanged(); +} + bool NetworkItem::isActive() const { - return _network; + if(_network) + return _network->isConnected(); + else + return false; } QString NetworkItem::networkName() const { @@ -275,6 +328,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, SLOT(setActive(bool))); + // FIXME: connect this and that... emit dataChanged(); @@ -312,19 +368,18 @@ 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() + << 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::UserCategoryItem(int category, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "categoryId", parent), _category(category) { - connect(this, SIGNAL(childRemoved(int)), - this, SLOT(checkNoChilds())); } QString UserCategoryItem::categoryId() { @@ -334,17 +389,12 @@ QString UserCategoryItem::categoryId() { return QString("Users"); } -void UserCategoryItem::checkNoChilds() { - if(childCount() == 0) - deleteLater(); -} - quint64 UserCategoryItem::id() const { return qHash(_category); } void UserCategoryItem::addUser(IrcUser *ircUser) { - emit newChild(new IrcUserItem(ircUser, this)); + newChild(new IrcUserItem(ircUser, this)); } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -354,6 +404,22 @@ int UserCategoryItem::categoryFromModes(const QString &modes) { } return categories.count(); } + +QVariant UserCategoryItem::data(int column, int role) const { + switch(role) { + 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 @@ -362,14 +428,14 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), _ircUser(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() { +QString IrcUserItem::nickName() const { return _ircUser->nick(); } @@ -381,13 +447,30 @@ quint64 IrcUserItem::id() const { return (quint64)_ircUser; } +QVariant IrcUserItem::data(int column, int role) const { + switch(role) { + 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); + return "

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

"; +} + void IrcUserItem::setNick(QString newNick) { Q_UNUSED(newNick); emit dataChanged(0); } -void IrcUserItem::ircUserDestroyed() { - deleteLater(); -} /***************************************** * NetworkModel @@ -429,7 +512,7 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) { if(netItem == 0) { netItem = new NetworkItem(networkId, rootItem); - appendChild(rootItem, netItem); + rootItem->newChild(netItem); } Q_ASSERT(netItem); @@ -460,7 +543,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); @@ -570,13 +653,14 @@ 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::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.buffer())->updateActivity(level); }