/***************************************************************************
- * Copyright (C) 2005-2015 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 "chatmonitorsettingspage.h"
-#include <QIcon>
-
#include "client.h"
+#include "icon.h"
#include "networkmodel.h"
#include "bufferviewconfig.h"
#include "buffermodel.h"
{
ui.setupUi(this);
- ui.activateBuffer->setIcon(QIcon::fromTheme("go-next"));
- ui.deactivateBuffer->setIcon(QIcon::fromTheme("go-previous"));
+ ui.activateBuffer->setIcon(icon::get("go-next"));
+ ui.deactivateBuffer->setIcon(icon::get("go-previous"));
// setup available buffers config (for the bufferview on the left)
_configAvailable = new BufferViewConfig(-667, this);
connect(ui.operationMode, SIGNAL(currentIndexChanged(int)), SLOT(switchOperationMode(int)));
connect(ui.showHighlights, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
connect(ui.showOwnMessages, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+ connect(ui.alwaysOwn, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
connect(ui.showBacklog, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
connect(ui.includeRead, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
}
void ChatMonitorSettingsPage::defaults()
{
+ // NOTE: Whenever changing defaults here, also update ChatMonitorFilter::ChatMonitorFilter()
+ // and ChatMonitorSettingsPage::loadSettings() to match
+
settings["OperationMode"] = ChatViewSettings::OptOut;
settings["ShowHighlights"] = false;
- settings["ShowOwnMsgs"] = false;
+ settings["ShowOwnMsgs"] = true;
+ settings["AlwaysOwn"] = false;
settings["Buffers"] = QVariant();
settings["Default"] = true;
settings["ShowBacklog"] = true;
ui.operationMode->setCurrentIndex(settings["OperationMode"].toInt() - 1);
ui.showHighlights->setChecked(settings["ShowHighlights"].toBool());
ui.showOwnMessages->setChecked(settings["ShowOwnMsgs"].toBool());
+ ui.alwaysOwn->setChecked(settings["AlwaysOwn"].toBool());
ui.showBacklog->setChecked(settings["ShowBacklog"].toBool());
ui.includeRead->setChecked(settings["IncludeRead"].toBool());
void ChatMonitorSettingsPage::loadSettings()
{
+ // NOTE: Whenever changing defaults here, also update ChatMonitorFilter::ChatMonitorFilter()
+ // and ChatMonitorSettingsPage::defaults() to match
ChatViewSettings chatViewSettings("ChatMonitor");
- settings["OperationMode"] = (ChatViewSettings::OperationMode)chatViewSettings.value("OperationMode", ChatViewSettings::OptOut).toInt();
+ settings["OperationMode"] = (ChatViewSettings::OperationMode)
+ chatViewSettings.value("OperationMode", ChatViewSettings::OptOut).toInt();
settings["ShowHighlights"] = chatViewSettings.value("ShowHighlights", false);
- settings["ShowOwnMsgs"] = chatViewSettings.value("ShowOwnMsgs", false);
+ settings["ShowOwnMsgs"] = chatViewSettings.value("ShowOwnMsgs", true);
+ settings["AlwaysOwn"] = chatViewSettings.value("AlwaysOwn", false);
settings["Buffers"] = chatViewSettings.value("Buffers", QVariantList());
settings["ShowBacklog"] = chatViewSettings.value("ShowBacklog", true);
- settings["IncludeRead"] = chatViewSettings.value("IncludeRead", true);
+ settings["IncludeRead"] = chatViewSettings.value("IncludeRead", false);
}
chatViewSettings.setValue("OperationMode", ui.operationMode->currentIndex() + 1);
chatViewSettings.setValue("ShowHighlights", ui.showHighlights->isChecked());
chatViewSettings.setValue("ShowOwnMsgs", ui.showOwnMessages->isChecked());
+ chatViewSettings.setValue("AlwaysOwn", ui.alwaysOwn->isChecked());
chatViewSettings.setValue("ShowBacklog", ui.showBacklog->isChecked());
chatViewSettings.setValue("IncludeRead", ui.includeRead->isChecked());
return true;
if (settings["ShowOwnMsgs"].toBool() != ui.showOwnMessages->isChecked())
return true;
+ if (settings["AlwaysOwn"].toBool() != ui.alwaysOwn->isChecked())
+ return true;
if (settings["ShowBacklog"].toBool() != ui.showBacklog->isChecked())
return true;
if (settings["IncludeRead"].toBool() != ui.includeRead->isChecked())