X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=8b087d588d4d29e728a6013e7916c10b25729eb1;hp=840a10ae7eba9222044eeeeb6205ef49c325617d;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=997fd2faaf19b25128fa7516be89aa5b0c165ae7 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 840a10ae..8b087d58 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -37,9 +37,15 @@ *****************************************/ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), - _networkId(netid) + _networkId(netid), + _statusBufferItem(0) { + // DO NOT EMIT dataChanged() DIRECTLY IN NetworkItem + // use networkDataChanged() instead. Otherwise you will end up in a infinite loop + // as we "sync" the dataChanged() signals of NetworkItem and StatusBufferItem setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable); + connect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int))); + connect(this, SIGNAL(beginRemoveChilds(int, int)), this, SLOT(onBeginRemoveChilds(int, int))); } QVariant NetworkItem::data(int column, int role) const { @@ -47,8 +53,9 @@ QVariant NetworkItem::data(int column, int role) const { case NetworkModel::BufferIdRole: case NetworkModel::BufferInfoRole: case NetworkModel::BufferTypeRole: - if(childCount()) - return child(0)->data(column, role); + case NetworkModel::BufferActivityRole: + if(_statusBufferItem) + return _statusBufferItem->data(column, role); else return QVariant(); case NetworkModel::NetworkIdRole: @@ -83,7 +90,11 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { switch(bufferInfo.type()) { case BufferInfo::StatusBuffer: - bufferItem = new StatusBufferItem(bufferInfo, this); + _statusBufferItem = new StatusBufferItem(bufferInfo, this); + bufferItem = _statusBufferItem; + disconnect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int))); + connect(this, SIGNAL(networkDataChanged(int)), bufferItem, SIGNAL(dataChanged(int))); + connect(bufferItem, SIGNAL(dataChanged(int)), this, SIGNAL(dataChanged(int))); break; case BufferInfo::ChannelBuffer: bufferItem = new ChannelBufferItem(bufferInfo, this); @@ -114,11 +125,11 @@ void NetworkItem::attachNetwork(Network *network) { connect(network, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(attachIrcUser(IrcUser *))); connect(network, SIGNAL(connectedSet(bool)), - this, SIGNAL(dataChanged())); + this, SIGNAL(networkDataChanged())); connect(network, SIGNAL(destroyed()), - this, SIGNAL(dataChanged())); + this, SIGNAL(networkDataChanged())); - emit dataChanged(); + emit networkDataChanged(); } void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) { @@ -143,7 +154,7 @@ void NetworkItem::attachIrcUser(IrcUser *ircUser) { continue; if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) { - queryItem->attachIrcUser(ircUser); + queryItem->setIrcUser(ircUser); break; } } @@ -151,12 +162,12 @@ void NetworkItem::attachIrcUser(IrcUser *ircUser) { void NetworkItem::setNetworkName(const QString &networkName) { Q_UNUSED(networkName); - emit dataChanged(0); + emit networkDataChanged(0); } void NetworkItem::setCurrentServer(const QString &serverName) { Q_UNUSED(serverName); - emit dataChanged(1); + emit networkDataChanged(1); } @@ -174,6 +185,16 @@ QString NetworkItem::toolTip(int column) const { return QString("

%1

").arg(toolTip.join("
")); } +void NetworkItem::onBeginRemoveChilds(int start, int end) { + for(int i = start; i <= end; i++) { + StatusBufferItem *statusBufferItem = qobject_cast(child(i)); + if(statusBufferItem) { + _statusBufferItem = 0; + break; + } + } +} + /***************************************** * Fancy Buffer Items *****************************************/ @@ -282,18 +303,14 @@ QString BufferItem::toolTip(int column) const { StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent) : BufferItem(bufferInfo, parent) { - Q_ASSERT(parent); - connect(parent, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); } QString StatusBufferItem::toolTip(int column) const { - Q_UNUSED(column); - QStringList toolTip; - - QString netName = Client::network(bufferInfo().networkId())->networkName(); - toolTip.append(tr("Status buffer of %1").arg(netName)); - - return tr("

%1

").arg(toolTip.join("
")); + NetworkItem *networkItem = qobject_cast(parent()); + if(networkItem) + return networkItem->toolTip(column); + else + return QString(); } /***************************************** @@ -310,12 +327,13 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare return; IrcUser *ircUser = net->ircUser(bufferInfo.bufferName()); - if(ircUser) - attachIrcUser(ircUser); + setIrcUser(ircUser); } QVariant QueryBufferItem::data(int column, int role) const { switch(role) { + case Qt::EditRole: + return BufferItem::data(column, Qt::DisplayRole); case NetworkModel::IrcUserRole: return QVariant::fromValue(_ircUser); case NetworkModel::UserAwayRole: @@ -346,6 +364,14 @@ bool QueryBufferItem::setData(int column, const QVariant &value, int role) { } } +void QueryBufferItem::setBufferName(const QString &name) { + BufferItem::setBufferName(name); + NetworkId netId = data(0, NetworkModel::NetworkIdRole).value(); + const Network *net = Client::network(netId); + if(net) + setIrcUser(net->ircUser(name)); +} + QString QueryBufferItem::toolTip(int column) const { // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this... Q_UNUSED(column); @@ -381,14 +407,24 @@ QString QueryBufferItem::toolTip(int column) const { return QString("

%1

").arg(toolTip.join("
")); } -void QueryBufferItem::attachIrcUser(IrcUser *ircUser) { +void QueryBufferItem::setIrcUser(IrcUser *ircUser) { + if(_ircUser == ircUser) + return; + + if(_ircUser) { + disconnect(_ircUser, 0, this, 0); + } + + if(ircUser) { + connect(ircUser, SIGNAL(quited()), this, SLOT(removeIrcUser())); + connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); + } + _ircUser = ircUser; - connect(_ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited())); - connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); emit dataChanged(); } -void QueryBufferItem::ircUserQuited() { +void QueryBufferItem::removeIrcUser() { _ircUser = 0; emit dataChanged(); } @@ -608,6 +644,7 @@ UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "categoryName", parent), _category(category) { + setFlags(Qt::ItemIsEnabled); setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved); setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category)); } @@ -761,6 +798,12 @@ NetworkModel::NetworkModel(QObject *parent) this, SLOT(checkForNewBuffers(const QModelIndex &, int, int))); connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int))); + + BufferSettings defaultSettings; + defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionSettingsChanged())); + defaultSettings.notify("ServerNoticesTarget", this, SLOT(messageRedirectionSettingsChanged())); + defaultSettings.notify("ErrorMsgsTarget", this, SLOT(messageRedirectionSettingsChanged())); + messageRedirectionSettingsChanged(); } QListNetworkModel::defaultHeader() { @@ -924,6 +967,15 @@ MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) const { return _bufferItemCache[bufferId]->lastSeenMarkerMsgId(); } +MsgId NetworkModel::lastSeenMsgId(const BufferId &bufferId) { + BufferItem *bufferItem = findBufferItem(bufferId); + if(!bufferItem) { + qDebug() << "NetworkModel::lastSeenMsgId(): buffer is unknown:" << bufferId; + return MsgId(); + } + return bufferItem->lastSeenMsgId(); +} + void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId) { BufferItem *bufferItem = findBufferItem(bufferId); if(!bufferItem) { @@ -933,11 +985,50 @@ void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId bufferItem->setLastSeenMsgId(msgId); } -void NetworkModel::updateBufferActivity(const Message &msg) { - BufferItem *item = bufferItem(msg.bufferInfo()); - item->updateActivityLevel(msg); - if(item->isCurrentBuffer()) - emit setLastSeenMsg(item->bufferId(), msg.msgId()); +void NetworkModel::updateBufferActivity(Message &msg) { + int redirectionTarget = 0; + switch(msg.type()) { + case Message::Notice: + if(bufferType(msg.bufferId()) != BufferInfo::ChannelBuffer) { + msg.setFlags(msg.flags() | Message::Redirected); + if(msg.flags() & Message::ServerMsg) { + // server notice + redirectionTarget = _serverNoticesTarget; + } else { + redirectionTarget = _userNoticesTarget; + } + } + break; + case Message::Error: + msg.setFlags(msg.flags() | Message::Redirected); + redirectionTarget = _errorMsgsTarget; + break; + default: + break; + } + + if(msg.flags() & Message::Redirected) { + if(redirectionTarget & BufferSettings::DefaultBuffer) + updateBufferActivity(bufferItem(msg.bufferInfo()), msg); + + if(redirectionTarget & BufferSettings::StatusBuffer) { + const NetworkItem *netItem = findNetworkItem(msg.bufferInfo().networkId()); + if(netItem) { + updateBufferActivity(netItem->statusBufferItem(), msg); + } + } + } else { + updateBufferActivity(bufferItem(msg.bufferInfo()), msg); + } +} + +void NetworkModel::updateBufferActivity(BufferItem *bufferItem, const Message &msg) { + if(!bufferItem) + return; + + bufferItem->updateActivityLevel(msg); + if(bufferItem->isCurrentBuffer()) + emit setLastSeenMsg(bufferItem->bufferId(), msg.msgId()); } void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) { @@ -1073,3 +1164,10 @@ bool NetworkModel::bufferItemLessThan(const BufferItem *left, const BufferItem * return QString::compare(left->bufferName(), right->bufferName(), Qt::CaseInsensitive) < 0; } +void NetworkModel::messageRedirectionSettingsChanged() { + BufferSettings bufferSettings; + + _userNoticesTarget = bufferSettings.userNoticesTarget(); + _serverNoticesTarget = bufferSettings.serverNoticesTarget(); + _errorMsgsTarget = bufferSettings.errorMsgsTarget(); +}