X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=c79717911b65d4f82045e217410ab7dba7aa344b;hp=9d463f64eeada64444f741b9287ff8a2295bf5c0;hb=52a7b4d0f289f075aa386445a47d876743bcb6d0;hpb=b5385b3ddf6f0e8df8f0af7275b59dcc1fcd0ed1 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 9d463f64..c7971791 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -27,13 +27,11 @@ #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 *****************************************/ @@ -41,7 +39,8 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), _bufferInfo(bufferInfo), _bufferName(bufferInfo.bufferName()), - _activity(Buffer::NoActivity) + _activity(Buffer::NoActivity), + _ircChannel(0) { Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; if(bufferType() == BufferInfo::QueryBuffer) @@ -69,10 +68,11 @@ bool BufferItem::isActive() const { return qobject_cast(parent())->isActive(); } -bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) { - _activity = level; - emit dataChanged(); - return true; +void BufferItem::setActivityLevel(Buffer::ActivityLevel level) { + if(_activity != level) { + _activity = level; + emit dataChanged(); + } } void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) { @@ -106,7 +106,8 @@ QVariant BufferItem::data(int column, int role) const { bool BufferItem::setData(int column, const QVariant &value, int role) { switch(role) { case NetworkModel::BufferActivityRole: - return setActivityLevel((Buffer::ActivityLevel)value.toInt()); + setActivityLevel((Buffer::ActivityLevel)value.toInt()); + return true; default: return PropertyMapItem::setData(column, value, role); } @@ -144,6 +145,9 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { } void BufferItem::ircChannelDestroyed() { + Q_CHECK_PTR(_ircChannel); + disconnect(_ircChannel, 0, this, 0); + _ircChannel = 0; emit dataChanged(); removeAllChilds(); } @@ -250,23 +254,23 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) { UserCategoryItem *categoryItem = 0; for(int i = 0; i < childCount(); i++) { categoryItem = qobject_cast(child(i)); - if(success = categoryItem->removeUser(ircUser)) { + 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); +// 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); } void BufferItem::userModeChanged(IrcUser *ircUser) { @@ -288,7 +292,7 @@ QString BufferItem::toolTip(int column) const { switch(bufferType()) { case BufferInfo::StatusBuffer: { QString netName = Client::network(bufferInfo().networkId())->networkName(); - toolTip.append(tr("Status buffer from %1").arg(netName)); + toolTip.append(tr("Status buffer of %1").arg(netName)); break; } case BufferInfo::ChannelBuffer: @@ -308,6 +312,11 @@ QString BufferItem::toolTip(int column) const { toolTip.append(tr("Topic: %1").arg(_topic)); } } + 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)); + } } else { toolTip.append(tr("Not active
Double-click to join")); } @@ -414,7 +423,9 @@ void NetworkItem::attachNetwork(Network *network) { this, SLOT(attachIrcChannel(QString))); connect(network, SIGNAL(connectedSet(bool)), this, SIGNAL(dataChanged())); - + connect(network, SIGNAL(destroyed()), + this, SIGNAL(dataChanged())); + emit dataChanged(); } @@ -462,27 +473,26 @@ QString NetworkItem::toolTip(int column) const { *****************************************/ // 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', tr("Owners")) - << UserCategoryItem::Category('a', tr("Admins")) - << UserCategoryItem::Category('o', tr("Operators")) - << UserCategoryItem::Category('h', tr("Half-Ops")) - << UserCategoryItem::Category('v', tr("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) { + } -QString UserCategoryItem::categoryId() { - if(_category < categories.count()) - return categories[_category].displayString; - else - return tr("Users"); +// 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); + } } quint64 UserCategoryItem::id() const { @@ -502,7 +512,7 @@ bool UserCategoryItem::removeUser(IrcUser *ircUser) { 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(); @@ -510,6 +520,8 @@ 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: @@ -525,7 +537,7 @@ QVariant UserCategoryItem::data(int column, int role) const { } } - + /***************************************** * Irc User Items *****************************************/ @@ -557,14 +569,6 @@ bool IrcUserItem::isActive() const { return false; } -IrcUser *IrcUserItem::ircUser() { - return _ircUser; -} - -quint64 IrcUserItem::id() const { - return _id; -} - QVariant IrcUserItem::data(int column, int role) const { switch(role) { case NetworkModel::ItemActiveRole: @@ -589,7 +593,10 @@ QString IrcUserItem::toolTip(int column) const { 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()); + 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()) {