/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "ircchannel.h"
#include "network.h"
#include "signalproxy.h"
+#include "buffersyncer.h"
/*****************************************
* Network Items
QString NetworkItem::escapeHTML(const QString &string, bool useNonbreakingSpaces)
{
- // QString.replace() doesn't guarentee the source string will remain constant.
+ // QString.replace() doesn't guarantee the source string will remain constant.
// Use a local variable to avoid compiler errors.
#if QT_VERSION < 0x050000
QString formattedString = Qt::escape(string);
break;
}
+ BufferSyncer *bufferSyncer = Client::bufferSyncer();
+ if (bufferSyncer) {
+ bufferItem->addActivity(
+ bufferSyncer->activity(bufferItem->bufferId()),
+ bufferSyncer->highlightCount(bufferItem->bufferId()) > 0
+ );
+ }
+
return bufferItem;
}
Q_UNUSED(column);
QString strTooltip;
QTextStream tooltip( &strTooltip, QIODevice::WriteOnly );
- tooltip << "<qt><style>.bold { font-weight: bold; }</style>";
+ tooltip << "<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; }</style>";
// Function to add a row to the tooltip table
auto addRow = [&](const QString& key, const QString& value, bool condition) {
};
tooltip << "<p class='bold' align='center'>" << NetworkItem::escapeHTML(networkName(), true) << "</p>";
- tooltip << "<table cellspacing='5' cellpadding='0'>";
- addRow(tr("Server"), NetworkItem::escapeHTML(currentServer(), true), true);
-
- addRow(tr("Users"), QString::number(nickCount()), true);
-
- if (_network)
- addRow(tr("Lag"), NetworkItem::escapeHTML(tr("%1 msecs").arg(_network->latency()), true), true);
+ if (isActive()) {
+ tooltip << "<table cellspacing='5' cellpadding='0'>";
+ addRow(tr("Server"), NetworkItem::escapeHTML(currentServer(), true), !currentServer().isEmpty());
+ addRow(tr("Users"), QString::number(nickCount()), true);
+ if (_network)
+ addRow(tr("Lag"), NetworkItem::escapeHTML(tr("%1 msecs").arg(_network->latency()), true), true);
- tooltip << "</table></qt>";
+ tooltip << "</table>";
+ } else {
+ tooltip << "<p class='italic' align='center'>" << tr("Not connected") << "</p>";
+ }
+ tooltip << "</qt>";
return strTooltip;
}
void BufferItem::clearActivityLevel()
{
- _activity = BufferInfo::NoActivity;
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::BufferActivitySync)) {
+ // If the core handles activity sync, clear only the highlight flag
+ _activity &= ~BufferInfo::Highlight;
+ } else {
+ _activity = BufferInfo::NoActivity;
+ }
_firstUnreadMsgId = MsgId();
// FIXME remove with core proto v11
- if (!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+ if (!Client::isCoreFeatureEnabled(Quassel::Feature::SynchronizedMarkerLine)) {
_markerLineMsgId = _lastSeenMsgId;
}
void BufferItem::updateActivityLevel(const Message &msg)
{
+ // If the core handles activity, and this message is not a highlight, ignore this
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::BufferActivitySync) && !msg.flags().testFlag(Message::Highlight)) {
+ return;
+ }
+
if (isCurrentBuffer()) {
return;
}
_firstUnreadMsgId = msg.msgId();
}
+ Message::Types type;
+ // If the core handles activities, ignore types
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::BufferActivitySync)) {
+ type = Message::Types();
+ } else {
+ type = msg.type();
+ }
+
+ if (addActivity(type, msg.flags().testFlag(Message::Highlight)) || stateChanged) {
+ emit dataChanged();
+ }
+}
+
+void BufferItem::setActivity(Message::Types type, bool highlight) {
BufferInfo::ActivityLevel oldLevel = activityLevel();
- _activity |= BufferInfo::OtherActivity;
- if (msg.type() & (Message::Plain | Message::Notice | Message::Action))
+ _activity &= BufferInfo::Highlight;
+ addActivity(type, highlight);
+
+ if (_activity != oldLevel) {
+ emit dataChanged();
+ }
+}
+
+bool BufferItem::addActivity(Message::Types type, bool highlight) {
+ auto oldActivity = activityLevel();
+
+ if (type != Message::Types())
+ _activity |= BufferInfo::OtherActivity;
+
+ if (type.testFlag(Message::Plain) || type.testFlag(Message::Notice) || type.testFlag(Message::Action))
_activity |= BufferInfo::NewMessage;
- if (msg.flags() & Message::Highlight)
+ if (highlight)
_activity |= BufferInfo::Highlight;
- stateChanged |= (oldLevel != _activity);
-
- if (stateChanged)
- emit dataChanged();
+ return oldActivity != _activity;
}
_lastSeenMsgId = msgId;
// FIXME remove with core protocol v11
- if (!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+ if (!Client::isCoreFeatureEnabled(Quassel::Feature::SynchronizedMarkerLine)) {
if (!isCurrentBuffer())
_markerLineMsgId = msgId;
}
Q_UNUSED(column);
QString strTooltip;
QTextStream tooltip( &strTooltip, QIODevice::WriteOnly );
- tooltip << "<qt><style>.bold { font-weight: bold; }</style>"
- << "<style>.italic { font-style: italic; }</style>";
+ tooltip << "<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; }</style>";
// Keep track of whether or not information has been added
bool infoAdded = false;
tooltip << "<table cellspacing='5' cellpadding='0'>";
if (_ircUser->isAway()) {
- QString awayMessage(tr("(unknown)"));
- if(!_ircUser->awayMessage().isEmpty()) {
- awayMessage = _ircUser->awayMessage();
+ QString awayMessageHTML = QString("<p class='italic'>%1</p>").arg(tr("Unknown"));
+
+ // If away message is known, replace with the escaped message.
+ if (!_ircUser->awayMessage().isEmpty()) {
+ awayMessageHTML = NetworkItem::escapeHTML(_ircUser->awayMessage());
}
- addRow(NetworkItem::escapeHTML(tr("Away message"), true), NetworkItem::escapeHTML(awayMessage), true);
+ addRow(NetworkItem::escapeHTML(tr("Away message"), true), awayMessageHTML, true);
}
addRow(tr("Realname"),
NetworkItem::escapeHTML(_ircUser->realName()),
// If no further information found, offer an explanatory message
if (!infoAdded)
- tooltip << "<p class='italic'>" << tr("No information available") << "</p>";
+ tooltip << "<p class='italic' align='center'>" << tr("No information available") << "</p>";
tooltip << "</qt>";
return strTooltip;
void QueryBufferItem::removeIrcUser()
{
- _ircUser = 0;
- emit dataChanged();
+ if (_ircUser) {
+ // Disconnect the active IrcUser before removing it, otherwise it will fire removeIrcUser()
+ // a second time when the object's destroyed due to QueryBufferItem::setIrcUser() connecting
+ // SIGNAL destroyed(QObject*) to SLOT removeIrcUser().
+ // This fixes removing an active IrcUser if the user had quit then rejoined in a nonstandard
+ // manner (e.g. updateNickFromHost calling newIrcUser, triggered by an away-notify message).
+ disconnect(_ircUser, 0, this, 0);
+
+ // Clear IrcUser (only set to 0 if not already 0)
+ _ircUser = 0;
+
+ // Only emit dataChanged() if data actually changed. This might serve as a small
+ // optimization, but it can be moved outside the if statement if other behavior depends on
+ // it always being called.
+ emit dataChanged();
+ }
}
: BufferItem(bufferInfo, parent),
_ircChannel(0)
{
+ setFlags(flags() | Qt::ItemIsDropEnabled);
}
Q_UNUSED(column);
QString strTooltip;
QTextStream tooltip( &strTooltip, QIODevice::WriteOnly );
- tooltip << "<qt><style>.bold { font-weight: bold; }</style>"
- << "<qt><style>.italic { font-style: italic; }</style>";
+ tooltip << "<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; }</style>";
// Function to add a row to the tooltip table
auto addRow = [&](const QString& key, const QString& value, bool condition) {
tooltip << "</table>";
} else {
- tooltip << "<p class='italic'>" << tr("Not active, double-click to join") << "</p>";
+ tooltip << "<p class='italic' align='center'>" << tr("Not active, double-click to join") << "</p>";
}
tooltip << "</qt>";
Q_UNUSED(column);
QString strTooltip;
QTextStream tooltip( &strTooltip, QIODevice::WriteOnly );
- tooltip << "<qt><style>.bold { font-weight: bold; }</style>"
- << "<style>.italic { font-style: italic; }</style>";
+ tooltip << "<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; }</style>";
// Keep track of whether or not information has been added
bool infoAdded = false;
NetworkItem::escapeHTML(channelModes()),
!channelModes().isEmpty());
if (_ircUser->isAway()) {
- QString awayMessage(tr("(unknown)"));
- if(!_ircUser->awayMessage().isEmpty()) {
- awayMessage = _ircUser->awayMessage();
+ QString awayMessageHTML = QString("<p class='italic'>%1</p>").arg(tr("Unknown"));
+
+ // If away message is known, replace with the escaped message.
+ if (!_ircUser->awayMessage().isEmpty()) {
+ awayMessageHTML = NetworkItem::escapeHTML(_ircUser->awayMessage());
}
- addRow(NetworkItem::escapeHTML(tr("Away message"), true), NetworkItem::escapeHTML(awayMessage), true);
+ addRow(NetworkItem::escapeHTML(tr("Away message"), true), awayMessageHTML, true);
}
addRow(tr("Realname"),
NetworkItem::escapeHTML(_ircUser->realName()),
// If no further information found, offer an explanatory message
if (!infoAdded)
- tooltip << "<p class='italic'>" << tr("No information available") << "</p>";
+ tooltip << "<p class='italic' align='center'>" << tr("No information available") << "</p>";
tooltip << "</qt>";
return strTooltip;
_serverNoticesTarget = bufferSettings.serverNoticesTarget();
_errorMsgsTarget = bufferSettings.errorMsgsTarget();
}
+
+void NetworkModel::bufferActivityChanged(BufferId bufferId, const Message::Types activity) {
+ auto _bufferItem = findBufferItem(bufferId);
+ if (!_bufferItem) {
+ qDebug() << "NetworkModel::bufferActivityChanged(): buffer is unknown:" << bufferId;
+ return;
+ }
+ auto hiddenTypes = BufferSettings(bufferId).messageFilter();
+ auto visibleTypes = ~hiddenTypes;
+ auto activityVisibleTypesIntersection = activity & visibleTypes;
+ _bufferItem->setActivity(activityVisibleTypesIntersection, false);
+}
+
+void NetworkModel::highlightCountChanged(BufferId bufferId, int count) {
+ auto _bufferItem = findBufferItem(bufferId);
+ if (!_bufferItem) {
+ qDebug() << "NetworkModel::highlightCountChanged(): buffer is unknown:" << bufferId;
+ return;
+ }
+ _bufferItem->addActivity(Message::Types{}, count > 0);
+}