Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix options combobox behavior (#918)

Browse Source 
the combobox text, instead of data, was being saved to config
This commit is contained in:
lambdcalculus 2023-08-21 20:06:30 -03:00 committed by GitHub
parent a962ba08ba
commit 98682ae13f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/text_file_functions.cpp
View File

@ -153,7 +153,7 @@ Qt::TransformationMode AOApplication::get_scaling(QString p_scaling)
if (p_scaling.isEmpty()) if (p_scaling.isEmpty())
p_scaling = Options::getInstance().defaultScalingMode(); p_scaling = Options::getInstance().defaultScalingMode();
if (p_scaling == "Smooth") if (p_scaling == "smooth")
return Qt::SmoothTransformation; return Qt::SmoothTransformation;
return Qt::FastTransformation; return Qt::FastTransformation;
} }

14
src/widgets/aooptionsdialog.cpp
View File

@ -40,7 +40,7 @@ void AOOptionsDialog::populateAudioDevices()
BASS_DEVICEINFO info; BASS_DEVICEINFO info;
for (int a = 0; BASS_GetDeviceInfo(a, &info); a++) { for (int a = 0; BASS_GetDeviceInfo(a, &info); a++) {
ui_audio_device_combobox->addItem(info.name); ui_audio_device_combobox->addItem(info.name, info.name);
} }
} }
@ -116,7 +116,7 @@ void AOOptionsDialog::setWidgetData(QComboBox *widget, const QString &value)
template <> QString AOOptionsDialog::widgetData(QComboBox *widget) const template <> QString AOOptionsDialog::widgetData(QComboBox *widget) const
{ {
return widget->currentText(); return widget->currentData().toString();
} }
template <> template <>
@ -185,7 +185,7 @@ void AOOptionsDialog::updateValues()
for (const QString &l_theme : qAsConst(l_themes)) { for (const QString &l_theme : qAsConst(l_themes)) {
if (!themes.contains(l_theme)) { if (!themes.contains(l_theme)) {
ui_theme_combobox->addItem(l_theme); ui_theme_combobox->addItem(l_theme, l_theme);
themes.insert(l_theme); themes.insert(l_theme);
} }
} }
@ -197,7 +197,7 @@ void AOOptionsDialog::updateValues()
for (const QString &l_subtheme : qAsConst(l_subthemes)) { for (const QString &l_subtheme : qAsConst(l_subthemes)) {
if (l_subtheme.toLower() != "server" && l_subtheme.toLower() != "default" && if (l_subtheme.toLower() != "server" && l_subtheme.toLower() != "default" &&
l_subtheme.toLower() != "effects" && l_subtheme.toLower() != "misc") { l_subtheme.toLower() != "effects" && l_subtheme.toLower() != "misc") {
ui_subtheme_combobox->addItem(l_subtheme); ui_subtheme_combobox->addItem(l_subtheme, l_subtheme);
} }
} }
@ -259,8 +259,8 @@ void AOOptionsDialog::themeChanged(int i)
{ {
ui_subtheme_combobox->clear(); ui_subtheme_combobox->clear();
// Fill the combobox with the names of the themes. // Fill the combobox with the names of the themes.
ui_subtheme_combobox->addItem("server"); ui_subtheme_combobox->addItem("server", "server");
ui_subtheme_combobox->addItem("default"); ui_subtheme_combobox->addItem("default", "server");
QStringList l_subthemes = QDir(ao_app->get_real_path(ao_app->get_theme_path( QStringList l_subthemes = QDir(ao_app->get_real_path(ao_app->get_theme_path(
"", ui_theme_combobox->itemText(i)))) "", ui_theme_combobox->itemText(i))))
@ -270,7 +270,7 @@ void AOOptionsDialog::themeChanged(int i)
if (l_subthemes.toLower() != "server" && if (l_subthemes.toLower() != "server" &&
l_subthemes.toLower() != "default" && l_subthemes.toLower() != "default" &&
l_subthemes.toLower() != "effects" && l_subthemes.toLower() != "misc") { l_subthemes.toLower() != "effects" && l_subthemes.toLower() != "misc") {
ui_subtheme_combobox->addItem(l_subthemes); ui_subtheme_combobox->addItem(l_subthemes, l_subthemes);
} }
} }