Add option to enable/disable displaying conflicts on collapsed separators.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 47388c96..7b854260 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -19,6 +19,11 @@ GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
 
   ui->colorTable->load(s);
 
+  // connect before setting to trigger
+  QObject::connect(ui->collapsibleSeparatorsBox, &QCheckBox::stateChanged, [=](auto&& state) {
+    ui->collapsibleSeparatorsConflictsBox->setEnabled(state == Qt::Checked);
+  });
+
   ui->centerDialogs->setChecked(settings().geometry().centerDialogs());
   ui->changeGameConfirmation->setChecked(settings().interface().showChangeGameConfirmation());
   ui->doubleClickPreviews->setChecked(settings().interface().doubleClicksOpenPreviews());
@@ -27,6 +32,7 @@ GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
   ui->checkForUpdates->setChecked(settings().checkForUpdates());
   ui->usePrereleaseBox->setChecked(settings().usePrereleases());
   ui->colorSeparatorsBox->setChecked(settings().colors().colorSeparatorScrollbar());
+  ui->collapsibleSeparatorsConflictsBox->setChecked(settings().interface().collapsibleSeparatorsConflicts());
   ui->collapsibleSeparatorsBox->setChecked(settings().interface().collapsibleSeparators());
 
   QObject::connect(ui->exploreStyles, &QPushButton::clicked, [&]{ onExploreStyles(); });
@@ -72,6 +78,7 @@ void GeneralSettingsTab::update()
   settings().setUsePrereleases(ui->usePrereleaseBox->isChecked());
   settings().colors().setColorSeparatorScrollbar(ui->colorSeparatorsBox->isChecked());
   settings().interface().setCollapsibleSeparators(ui->collapsibleSeparatorsBox->isChecked());
+  settings().interface().setCollapsibleSeparatorsConflicts(ui->collapsibleSeparatorsConflictsBox->isChecked());
 }
 
 void GeneralSettingsTab::addLanguages()