X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspages%2Fchatmonitorsettingspage.cpp;h=8a8faf7ca2b9816fda65da9490246233b1d66c8f;hb=HEAD;hp=1690722bed7bb61da8d6c04545bdd0dc1ca7c570;hpb=b7447afe8e836376776dac26704e227a678d2913;p=quassel.git diff --git a/src/qtui/settingspages/chatmonitorsettingspage.cpp b/src/qtui/settingspages/chatmonitorsettingspage.cpp index 1690722b..592103c6 100644 --- a/src/qtui/settingspages/chatmonitorsettingspage.cpp +++ b/src/qtui/settingspages/chatmonitorsettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,18 +20,22 @@ #include "chatmonitorsettingspage.h" -#include "client.h" -#include "icon.h" -#include "networkmodel.h" -#include "bufferviewconfig.h" +#include +#include + +#include "backlogrequester.h" +#include "backlogsettings.h" #include "buffermodel.h" #include "bufferview.h" +#include "bufferviewconfig.h" #include "bufferviewfilter.h" #include "chatviewsettings.h" +#include "client.h" +#include "icon.h" +#include "networkmodel.h" +#include "util.h" -#include - -ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget *parent) +ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent) : SettingsPage(tr("Interface"), tr("Chat Monitor"), parent) { ui.setupUi(this); @@ -60,25 +64,32 @@ ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget *parent) 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.includeRead, SIGNAL(toggled(bool)), SLOT(widgetHasChanged())); + connect(ui.operationMode, selectOverload(&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); + + // AsNeededBacklogRequester conflicts with showing backlog in Chat Monitor + BacklogSettings backlogSettings; + backlogSettings.initAndNotify("RequesterType", this, &ChatMonitorSettingsPage::setRequesterType, BacklogRequester::AsNeeded); } - 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; @@ -87,7 +98,6 @@ void ChatMonitorSettingsPage::defaults() widgetHasChanged(); } - void ChatMonitorSettingsPage::load() { if (settings.contains("Default")) @@ -99,6 +109,7 @@ void ChatMonitorSettingsPage::load() 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()); @@ -108,36 +119,37 @@ void ChatMonitorSettingsPage::load() if (!settings["Buffers"].toList().isEmpty()) { QList bufferIdsFromConfig; // remove all active buffers from the available config - foreach(QVariant v, settings["Buffers"].toList()) { + foreach (QVariant v, settings["Buffers"].toList()) { bufferIdsFromConfig << v.value(); allBufferIds.removeAll(v.value()); } 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", true); + settings["IncludeRead"] = chatViewSettings.value("IncludeRead", false); } - void ChatMonitorSettingsPage::save() { ChatViewSettings chatViewSettings("ChatMonitor"); @@ -145,13 +157,14 @@ void ChatMonitorSettingsPage::save() 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(id); + foreach (BufferId id, _configActive->bufferList()) { + saveableBufferIdList << QVariant::fromValue(id); } chatViewSettings.setValue("Buffers", saveableBufferIdList); @@ -159,14 +172,13 @@ void ChatMonitorSettingsPage::save() 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) @@ -175,6 +187,8 @@ bool ChatMonitorSettingsPage::testHasChanged() 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()) @@ -183,29 +197,28 @@ bool ChatMonitorSettingsPage::testHasChanged() if (_configActive->bufferList().count() != settings["Buffers"].toList().count()) return true; - QSet uiBufs = _configActive->bufferList().toSet(); + QSet uiBufs = toQSet(_configActive->bufferList()); QSet settingsBufs; - foreach(QVariant v, settings["Buffers"].toList()) - settingsBufs << v.value(); + foreach (QVariant v, settings["Buffers"].toList()) + settingsBufs << v.value(); 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 > selectedBuffers; - foreach(QModelIndex index, inView->selectionModel()->selectedIndexes()) { + QMap> selectedBuffers; + foreach (QModelIndex index, inView->selectionModel()->selectedIndexes()) { BufferId inBufferId = index.data(NetworkModel::BufferIdRole).value(); if (index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) { // TODO: @@ -225,12 +238,12 @@ void ChatMonitorSettingsPage::toggleBuffers(BufferView *inView, BufferViewConfig This can probably be removed whenever BufferViewConfig::bulkAdd or something like that is available. */ - qobject_cast(outView->model())->setConfig(0); - qobject_cast(inView->model())->setConfig(0); + qobject_cast(outView->model())->setConfig(nullptr); + qobject_cast(inView->model())->setConfig(nullptr); // actually move the ids - foreach(QList list, selectedBuffers) { - foreach(BufferId buffer, list) { + foreach (QList list, selectedBuffers) { + foreach (BufferId buffer, list) { outCfg->addBuffer(buffer, 0); inCfg->removeBuffer(buffer); } @@ -242,7 +255,6 @@ void ChatMonitorSettingsPage::toggleBuffers(BufferView *inView, BufferViewConfig widgetHasChanged(); } - void ChatMonitorSettingsPage::on_activateBuffer_clicked() { if (ui.availableBuffers->currentIndex().isValid() && ui.availableBuffers->selectionModel()->hasSelection()) { @@ -251,7 +263,6 @@ void ChatMonitorSettingsPage::on_activateBuffer_clicked() } } - void ChatMonitorSettingsPage::on_deactivateBuffer_clicked() { if (ui.activeBuffers->currentIndex().isValid() && ui.activeBuffers->selectionModel()->hasSelection()) { @@ -260,14 +271,13 @@ void ChatMonitorSettingsPage::on_deactivateBuffer_clicked() } } - /* 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:")); } @@ -276,3 +286,34 @@ void ChatMonitorSettingsPage::switchOperationMode(int idx) } widgetHasChanged(); } + +void ChatMonitorSettingsPage::setRequesterType(const QVariant& v) +{ + bool usingAsNeededRequester = (v.toInt() == BacklogRequester::AsNeeded); + ui.showBacklogUnavailableDetails->setVisible(usingAsNeededRequester); + if (usingAsNeededRequester) { + ui.showBacklog->setText(tr("Show messages from backlog (not available)")); + } + else { + ui.showBacklog->setText(tr("Show messages from backlog")); + } +} + +void ChatMonitorSettingsPage::on_showBacklogUnavailableDetails_clicked() +{ + // Explain that backlog fetching is disabled, so backlog messages won't show up + // + // Technically, backlog messages *will* show up once fetched, e.g. after clicking on a buffer. + // This might be too trivial of a detail to warrant explaining, though. + QMessageBox::information(this, + tr("Messages from backlog are not fetched"), + QString("

%1

%2

") + .arg(tr("No initial backlog will be fetched when using the backlog request method of %1.") + .arg(tr("Only fetch when needed").replace(" ", " ")), + tr("Configure this in the %1 settings page.") + .arg(tr("Backlog Fetching").replace(" ", " ")) + ) + ); + // Re-use translations of "Only fetch when needed" and "Backlog Fetching" as this is a + // word-for-word reference, forcing all spaces to be non-breaking +}