chatterino2
Code Issues

Clear up Highlight sound settings (#4194)

Browse Source 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Closes https://github.com/Chatterino/chatterino2/issues/1540
This commit is contained in:
nerix
2022-12-03 17:01:49 +01:00
committed by GitHub
parent 8d4ee72478
commit 2aa8af47e7
8 changed files with 99 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/highlights/HighlightModel.cpp
+3 -29
View File
@@ -140,10 +140,7 @@ void HighlightModel::afterInit()
redeemedRow[Column::PlaySound]->setFlags({});
redeemedRow[Column::UseRegex]->setFlags({});
redeemedRow[Column::CaseSensitive]->setFlags({});
QUrl RedeemedSound =
QUrl(getSettings()->redeemedHighlightSoundUrl.getValue());
setFilePathItem(redeemedRow[Column::SoundPath], RedeemedSound, false);
redeemedRow[Column::SoundPath]->setFlags(Qt::NoItemFlags);
auto RedeemedColor =
ColorProvider::instance().color(ColorType::RedeemedHighlight);
@@ -169,11 +166,7 @@ void HighlightModel::afterInit()
firstMessageRow[Column::PlaySound]->setFlags({});
firstMessageRow[Column::UseRegex]->setFlags({});
firstMessageRow[Column::CaseSensitive]->setFlags({});
QUrl FirstMessageSound =
QUrl(getSettings()->firstMessageHighlightSoundUrl.getValue());
setFilePathItem(firstMessageRow[Column::SoundPath], FirstMessageSound,
false);
firstMessageRow[Column::SoundPath]->setFlags(Qt::NoItemFlags);
auto FirstMessageColor =
ColorProvider::instance().color(ColorType::FirstMessageHighlight);
@@ -200,11 +193,7 @@ void HighlightModel::afterInit()
elevatedMessageRow[Column::PlaySound]->setFlags({});
elevatedMessageRow[Column::UseRegex]->setFlags({});
elevatedMessageRow[Column::CaseSensitive]->setFlags({});
QUrl elevatedMessageSound =
QUrl(getSettings()->elevatedMessageHighlightSoundUrl.getValue());
setFilePathItem(elevatedMessageRow[Column::SoundPath], elevatedMessageSound,
false);
elevatedMessageRow[Column::SoundPath]->setFlags(Qt::NoItemFlags);
auto elevatedMessageColor =
ColorProvider::instance().color(ColorType::ElevatedMessageHighlight);
@@ -416,21 +405,6 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
getSettings()->subHighlightSoundUrl.setValue(
value.toString());
}
else if (rowIndex == HighlightRowIndexes::RedeemedRow)
{
getSettings()->redeemedHighlightSoundUrl.setValue(
value.toString());
}
else if (rowIndex == HighlightRowIndexes::FirstMessageRow)
{
getSettings()->firstMessageHighlightSoundUrl.setValue(
value.toString());
}
if (rowIndex == HighlightRowIndexes::ElevatedMessageRow)
{
getSettings()->elevatedMessageHighlightSoundUrl.setValue(
value.toString());
}
else if (rowIndex == HighlightRowIndexes::ThreadMessageRow)
{
getSettings()->threadHighlightSoundUrl.setValue(