#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
}
}
+// 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
+ // postprocess... this is necessary because Qt doesn't seem to like adding children which already have children on their own
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
_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();
}
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();
}
stateChanged = true;
_firstUnreadMsgId = msg.msgId();
}
-
+
BufferInfo::ActivityLevel oldLevel = activityLevel();
_activity |= BufferInfo::OtherActivity;
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()));
}
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 = Qt::escape(_topic);
+ _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;
}
}
QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
if(_ircUser->isAway()) {
- toolTip[0].append(" is away");
+ toolTip[0].append(tr(" is away"));
if(!_ircUser->awayMessage().isEmpty())
toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
}
: 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()));
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) {
return;
}
bufferItem->setLastSeenMsgId(msgId);
+ emit lastSeenMsgSet(bufferId, 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);
+ emit markerLineSet(bufferId, msgId);
}
void NetworkModel::updateBufferActivity(Message &msg) {
if(bufferType(msg.bufferId()) != BufferInfo::ChannelBuffer) {
msg.setFlags(msg.flags() | Message::Redirected);
if(msg.flags() & Message::ServerMsg) {
- // server notice
- redirectionTarget = _serverNoticesTarget;
+ // server notice
+ redirectionTarget = _serverNoticesTarget;
} else {
- redirectionTarget = _userNoticesTarget;
+ redirectionTarget = _userNoticesTarget;
}
}
break;
if(redirectionTarget & BufferSettings::StatusBuffer) {
const NetworkItem *netItem = findNetworkItem(msg.bufferInfo().networkId());
if(netItem) {
- updateBufferActivity(netItem->statusBufferItem(), msg);
+ updateBufferActivity(netItem->statusBufferItem(), msg);
}
}
} else {
bufferItem->updateActivityLevel(msg);
if(bufferItem->isCurrentBuffer())
- emit setLastSeenMsg(bufferItem->bufferId(), msg.msgId());
+ emit requestSetLastSeenMsg(bufferItem->bufferId(), msg.msgId());
}
void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {