#include "client.h"
#include "chatlinemodel.h"
#include "networkmodel.h"
+#include "chatviewsettings.h"
ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
: MessageFilter(model, parent)
{
- QtUiSettings qtUiSettings;
- QString showFieldSettingId = QString("ChatView/%1/showFields").arg(idString());
- QString showOwnMessagesSettingId = QString("ChatView/%1/showOwnMsgs").arg(idString());
-
- _showFields = qtUiSettings.value(showFieldSettingId, AllFields).toInt();
- _showOwnMessages = qtUiSettings.value(showOwnMessagesSettingId, true).toBool();
- qtUiSettings.notify(showFieldSettingId, this, SLOT(showFieldsSettingsChanged(const QVariant &)));
- qtUiSettings.notify(showOwnMessagesSettingId, this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
+ ChatViewSettings viewSettings(idString());
+ _showFields = viewSettings.value("showFields", AllFields).toInt();
+ _showOwnMessages = viewSettings.value("showOwnMsgs", true).toBool();
+ viewSettings.notify("showFields", this, SLOT(showFieldsSettingsChanged(const QVariant &)));
+ viewSettings.notify("showOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
}
bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
Message::Type messageType = (Message::Type)sourceModel()->data(source_index, MessageModel::TypeRole).toInt();
if(messageType & (Message::Plain | Message::Notice)) {
- QString sender = MessageFilter::data(index, role).toString();
- // we have to strip leading and traling < / >
- fields << sender.mid(1, sender.count() - 2);
+ QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
+ fields << sender;
}
return QString("<%1>").arg(fields.join(":"));
}
if(_showFields & field)
return;
- QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields | field);
+ ChatViewSettings(idString()).setValue("showFields", _showFields | field);
}
void ChatMonitorFilter::removeShowField(int field) {
if(!(_showFields & field))
return;
- QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields ^ field);
+ ChatViewSettings(idString()).setValue("showFields", _showFields ^ field);
}
void ChatMonitorFilter::setShowOwnMessages(bool show) {
if(_showOwnMessages == show)
return;
- QtUiSettings().setValue(QString("ChatView/%1/showOwnMsgs").arg(idString()), show);
+ ChatViewSettings(idString()).setValue("showOwnMsgs", show);
}
void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {