games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Use QSignalBlocker in launcher where applicable

Browse Source
This commit is contained in:
Ivan Savenko 2024-01-05 22:06:07 +02:00
parent 0584591e01
commit 0acf65af17
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/languages.cpp
View File

@ -86,7 +86,7 @@ QString Languages::generateLanguageName(const Languages::Options & language)
void Languages::fillLanguages(QComboBox * widget, bool includeAll) void Languages::fillLanguages(QComboBox * widget, bool includeAll)
{ {
widget->blockSignals(true); // we do not want calls caused by initialization QSignalBlocker guard(widget); // we do not want calls caused by initialization
widget->clear(); widget->clear();
std::string activeLanguage = includeAll ? std::string activeLanguage = includeAll ?
@ -115,13 +115,11 @@ void Languages::fillLanguages(QComboBox * widget, bool includeAll)
if(activeLanguage == language.identifier) if(activeLanguage == language.identifier)
widget->setCurrentIndex(widget->count() - 1); widget->setCurrentIndex(widget->count() - 1);
} }
widget->blockSignals(false);
} }
void Languages::fillLanguages(QListWidget * widget, bool includeAll) void Languages::fillLanguages(QListWidget * widget, bool includeAll)
{ {
widget->blockSignals(true); // we do not want calls caused by initialization QSignalBlocker guard(widget); // we do not want calls caused by initialization
widget->clear(); widget->clear();
std::string activeLanguage = includeAll ? std::string activeLanguage = includeAll ?
@ -154,5 +152,4 @@ void Languages::fillLanguages(QListWidget * widget, bool includeAll)
if(activeLanguage == language.identifier) if(activeLanguage == language.identifier)
widget->setCurrentRow(widget->count() - 1); widget->setCurrentRow(widget->count() - 1);
} }
widget->blockSignals(false);
} }

10
launcher/settingsView/csettingsview_moc.cpp
View File

@ -216,7 +216,8 @@ static QVector<QSize> findAvailableResolutions(int displayIndex)
void CSettingsView::fillValidResolutionsForScreen(int screenIndex) void CSettingsView::fillValidResolutionsForScreen(int screenIndex)
{ {
ui->comboBoxResolution->blockSignals(true); // avoid saving wrong resolution after adding first item from the list QSignalBlocker guard(ui->comboBoxResolution); // avoid saving wrong resolution after adding first item from the list
ui->comboBoxResolution->clear(); ui->comboBoxResolution->clear();
bool fullscreen = settings["video"]["fullscreen"].Bool(); bool fullscreen = settings["video"]["fullscreen"].Bool();
@ -243,13 +244,12 @@ void CSettingsView::fillValidResolutionsForScreen(int screenIndex)
// if selected resolution no longer exists, force update value to the largest (last) resolution // if selected resolution no longer exists, force update value to the largest (last) resolution
if(resIndex == -1) if(resIndex == -1)
ui->comboBoxResolution->setCurrentIndex(ui->comboBoxResolution->count() - 1); ui->comboBoxResolution->setCurrentIndex(ui->comboBoxResolution->count() - 1);
ui->comboBoxResolution->blockSignals(false);
} }
void CSettingsView::fillValidRenderers() void CSettingsView::fillValidRenderers()
{ {
ui->comboBoxRendererType->blockSignals(true); // avoid saving wrong resolution after adding first item from the list QSignalBlocker guard(ui->comboBoxRendererType); // avoid saving wrong renderer after adding first item from the list
ui->comboBoxRendererType->clear(); ui->comboBoxRendererType->clear();
auto driversList = getAvailableRenderingDrivers(); auto driversList = getAvailableRenderingDrivers();
@ -259,8 +259,6 @@ void CSettingsView::fillValidRenderers()
int index = ui->comboBoxRendererType->findText(QString::fromStdString(rendererName)); int index = ui->comboBoxRendererType->findText(QString::fromStdString(rendererName));
ui->comboBoxRendererType->setCurrentIndex(index); ui->comboBoxRendererType->setCurrentIndex(index);
ui->comboBoxRendererType->blockSignals(false);
} }
#else #else
void CSettingsView::fillValidResolutionsForScreen(int screenIndex) void CSettingsView::fillValidResolutionsForScreen(int screenIndex)