chatterino2
Code Issues

Convert remaining settings to the new settings system

Browse Source
This commit is contained in:
Rasmus Karlsson
2018-01-04 02:19:35 +01:00
parent df733282be
commit 9044700ec6
12 changed files with 27 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/settingsdialog.cpp
+6 -19
View File
@@ -422,7 +422,7 @@ QVBoxLayout *SettingsDialog::createHighlightingTab()
for (const auto &highlightProperty : highlightProperties) {
highlights->addItem(highlightProperty.key);
}
highlightUserBlacklist->setText(settings.highlightUserBlacklist.getnonConst());
highlightUserBlacklist->setText(settings.highlightUserBlacklist);
auto highlightTab = new QTabWidget();
auto customSound = new QHBoxLayout();
auto soundForm = new QFormLayout();
@@ -439,7 +439,7 @@ QVBoxLayout *SettingsDialog::createHighlightingTab()
QObject::connect(selectBtn, &QPushButton::clicked, this, [&settings, this] {
auto fileName = QFileDialog::getOpenFileName(this, tr("Open Sound"), "",
tr("Audio Files (*.mp3 *.wav)"));
settings.pathHighlightSound.set(fileName);
settings.pathHighlightSound = fileName;
});
customSound->addWidget(selectBtn);
}
@@ -617,11 +617,12 @@ QVBoxLayout *SettingsDialog::createHighlightingTab()
QStringList list =
highlightUserBlacklist->toPlainText().split("\n", QString::SkipEmptyParts);
list.removeDuplicates();
settings.highlightUserBlacklist.set(list.join("\n") + "\n");
settings.highlightUserBlacklist = list.join("\n") + "\n";
});
settings.highlightUserBlacklist.valueChanged.connect(
[=](const QString &str) { highlightUserBlacklist->setPlainText(str); });
settings.highlightUserBlacklist.connect([=](const QString &str, auto) {
highlightUserBlacklist->setPlainText(str); //
});
return layout;
}
@@ -739,20 +740,6 @@ QVBoxLayout *SettingsDialog::createTabLayout()
return layout;
}
QCheckBox *SettingsDialog::createCheckbox(const QString &title, Setting<bool> &setting)
{
auto checkbox = new QCheckBox(title);
// Set checkbox initial state
checkbox->setChecked(setting.get());
QObject::connect(checkbox, &QCheckBox::toggled, this, [&setting](bool state) {
setting.set(state); //
});
return checkbox;
}
QCheckBox *SettingsDialog::createCheckbox(const QString &title,
pajlada::Settings::Setting<bool> &setting)
{