X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=d09605f0f590a75ff0d6dfe4145f0dbc0fa707a9;hp=94d90b8d2c7e825bb7edaf9668f24d8776c93b1a;hb=d07c7f8e2de851adefcee45049bb1bb19682d0c6;hpb=620882e248fafe97a736e545d8e3eb72569a078b diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 94d90b8d..d09605f0 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -33,8 +33,6 @@ #include "util.h" // get rid of this (needed for isChannelName) -// #define PHONDEV - /***************************************** * Fancy Buffer Items *****************************************/ @@ -42,7 +40,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) @@ -55,21 +54,13 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) setFlags(flags); } -const BufferInfo &BufferItem::bufferInfo() const { - return _bufferInfo; -} - quint64 BufferItem::id() const { return qHash(bufferInfo().bufferId()); } -bool BufferItem::isStatusBuffer() const { - return bufferType() == BufferInfo::StatusBuffer; -} - -BufferInfo::Type BufferItem::bufferType() const { - return bufferInfo().type(); -} +// bool BufferItem::isStatusBuffer() const { +// return bufferType() == BufferInfo::StatusBuffer; +// } bool BufferItem::isActive() const { if(bufferType() == BufferInfo::ChannelBuffer) @@ -78,10 +69,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) { @@ -115,7 +107,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); } @@ -131,8 +124,8 @@ void BufferItem::attachIrcChannel(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()), @@ -146,15 +139,16 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { if(!ircChannel->ircUsers().isEmpty()) { qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)"; - foreach(IrcUser *ircUser, ircChannel->ircUsers()) { - join(ircUser); - } + join(ircChannel->ircUsers()); } emit dataChanged(); } void BufferItem::ircChannelDestroyed() { + Q_CHECK_PTR(_ircChannel); + disconnect(_ircChannel, 0, this, 0); + _ircChannel = 0; emit dataChanged(); removeAllChilds(); } @@ -170,7 +164,7 @@ void BufferItem::setBufferName(const QString &name) { _bufferName = name; // as long as we need those bufferInfos, we have to update that one aswell. // pretty ugly though :/ - _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), _bufferInfo.bufferName()); + _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name); emit dataChanged(0); } @@ -200,30 +194,41 @@ void BufferItem::setTopic(const QString &topic) { emit dataChanged(1); } -void BufferItem::join(IrcUser *ircUser) { - if(!ircUser) - return; +void BufferItem::join(const QList &ircUsers) { + addUsersToCategory(ircUsers); - addUserToCategory(ircUser); - connect(ircUser, SIGNAL(destroyed()), - this, SLOT(ircUserDestroyed())); + foreach(IrcUser *ircUser, ircUsers) { + if(!ircUser) + continue; + connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + } + emit dataChanged(2); } void BufferItem::addUserToCategory(IrcUser *ircUser) { + addUsersToCategory(QList() << ircUser); +} + +void BufferItem::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; + foreach(IrcUser *ircUser, ircUsers) { + UserCategoryItem *categoryItem; + int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { + 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++; } } @@ -250,7 +255,7 @@ 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; @@ -267,11 +272,6 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) { 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) { @@ -293,14 +293,14 @@ QString BufferItem::toolTip(int column) const { switch(bufferType()) { case BufferInfo::StatusBuffer: { QString netName = Client::network(bufferInfo().networkId())->networkName(); - toolTip.append(QString("Status buffer from %1").arg(netName)); + toolTip.append(tr("Status buffer of %1").arg(netName)); break; } case BufferInfo::ChannelBuffer: - toolTip.append(QString("

Channel %1

").arg(bufferName())); + toolTip.append(tr("Channel %1").arg(bufferName())); if(isActive()) { //TODO: add channel modes - toolTip.append(QString("Users: %1").arg(nickCount())); + toolTip.append(tr("Users: %1").arg(nickCount())); BufferSettings s; bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool(); @@ -310,23 +310,28 @@ QString BufferItem::toolTip(int column) const { _topic.replace(QString("<"), QString("<")); _topic.replace(QString(">"), QString(">")); toolTip.append(QString(" ")); - toolTip.append(QString("Topic: %1").arg(_topic)); + 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(QString("Not active
Double-click to join")); + toolTip.append(tr("Not active
Double-click to join")); } break; case BufferInfo::QueryBuffer: - toolTip.append(QString("Query with %1").arg(bufferName())); - if(topic() != "") toolTip.append(QString("Away Message: %1").arg(topic())); + toolTip.append(tr("Query with %1").arg(bufferName())); + if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic())); break; default: //this should not happen - toolTip.append(QString("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName())); + toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName())); break; } - return QString("

%1

").arg(toolTip.join("
")); + return tr("

%1

").arg(toolTip.join("
")); } /* @@ -419,9 +424,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())); - // FIXME: connect this and that... - emit dataChanged(); } @@ -469,35 +474,37 @@ 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 { return qHash(_category); } -void UserCategoryItem::addUser(IrcUser *ircUser) { - newChild(new IrcUserItem(ircUser, this)); +void UserCategoryItem::addUsers(const QList &ircUsers) { + QList userItems; + foreach(IrcUser *ircUser, ircUsers) + userItems << new IrcUserItem(ircUser, this); + newChilds(userItems); } bool UserCategoryItem::removeUser(IrcUser *ircUser) { @@ -506,7 +513,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(); @@ -514,6 +521,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: @@ -529,7 +538,7 @@ QVariant UserCategoryItem::data(int column, int role) const { } } - + /***************************************** * Irc User Items *****************************************/ @@ -589,33 +598,24 @@ QVariant IrcUserItem::data(int column, int role) const { QString IrcUserItem::toolTip(int column) const { Q_UNUSED(column); 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(_ircUser->ircOperator()); - toolTip.append(_ircUser->hostmask()); + 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); - - 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)); + 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()));