X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;fp=src%2Fqtui%2Fchatmonitorfilter.cpp;h=676ea850888ac7ee636fee993c3863b80eeeb3fb;hp=b46dd29cce0126f7c4bf1da7bd3dbac4a1d736eb;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index b46dd29c..676ea850 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -27,143 +27,163 @@
 #include "clientignorelistmanager.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
-  : MessageFilter(model, parent)
+    : MessageFilter(model, parent)
 {
-  ChatViewSettings viewSettings(idString());
-  _showFields = viewSettings.value("ShowFields", AllFields).toInt();
-  _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
-  viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &)));
-  viewSettings.notify("ShowOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
-
-  // ChatMonitorSettingsPage
-  QString showHighlightsSettingsId = "ShowHighlights";
-  QString operationModeSettingsId = "OperationMode";
-  QString buffersSettingsId = "Buffers";
-
-  _showHighlights = viewSettings.value(showHighlightsSettingsId, false).toBool();
-  _operationMode = viewSettings.value(operationModeSettingsId, 0).toInt();
-  // read configured list of buffers to monitor/ignore
-  foreach(QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList())
+    ChatViewSettings viewSettings(idString());
+    _showFields = viewSettings.value("ShowFields", AllFields).toInt();
+    _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
+    viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &)));
+    viewSettings.notify("ShowOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
+
+    // ChatMonitorSettingsPage
+    QString showHighlightsSettingsId = "ShowHighlights";
+    QString operationModeSettingsId = "OperationMode";
+    QString buffersSettingsId = "Buffers";
+
+    _showHighlights = viewSettings.value(showHighlightsSettingsId, false).toBool();
+    _operationMode = viewSettings.value(operationModeSettingsId, 0).toInt();
+    // read configured list of buffers to monitor/ignore
+    foreach(QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList())
     _bufferIds << v.value<BufferId>();
 
-  viewSettings.notify(showHighlightsSettingsId, this, SLOT(showHighlightsSettingChanged(const QVariant &)));
-  viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingChanged(const QVariant &)));
-  viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingChanged(const QVariant &)));
+    viewSettings.notify(showHighlightsSettingsId, this, SLOT(showHighlightsSettingChanged(const QVariant &)));
+    viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingChanged(const QVariant &)));
+    viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingChanged(const QVariant &)));
 }
 
-bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
-  Q_UNUSED(sourceParent)
-
-  QModelIndex source_index = sourceModel()->index(sourceRow, 0);
-
-  Message::Flags flags = (Message::Flags)source_index.data(MessageModel::FlagsRole).toInt();
-  if(flags & Message::Backlog || (!_showOwnMessages && flags & Message::Self))
-    return false;
-
-  Message::Type type = (Message::Type)source_index.data(MessageModel::TypeRole).toInt();
-  if(!(type & (Message::Plain | Message::Notice | Message::Action)))
-    return false;
-
-  BufferId bufferId = source_index.data(MessageModel::BufferIdRole).value<BufferId>();
-
-  // ChatMonitorSettingsPage
-  if(_operationMode == ChatViewSettings::OptOut
-    && !(_showHighlights && flags & Message::Highlight)
-    &&  _bufferIds.contains(bufferId))
-    return false;
-  if(_operationMode == ChatViewSettings::OptIn
-    && !(_showHighlights && flags & Message::Highlight)
-    && !_bufferIds.contains(bufferId))
-    return false;
-
-  // ignorelist handling
-  // only match if message is not flagged as server msg
-  if(!(flags & Message::ServerMsg) && Client::ignoreListManager()
-      && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
-    return false;
-  return true;
+
+bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    Q_UNUSED(sourceParent)
+
+    QModelIndex source_index = sourceModel()->index(sourceRow, 0);
+
+    Message::Flags flags = (Message::Flags)source_index.data(MessageModel::FlagsRole).toInt();
+    if (flags & Message::Backlog || (!_showOwnMessages && flags & Message::Self))
+        return false;
+
+    Message::Type type = (Message::Type)source_index.data(MessageModel::TypeRole).toInt();
+    if (!(type & (Message::Plain | Message::Notice | Message::Action)))
+        return false;
+
+    BufferId bufferId = source_index.data(MessageModel::BufferIdRole).value<BufferId>();
+
+    // ChatMonitorSettingsPage
+    if (_operationMode == ChatViewSettings::OptOut
+        && !(_showHighlights && flags & Message::Highlight)
+        &&  _bufferIds.contains(bufferId))
+        return false;
+    if (_operationMode == ChatViewSettings::OptIn
+        && !(_showHighlights && flags & Message::Highlight)
+        && !_bufferIds.contains(bufferId))
+        return false;
+
+    // ignorelist handling
+    // only match if message is not flagged as server msg
+    if (!(flags & Message::ServerMsg) && Client::ignoreListManager()
+        && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
+        return false;
+    return true;
 }
 
+
 // override this to inject display of network and channel
-QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
-  if(index.column() != ChatLineModel::SenderColumn || role != ChatLineModel::DisplayRole)
-    return MessageFilter::data(index, role);
-
-  BufferId bufid = data(index, ChatLineModel::BufferIdRole).value<BufferId>();
-  if(!bufid.isValid()) {
-    qDebug() << "ChatMonitorFilter::data(): chatline belongs to an invalid buffer!";
-    return QVariant();
-  }
-
-  QModelIndex source_index = mapToSource(index);
-
-  QStringList fields;
-  if(_showFields & NetworkField) {
-    fields << Client::networkModel()->networkName(bufid);
-  }
-  if(_showFields & BufferField) {
-    fields << Client::networkModel()->bufferName(bufid);
-  }
-
-  Message::Type messageType = (Message::Type)source_index.data(MessageModel::TypeRole).toInt();
-  if(messageType & (Message::Plain | Message::Notice)) {
-    QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
-    fields << sender;
-  }
-  return QString("<%1>").arg(fields.join(":"));
+QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const
+{
+    if (index.column() != ChatLineModel::SenderColumn || role != ChatLineModel::DisplayRole)
+        return MessageFilter::data(index, role);
+
+    BufferId bufid = data(index, ChatLineModel::BufferIdRole).value<BufferId>();
+    if (!bufid.isValid()) {
+        qDebug() << "ChatMonitorFilter::data(): chatline belongs to an invalid buffer!";
+        return QVariant();
+    }
+
+    QModelIndex source_index = mapToSource(index);
+
+    QStringList fields;
+    if (_showFields & NetworkField) {
+        fields << Client::networkModel()->networkName(bufid);
+    }
+    if (_showFields & BufferField) {
+        fields << Client::networkModel()->bufferName(bufid);
+    }
+
+    Message::Type messageType = (Message::Type)source_index.data(MessageModel::TypeRole).toInt();
+    if (messageType & (Message::Plain | Message::Notice)) {
+        QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
+        fields << sender;
+    }
+    return QString("<%1>").arg(fields.join(":"));
 }
 
-void ChatMonitorFilter::addShowField(int field) {
-  if(_showFields & field)
-    return;
 
-  ChatViewSettings(idString()).setValue("ShowFields", _showFields | field);
+void ChatMonitorFilter::addShowField(int field)
+{
+    if (_showFields & field)
+        return;
+
+    ChatViewSettings(idString()).setValue("ShowFields", _showFields | field);
 }
 
-void ChatMonitorFilter::removeShowField(int field) {
-  if(!(_showFields & field))
-    return;
 
-  ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field);
+void ChatMonitorFilter::removeShowField(int field)
+{
+    if (!(_showFields & field))
+        return;
+
+    ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field);
 }
 
-void ChatMonitorFilter::setShowOwnMessages(bool show) {
-  if(_showOwnMessages == show)
-    return;
 
-  ChatViewSettings(idString()).setValue("ShowOwnMsgs", show);
+void ChatMonitorFilter::setShowOwnMessages(bool show)
+{
+    if (_showOwnMessages == show)
+        return;
+
+    ChatViewSettings(idString()).setValue("ShowOwnMsgs", show);
 }
 
-void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue) {
-  int newFields = newValue.toInt();
-  if(_showFields == newFields)
-    return;
 
-  _showFields = newFields;
+void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue)
+{
+    int newFields = newValue.toInt();
+    if (_showFields == newFields)
+        return;
 
-  int rows = rowCount();
-  if(rows == 0)
-    return;
+    _showFields = newFields;
 
-  emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn));
+    int rows = rowCount();
+    if (rows == 0)
+        return;
+
+    emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn));
 }
 
-void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue) {
-  _showOwnMessages = newValue.toBool();
+
+void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue)
+{
+    _showOwnMessages = newValue.toBool();
 }
 
-void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue) {
-  _showHighlights = newValue.toBool();
+
+void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue)
+{
+    _showHighlights = newValue.toBool();
 }
 
-void ChatMonitorFilter::operationModeSettingChanged(const QVariant &newValue) {
-  _operationMode = newValue.toInt();
+
+void ChatMonitorFilter::operationModeSettingChanged(const QVariant &newValue)
+{
+    _operationMode = newValue.toInt();
 }
 
-void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue) {
-  _bufferIds.clear();
-  foreach (QVariant v, newValue.toList()) {
-    _bufferIds << v.value<BufferId>();
-  }
-  invalidateFilter();
+
+void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue)
+{
+    _bufferIds.clear();
+    foreach(QVariant v, newValue.toList()) {
+        _bufferIds << v.value<BufferId>();
+    }
+    invalidateFilter();
 }