#include "networkmodel.h"
#include <QAbstractItemView>
+#include <QTextDocument> // for Qt::escape()
#include "buffermodel.h"
+#include "buffersettings.h"
#include "client.h"
-#include "signalproxy.h"
-#include "network.h"
+#include "clientsettings.h"
#include "ircchannel.h"
-
-#include "buffersettings.h"
-
-#include "util.h" // get rid of this (needed for isChannelName)
+#include "network.h"
+#include "signalproxy.h"
/*****************************************
* Network Items
// 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 {
}
}
+// FIXME shouldn't we check the bufferItemCache here?
BufferItem *NetworkItem::findBufferItem(BufferId bufferId) {
BufferItem *bufferItem = 0;
}
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;
}
_network = network;
connect(network, SIGNAL(networkNameSet(QString)),
- this, SLOT(setNetworkName(QString)));
+ this, SLOT(setNetworkName(QString)));
connect(network, SIGNAL(currentServerSet(QString)),
- this, SLOT(setCurrentServer(QString)));
+ this, SLOT(setCurrentServer(QString)));
connect(network, SIGNAL(ircChannelAdded(IrcChannel *)),
- this, SLOT(attachIrcChannel(IrcChannel *)));
+ this, SLOT(attachIrcChannel(IrcChannel *)));
connect(network, SIGNAL(ircUserAdded(IrcUser *)),
- this, SLOT(attachIrcUser(IrcUser *)));
+ this, SLOT(attachIrcUser(IrcUser *)));
connect(network, SIGNAL(connectedSet(bool)),
- this, SIGNAL(networkDataChanged()));
+ this, SIGNAL(networkDataChanged()));
connect(network, SIGNAL(destroyed()),
- this, SIGNAL(networkDataChanged()));
+ this, SIGNAL(networkDataChanged()));
emit networkDataChanged();
}
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) {
void BufferItem::clearActivityLevel() {
_activity = BufferInfo::NoActivity;
- _lastSeenMarkerMsgId = _lastSeenMsgId;
+ _firstUnreadMsgId = MsgId();
+
+ // FIXME remove with core proto v11
+ if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+ _markerLineMsgId = _lastSeenMsgId;
+ }
+
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());
+ case NetworkModel::MarkerLineMsgIdRole:
+ return qVariantFromValue(markerLineMsgId());
default:
return PropertyMapItem::data(column, role);
}
emit dataChanged(0);
}
-void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+void BufferItem::setLastSeenMsgId(MsgId msgId) {
_lastSeenMsgId = msgId;
- if(!isCurrentBuffer()) {
- _lastSeenMarkerMsgId = msgId;
+
+ // FIXME remove with core protocol v11
+ if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+ if(!isCurrentBuffer())
+ _markerLineMsgId = msgId;
}
+
setActivityLevel(BufferInfo::NoActivity);
}
+void BufferItem::setMarkerLineMsgId(MsgId msgId) {
+ _markerLineMsgId = msgId;
+ emit dataChanged();
+}
+
bool BufferItem::isCurrentBuffer() const {
return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
}
{
QString newName = value.toString();
if(!newName.isEmpty()) {
- Client::renameBuffer(bufferId(), newName);
- return true;
+ Client::renameBuffer(bufferId(), newName);
+ return true;
} else {
- return false;
+ return false;
}
}
break;
toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
if(_ircUser) {
- if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
+ if(_ircUser->userModes() != "") toolTip[0].append(QString(" (+%1)").arg(_ircUser->userModes()));
if(_ircUser->isAway()) {
toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString()));
}
: 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()));
toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
}
- BufferSettings s;
- bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+ ItemViewSettings s;
+ bool showTopic = s.displayTopicInTooltip();
if(showTopic) {
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));
}
_ircChannel = ircChannel;
connect(ircChannel, SIGNAL(topicSet(QString)),
- this, SLOT(setTopic(QString)));
+ this, SLOT(setTopic(QString)));
connect(ircChannel, SIGNAL(ircUsersJoined(QList<IrcUser *>)),
- this, SLOT(join(QList<IrcUser *>)));
+ this, SLOT(join(QList<IrcUser *>)));
connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
- this, SLOT(part(IrcUser *)));
+ this, SLOT(part(IrcUser *)));
connect(ircChannel, SIGNAL(parted()),
- this, SLOT(ircChannelParted()));
+ this, SLOT(ircChannelParted()));
connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
- this, SLOT(userModeChanged(IrcUser *)));
+ this, SLOT(userModeChanged(IrcUser *)));
connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
- this, SLOT(userModeChanged(IrcUser *)));
+ this, SLOT(userModeChanged(IrcUser *)));
connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
- this, SLOT(userModeChanged(IrcUser *)));
+ this, SLOT(userModeChanged(IrcUser *)));
if(!ircChannel->ircUsers().isEmpty())
join(ircChannel->ircUsers());
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
if(categoryItem->removeUser(ircUser)) {
if(categoryItem->childCount() == 0)
- removeChild(i);
+ removeChild(i);
break;
}
}
: TreeModel(NetworkModel::defaultHeader(), parent)
{
connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
+ this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
- this, SLOT(checkForRemovedBuffers(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() {
QList<QVariant> data;
- data << tr("Buffer") << tr("Topic") << tr("Nick Count");
+ data << tr("Chat") << tr("Topic") << tr("Nick Count");
return data;
}
return _bufferItemCache[bufferId]->lastSeenMsgId();
}
-MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) const {
+MsgId NetworkModel::markerLineMsgId(BufferId bufferId) const {
if(!_bufferItemCache.contains(bufferId))
return MsgId();
- return _bufferItemCache[bufferId]->lastSeenMarkerMsgId();
+ return _bufferItemCache[bufferId]->markerLineMsgId();
+}
+
+// FIXME we always seem to use this (expensive) non-const version
+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::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) {
+ BufferItem *bufferItem = findBufferItem(bufferId);
+ if(!bufferItem) {
+ qDebug() << "NetworkModel::setMarkerLineMsgId(): buffer is unknown:" << bufferId;
+ Client::purgeKnownBufferIds();
+ return;
+ }
+ bufferItem->setMarkerLineMsgId(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