#include "networkmodel.h"
#include <QAbstractItemView>
+#include <QTextDocument> // for Qt::escape()
#include "buffermodel.h"
#include "client.h"
*****************************************/
NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
: PropertyMapItem(QList<QString>() << "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 {
case NetworkModel::BufferInfoRole:
case NetworkModel::BufferTypeRole:
case NetworkModel::BufferActivityRole:
- if(childCount())
- return child(0)->data(column, role);
+ if(_statusBufferItem)
+ return _statusBufferItem->data(column, role);
else
return QVariant();
case NetworkModel::NetworkIdRole:
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)));
}
newChild(bufferItem);
+
+ // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+ switch(bufferInfo.type()) {
+ case BufferInfo::ChannelBuffer:
+ {
+ ChannelBufferItem *channelBufferItem = static_cast<ChannelBufferItem *>(bufferItem);
+ if(_network) {
+ IrcChannel *ircChannel = _network->ircChannel(bufferInfo.bufferName());
+ if(ircChannel)
+ channelBufferItem->attachIrcChannel(ircChannel);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
return bufferItem;
}
QString NetworkItem::toolTip(int column) const {
Q_UNUSED(column);
- QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
- toolTip.append(tr("Server: %1").arg(currentServer()));
+ QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
+ toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
toolTip.append(tr("Users: %1").arg(nickCount()));
if(_network) {
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
+void NetworkItem::onBeginRemoveChilds(int start, int end) {
+ for(int i = start; i <= end; i++) {
+ StatusBufferItem *statusBufferItem = qobject_cast<StatusBufferItem *>(child(i));
+ if(statusBufferItem) {
+ _statusBufferItem = 0;
+ break;
+ }
+ }
+}
+
/*****************************************
* Fancy Buffer Items
*****************************************/
void BufferItem::clearActivityLevel() {
_activity = BufferInfo::NoActivity;
_lastSeenMarkerMsgId = _lastSeenMsgId;
+ _firstUnreadMsgId = MsgId();
emit dataChanged();
}
if(msg.flags() & Message::Self) // don't update activity for our own messages
return;
- if(lastSeenMsgId() >= msg.msgId())
+ if(msg.msgId() <= lastSeenMsgId())
return;
+ bool stateChanged = false;
+ if(!firstUnreadMsgId().isValid() || msg.msgId() < firstUnreadMsgId()) {
+ stateChanged = true;
+ _firstUnreadMsgId = msg.msgId();
+ }
+
BufferInfo::ActivityLevel oldLevel = activityLevel();
_activity |= BufferInfo::OtherActivity;
if(msg.flags() & Message::Highlight)
_activity |= BufferInfo::Highlight;
- if(oldLevel != _activity)
+ stateChanged |= (oldLevel != _activity);
+
+ if(stateChanged)
emit dataChanged();
}
return isActive();
case NetworkModel::BufferActivityRole:
return (int)activityLevel();
+ case NetworkModel::BufferFirstUnreadMsgIdRole:
+ return qVariantFromValue(firstUnreadMsgId());
default:
return PropertyMapItem::data(column, role);
}
}
QString StatusBufferItem::toolTip(int column) const {
- Q_UNUSED(column);
- QStringList toolTip;
-
- QString netName = Client::network(bufferInfo().networkId())->networkName();
- toolTip.append(tr("<b>Status buffer of %1</b>").arg(netName));
-
- return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
+ NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent());
+ if(networkItem)
+ return networkItem->toolTip(column);
+ else
+ return QString();
}
/*****************************************
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<QObject *>(_ircUser);
case NetworkModel::UserAwayRole:
: BufferItem(bufferInfo, parent),
_ircChannel(0)
{
- const Network *net = Client::network(bufferInfo.networkId());
- if(!net)
- return;
-
- IrcChannel *ircChannel = net->ircChannel(bufferInfo.bufferName());
- if(ircChannel)
- attachIrcChannel(ircChannel);
}
QVariant ChannelBufferItem::data(int column, int role) const {
Q_UNUSED(column);
QStringList toolTip;
- toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+ toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
if(isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
QString _topic = topic();
if(_topic != "") {
_topic = stripFormatCodes(_topic);
- _topic.replace(QString("<"), QString("<"));
- _topic.replace(QString(">"), QString(">"));
+ _topic = Qt::escape(_topic);
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
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();
}
QList<QVariant >NetworkModel::defaultHeader() {
return _bufferItemCache[bufferId]->lastSeenMarkerMsgId();
}
+MsgId NetworkModel::lastSeenMsgId(const BufferId &bufferId) {
+ BufferItem *bufferItem = findBufferItem(bufferId);
+ if(!bufferItem) {
+ qDebug() << "NetworkModel::lastSeenMsgId(): buffer is unknown:" << bufferId;
+ Client::purgeKnownBufferIds();
+ return MsgId();
+ }
+ return bufferItem->lastSeenMsgId();
+}
+
void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId) {
BufferItem *bufferItem = findBufferItem(bufferId);
if(!bufferItem) {
qDebug() << "NetworkModel::setLastSeenMsgId(): buffer is unknown:" << bufferId;
+ Client::purgeKnownBufferIds();
return;
}
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;
+ // Update IrcUser's last activity
+ case Message::Plain:
+ case Message::Action:
+ if(bufferType(msg.bufferId()) == BufferInfo::ChannelBuffer) {
+ const Network *net = Client::network(msg.bufferInfo().networkId());
+ IrcUser *user = net ? net->ircUser(nickFromMask(msg.sender())) : 0;
+ if(user)
+ user->setLastChannelActivity(msg.bufferId(), msg.timestamp());
+ }
+ 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) {
return QString::compare(left->bufferName(), right->bufferName(), Qt::CaseInsensitive) < 0;
}
+void NetworkModel::messageRedirectionSettingsChanged() {
+ BufferSettings bufferSettings;
+
+ _userNoticesTarget = bufferSettings.userNoticesTarget();
+ _serverNoticesTarget = bufferSettings.serverNoticesTarget();
+ _errorMsgsTarget = bufferSettings.errorMsgsTarget();
+}
projects / quassel.git / blobdiff