X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=8cf95bb69061299ff6cdb0b1fcf6643d7b0e535c;hp=1cde086ba901ec2491e93d3fd2a1ba5734720627;hb=3bb86923bd1b39089abacc4fcb08bb4939ab70e0;hpb=99a590ef8b00aadfb3d6f77bc84df015158fc70b diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 1cde086b..8cf95bb6 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -40,9 +40,9 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) _activity(NoActivity) { // determine BufferType - if(bufferInfo.buffer().isEmpty()) + if(bufferInfo.bufferName().isEmpty()) _type = StatusType; - else if(isChannelName(bufferInfo.buffer())) + else if(isChannelName(bufferInfo.bufferName())) _type = ChannelType; else _type = QueryType; @@ -51,15 +51,16 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) if(bufferType() == QueryType) flags |= Qt::ItemIsDropEnabled; setFlags(flags); -} + _lastSeen = BufferSettings(bufferInfo.bufferId()).lastSeen(); +} const BufferInfo &BufferItem::bufferInfo() const { return _bufferInfo; } quint64 BufferItem::id() const { - return bufferInfo().uid().toInt(); + return qHash(bufferInfo().bufferId()); } bool BufferItem::isStatusBuffer() const { @@ -81,14 +82,17 @@ BufferItem::ActivityLevel BufferItem::activity() const { return _activity; } -void BufferItem::setActivity(const ActivityLevel &level) { +bool BufferItem::setActivity(const ActivityLevel &level) { _activity = level; emit dataChanged(); + return true; } void BufferItem::updateActivity(const ActivityLevel &level) { + ActivityLevel oldActivity = _activity; _activity |= level; - emit dataChanged(); + if(oldActivity != _activity) + emit dataChanged(); } QVariant BufferItem::data(int column, int role) const { @@ -96,7 +100,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: @@ -115,7 +119,9 @@ QVariant BufferItem::data(int column, int role) const { bool BufferItem::setData(int column, const QVariant &value, int role) { switch(role) { case NetworkModel::BufferActivityRole: - setActivity((ActivityLevel)value.toInt()); + return setActivity((ActivityLevel)value.toInt()); + case NetworkModel::LastSeenRole: + return setLastSeen(); default: return PropertyMapItem::setData(column, value, role); } @@ -163,7 +169,7 @@ QString BufferItem::bufferName() const { if(bufferType() == StatusType) return tr("Status Buffer"); else - return bufferInfo().buffer(); + return bufferInfo().bufferName(); } QString BufferItem::topic() const { @@ -173,6 +179,13 @@ QString BufferItem::topic() const { return QString(); } +void BufferItem::ircUserDestroyed() { + // PRIVATE + IrcUser *ircUser = static_cast(sender()); + removeUserFromCategory(ircUser); + emit dataChanged(2); +} + int BufferItem::nickCount() const { if(_ircChannel) return _ircChannel->ircUsers().count(); @@ -190,6 +203,8 @@ void BufferItem::join(IrcUser *ircUser) { return; addUserToCategory(ircUser); + connect(ircUser, SIGNAL(destroyed()), + this, SLOT(ircUserDestroyed())); emit dataChanged(2); } @@ -216,6 +231,7 @@ void BufferItem::part(IrcUser *ircUser) { return; } + disconnect(ircUser, 0, this, 0); removeUserFromCategory(ircUser); emit dataChanged(2); } @@ -227,16 +243,15 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) { UserCategoryItem *categoryItem = 0; for(int i = 0; i < childCount(); i++) { categoryItem = qobject_cast(child(i)); - if(success = categoryItem->removeChildById((quint64)ircUser)) { + if(success = categoryItem->removeUser(ircUser)) { if(categoryItem->childCount() == 0) removeChild(i); break; } } - if(!success) { - qDebug() << "didn't find User:" << ircUser << (quint64)ircUser; + 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)); @@ -257,13 +272,31 @@ void BufferItem::userModeChanged(IrcUser *ircUser) { UserCategoryItem *categoryItem; int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser))) + if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser))) return; // already in the right category; removeUserFromCategory(ircUser); addUserToCategory(ircUser); } +void BufferItem::setLastMsgInsert(QDateTime msgDate) { + if(msgDate.isValid() && msgDate > _lastMsgInsert) + _lastMsgInsert = msgDate; +} + +bool BufferItem::setLastSeen() { + if(_lastSeen > _lastMsgInsert) + return false; + + _lastSeen = _lastMsgInsert; + BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen); + return true; +} + +QDateTime BufferItem::lastSeen() { + return _lastSeen; +} + /***************************************** * Network Items *****************************************/ @@ -288,7 +321,7 @@ QVariant NetworkItem::data(int column, int role) const { } quint64 NetworkItem::id() const { - return _networkId.toInt(); + return qHash(_networkId); } void NetworkItem::setActive(bool connected) { @@ -405,6 +438,10 @@ void UserCategoryItem::addUser(IrcUser *ircUser) { newChild(new IrcUserItem(ircUser, this)); } +bool UserCategoryItem::removeUser(IrcUser *ircUser) { + return removeChildById(qHash(ircUser)); +} + int UserCategoryItem::categoryFromModes(const QString &modes) { for(int i = 0; i < categories.count(); i++) { if(modes.contains(categories[i].mode)) @@ -415,6 +452,8 @@ int UserCategoryItem::categoryFromModes(const QString &modes) { QVariant UserCategoryItem::data(int column, int role) const { switch(role) { + case NetworkModel::ItemActiveRole: + return true; case NetworkModel::ItemTypeRole: return NetworkModel::UserCategoryItemType; case NetworkModel::BufferIdRole: @@ -434,7 +473,8 @@ QVariant UserCategoryItem::data(int column, int role) const { *****************************************/ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), - _ircUser(ircUser) + _ircUser(ircUser), + _id(qHash(ircUser)) { // we don't need to handle the ircUser's destroyed signal since it's automatically removed // by the IrcChannel::ircUserParted(); @@ -444,7 +484,17 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) } QString IrcUserItem::nickName() const { - return _ircUser->nick(); + if(_ircUser) + return _ircUser->nick(); + else + return QString(); +} + +bool IrcUserItem::isActive() const { + if(_ircUser) + return !_ircUser->isAway(); + else + return false; } IrcUser *IrcUserItem::ircUser() { @@ -452,11 +502,13 @@ IrcUser *IrcUserItem::ircUser() { } quint64 IrcUserItem::id() const { - return (quint64)_ircUser; + return _id; } QVariant IrcUserItem::data(int column, int role) const { switch(role) { + case NetworkModel::ItemActiveRole: + return isActive(); case NetworkModel::ItemTypeRole: return NetworkModel::IrcUserItemType; case NetworkModel::BufferIdRole: @@ -472,14 +524,39 @@ QVariant IrcUserItem::data(int column, int role) const { 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() + ")"; + QStringList toolTip(QString("%1").arg(nickName())); + 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->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(QString("idling since %1").arg(idleString)); } - return "

" + toolTip + "

"; + + if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server())); + + return QString("

%1

").arg(toolTip.join("
")); } void IrcUserItem::setNick(QString newNick) { @@ -546,7 +623,7 @@ QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { } BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { - QModelIndex bufferIdx = bufferIndex(bufferInfo.uid()); + QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId()); if(bufferIdx.isValid()) return static_cast(bufferIdx.internalPointer()); else @@ -669,13 +746,34 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { } 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; - - bufferItem(msg.buffer())->updateActivity(level); + + const Network *net = Client::network(msg.bufferInfo().networkId()); + if(net) { + QRegExp nickRegExp("^(.*\\W)?"+net->myNick()+"(\\W.*)?$"); + if((msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && nickRegExp.exactMatch(msg.text())) + level |= BufferItem::Highlight; + } + + bufferItem(msg.bufferInfo())->updateActivity(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); +}