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/accountpopup.cpp
+5 -6
View File
@@ -95,18 +95,18 @@ AccountPopupWidget::AccountPopupWidget(std::shared_ptr<Channel> _channel)
});
QObject::connect(this->ui->disableHighlights, &QPushButton::clicked, this, [=, &settings]() {
QString str = settings.highlightUserBlacklist.getnonConst();
QString str = settings.highlightUserBlacklist;
str.append(this->ui->lblUsername->text() + "\n");
settings.highlightUserBlacklist.set(str);
settings.highlightUserBlacklist = str;
this->ui->disableHighlights->hide();
this->ui->enableHighlights->show();
});
QObject::connect(this->ui->enableHighlights, &QPushButton::clicked, this, [=, &settings]() {
QString str = settings.highlightUserBlacklist.getnonConst();
QString str = settings.highlightUserBlacklist;
QStringList list = str.split("\n");
list.removeAll(this->ui->lblUsername->text());
settings.highlightUserBlacklist.set(list.join("\n"));
settings.highlightUserBlacklist = list.join("\n");
this->ui->enableHighlights->hide();
this->ui->disableHighlights->show();
});
@@ -267,8 +267,7 @@ void AccountPopupWidget::showEvent(QShowEvent *)
this->updateButtons(this->ui->ownerLayout, false);
}
QString blacklisted =
singletons::SettingManager::getInstance().highlightUserBlacklist.getnonConst();
QString blacklisted = singletons::SettingManager::getInstance().highlightUserBlacklist;
QStringList list = blacklisted.split("\n", QString::SkipEmptyParts);
if (list.contains(this->ui->lblUsername->text(), Qt::CaseInsensitive)) {
this->ui->disableHighlights->hide();