/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2019 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "chatmonitorsettingspage.h"
-#include "client.h"
-#include "networkmodel.h"
-#include "bufferviewconfig.h"
+#include <QVariant>
+
#include "buffermodel.h"
#include "bufferview.h"
+#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
-#include "iconloader.h"
#include "chatviewsettings.h"
+#include "client.h"
+#include "icon.h"
+#include "networkmodel.h"
+#include "util.h"
-#include <QVariant>
-
-ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget *parent)
+ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent)
: SettingsPage(tr("Interface"), tr("Chat Monitor"), parent)
{
ui.setupUi(this);
- ui.activateBuffer->setIcon(SmallIcon("go-next"));
- ui.deactivateBuffer->setIcon(SmallIcon("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);
ui.operationMode->addItem(tr("Opt Out"), ChatViewSettings::OptOut);
// connect slots
- 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.showBacklog, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+ connect(ui.operationMode, selectOverload<int>(&QComboBox::currentIndexChanged), this, &ChatMonitorSettingsPage::switchOperationMode);
+ connect(ui.showHighlights, &QAbstractButton::toggled, this, &ChatMonitorSettingsPage::widgetHasChanged);
+ connect(ui.showOwnMessages, &QAbstractButton::toggled, this, &ChatMonitorSettingsPage::widgetHasChanged);
+ connect(ui.alwaysOwn, &QAbstractButton::toggled, this, &ChatMonitorSettingsPage::widgetHasChanged);
+ connect(ui.showBacklog, &QAbstractButton::toggled, this, &ChatMonitorSettingsPage::widgetHasChanged);
+ connect(ui.includeRead, &QAbstractButton::toggled, this, &ChatMonitorSettingsPage::widgetHasChanged);
}
-
bool ChatMonitorSettingsPage::hasDefaults() const
{
return true;
}
-
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;
+ settings["IncludeRead"] = false;
load();
widgetHasChanged();
}
-
void ChatMonitorSettingsPage::load()
{
if (settings.contains("Default"))
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());
// get all available buffer Ids
QList<BufferId> allBufferIds = Client::networkModel()->allBufferIds();
if (!settings["Buffers"].toList().isEmpty()) {
QList<BufferId> bufferIdsFromConfig;
// remove all active buffers from the available config
- foreach(QVariant v, settings["Buffers"].toList()) {
+ foreach (QVariant v, settings["Buffers"].toList()) {
bufferIdsFromConfig << v.value<BufferId>();
allBufferIds.removeAll(v.value<BufferId>());
}
Client::networkModel()->sortBufferIds(bufferIdsFromConfig);
- _configActive->initSetBufferList(bufferIdsFromConfig);
+ _configActive->setBufferList(bufferIdsFromConfig);
}
ui.activeBuffers->setFilteredModel(Client::bufferModel(), _configActive);
Client::networkModel()->sortBufferIds(allBufferIds);
- _configAvailable->initSetBufferList(allBufferIds);
+ _configAvailable->setBufferList(allBufferIds);
ui.availableBuffers->setFilteredModel(Client::bufferModel(), _configAvailable);
setChangedState(false);
}
-
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", false);
}
-
void ChatMonitorSettingsPage::save()
{
ChatViewSettings chatViewSettings("ChatMonitor");
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());
// save list of active buffers
QVariantList saveableBufferIdList;
- foreach(BufferId id, _configActive->bufferList()) {
- saveableBufferIdList << QVariant::fromValue<BufferId>(id);
+ foreach (BufferId id, _configActive->bufferList()) {
+ saveableBufferIdList << QVariant::fromValue(id);
}
chatViewSettings.setValue("Buffers", saveableBufferIdList);
setChangedState(false);
}
-
void ChatMonitorSettingsPage::widgetHasChanged()
{
bool changed = testHasChanged();
- if (changed != hasChanged()) setChangedState(changed);
+ if (changed != hasChanged())
+ setChangedState(changed);
}
-
bool ChatMonitorSettingsPage::testHasChanged()
{
if (settings["OperationMode"].toInt() != ui.operationMode->currentIndex() + 1)
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())
+ return true;
if (_configActive->bufferList().count() != settings["Buffers"].toList().count())
return true;
- QSet<BufferId> uiBufs = _configActive->bufferList().toSet();
+ QSet<BufferId> uiBufs = toQSet(_configActive->bufferList());
QSet<BufferId> settingsBufs;
- foreach(QVariant v, settings["Buffers"].toList())
- settingsBufs << v.value<BufferId>();
+ foreach (QVariant v, settings["Buffers"].toList())
+ settingsBufs << v.value<BufferId>();
if (uiBufs != settingsBufs)
return true;
return false;
}
-
-//TODO: - support drag 'n drop
+// TODO: - support drag 'n drop
// - adding of complete networks(?)
/*
toggleBuffers takes each a bufferView and its config for "input" and "output".
Any selected item will be moved over from the input to the output bufferview.
*/
-void ChatMonitorSettingsPage::toggleBuffers(BufferView *inView, BufferViewConfig *inCfg, BufferView *outView, BufferViewConfig *outCfg)
+void ChatMonitorSettingsPage::toggleBuffers(BufferView* inView, BufferViewConfig* inCfg, BufferView* outView, BufferViewConfig* outCfg)
{
// Fill QMap with selected items ordered by selection row
- QMap<int, QList<BufferId> > selectedBuffers;
- foreach(QModelIndex index, inView->selectionModel()->selectedIndexes()) {
+ QMap<int, QList<BufferId>> selectedBuffers;
+ foreach (QModelIndex index, inView->selectionModel()->selectedIndexes()) {
BufferId inBufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
if (index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) {
// TODO:
This can probably be removed whenever BufferViewConfig::bulkAdd or something
like that is available.
*/
- qobject_cast<BufferViewFilter *>(outView->model())->setConfig(0);
- qobject_cast<BufferViewFilter *>(inView->model())->setConfig(0);
+ qobject_cast<BufferViewFilter*>(outView->model())->setConfig(nullptr);
+ qobject_cast<BufferViewFilter*>(inView->model())->setConfig(nullptr);
// actually move the ids
- foreach(QList<BufferId> list, selectedBuffers) {
- foreach(BufferId buffer, list) {
+ foreach (QList<BufferId> list, selectedBuffers) {
+ foreach (BufferId buffer, list) {
outCfg->addBuffer(buffer, 0);
inCfg->removeBuffer(buffer);
}
widgetHasChanged();
}
-
void ChatMonitorSettingsPage::on_activateBuffer_clicked()
{
if (ui.availableBuffers->currentIndex().isValid() && ui.availableBuffers->selectionModel()->hasSelection()) {
}
}
-
void ChatMonitorSettingsPage::on_deactivateBuffer_clicked()
{
if (ui.activeBuffers->currentIndex().isValid() && ui.activeBuffers->selectionModel()->hasSelection()) {
}
}
-
/*
switchOperationMode gets called on combobox signal currentIndexChanged.
modeIndex is the row id in combobox itemlist
*/
void ChatMonitorSettingsPage::switchOperationMode(int idx)
{
- ChatViewSettings::OperationMode mode = (ChatViewSettings::OperationMode)(idx + 1);
+ auto mode = (ChatViewSettings::OperationMode)(idx + 1);
if (mode == ChatViewSettings::OptIn) {
ui.labelActiveBuffers->setText(tr("Show:"));
}
projects / quassel.git / blobdiff