X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=7890099b707938dd406db3502bc7aad27a262b72;hp=e3739ae617e835e67541c6142e5f168a1e51c88d;hb=5d9e6f82037c37c560827bfd9d71bc9467fa7ccc;hpb=d28b9ec38b6ea0bc473200fc2f1e65abd1b56bd6 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index e3739ae6..7890099b 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -59,7 +59,7 @@ const BufferInfo &BufferItem::bufferInfo() const { } quint64 BufferItem::id() const { - return bufferInfo().uid(); + return bufferInfo().uid().toInt(); } bool BufferItem::isStatusBuffer() const { @@ -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 { @@ -94,18 +96,33 @@ QVariant BufferItem::data(int column, int role) const { case NetworkModel::ItemTypeRole: return NetworkModel::BufferItemType; case NetworkModel::BufferIdRole: - return bufferInfo().uid(); + return qVariantFromValue(bufferInfo().uid()); 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 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; @@ -126,16 +143,20 @@ 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(); } void BufferItem::ircChannelDestroyed() { emit dataChanged(); - for(int i = 0; i < childCount(); i++) { - emit childDestroyed(i); - removeChild(i); - } + removeAllChilds(); } QString BufferItem::bufferName() const { @@ -174,35 +195,70 @@ 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->removeUser(ircUser)) { + if(categoryItem->childCount() == 0) + removeChild(i); + break; + } + } + + if(!success) { + qDebug() << "didn't find User:" << ircUser << (quint64)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)))) && categoryItem->childById((quint64)(ircUser))) + return; // already in the right category; + removeUserFromCategory(ircUser); addUserToCategory(ircUser); } @@ -220,7 +276,7 @@ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) 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: @@ -231,11 +287,19 @@ QVariant NetworkItem::data(int column, int role) const { } quint64 NetworkItem::id() const { - return _networkId; + 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 { @@ -271,6 +335,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(); @@ -308,19 +375,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(childDestroyed(int)), - this, SLOT(checkNoChilds())); } QString UserCategoryItem::categoryId() { @@ -330,17 +396,16 @@ 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)); +} + +bool UserCategoryItem::removeUser(IrcUser *ircUser) { + return removeChildById((quint64)ircUser); } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -350,6 +415,24 @@ 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 @@ -358,14 +441,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(); } @@ -377,13 +460,39 @@ quint64 IrcUserItem::id() const { return (quint64)_ircUser; } +QVariant IrcUserItem::data(int column, int role) const { + switch(role) { + case NetworkModel::ItemActiveRole: + return !_ircUser->isAway(); + 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); + QString toolTip = "" + nickName() + "
" + _ircUser->hostmask(); + if(_ircUser->isAway()) { + toolTip += "
away"; + if(!_ircUser->awayMessage().isEmpty()) { + toolTip += " (" + _ircUser->awayMessage() + ")"; + } + } + return "

" + toolTip + "

"; +} + void IrcUserItem::setNick(QString newNick) { Q_UNUSED(newNick); emit dataChanged(0); } -void IrcUserItem::ircUserDestroyed() { - deleteLater(); -} /***************************************** * NetworkModel @@ -413,11 +522,11 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const { // experimental stuff :) QModelIndex NetworkModel::networkIndex(NetworkId networkId) { - return indexById(networkId); + return indexById(networkId.toInt()); } NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { - return qobject_cast(rootItem->childById(networkId)); + return qobject_cast(rootItem->childById(networkId.toInt())); } NetworkItem *NetworkModel::networkItem(NetworkId networkId) { @@ -425,7 +534,7 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) { if(netItem == 0) { netItem = new NetworkItem(networkId, rootItem); - appendChild(rootItem, netItem); + rootItem->newChild(netItem); } Q_ASSERT(netItem); @@ -436,7 +545,7 @@ 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))) { + if((bufferItem = netItem->childById(bufferId.toInt()))) { return indexById(bufferItem->id(), networkIndex(netItem->id())); } } @@ -456,7 +565,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); @@ -502,8 +611,8 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const { QStringList bufferlist; QString netid, uid, bufferid; foreach(QModelIndex index, indexes) { - netid = QString::number(index.data(NetworkIdRole).value()); - uid = QString::number(index.data(BufferIdRole).value()); + 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; @@ -540,11 +649,11 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in if(bufferId == parent.data(BufferIdRole).value()) return false; - Q_ASSERT(rootItem->childById(netId)); - Q_ASSERT(rootItem->childById(netId)->childById(bufferId)); + Q_ASSERT(rootItem->childById(netId.toInt())); + Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt())); // source must be a query too - BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt(); + BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt(); if(sourceType != BufferItem::QueryType) return false; @@ -566,13 +675,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); }