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

Merge pull request #720 from AttorneyOnline/fix-subthemes

Browse Source 
Fix subthemes not appearing in the settings box
This commit is contained in:
oldmud0 2022-03-31 13:19:38 -05:00 committed by GitHub
commit 2afecbfb63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aooptionsdialog.cpp
View File

@ -108,12 +108,13 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
// Fill the combobox with the names of the themes.
ui_subtheme_combobox->addItem("server");
ui_subtheme_combobox->addItem("default");
QDirIterator it2(ao_app->get_base_path() + "themes/" + ao_app->current_theme, QDir::Dirs,
QDirIterator it2(ao_app->get_real_path(ao_app->get_theme_path("")), QDir::Dirs,
QDirIterator::NoIteratorFlags);
while (it2.hasNext()) {
QString actualname = QDir(it2.next()).dirName();
if (actualname != "." && actualname != ".." && actualname.toLower() != "server" && actualname.toLower() != "default" && actualname.toLower() != "effects" && actualname.toLower() != "misc")
if (actualname != "." && actualname != ".." && actualname.toLower() != "server" && actualname.toLower() != "default" && actualname.toLower() != "effects" && actualname.toLower() != "misc") {
ui_subtheme_combobox->addItem(actualname);
}
}
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_subtheme_combobox);
@ -1319,7 +1320,7 @@ void AOOptionsDialog::theme_changed(int i) {
// Fill the combobox with the names of the themes.
ui_subtheme_combobox->addItem("server");
ui_subtheme_combobox->addItem("default");
QDirIterator it(ao_app->get_base_path() + "themes/" + ui_theme_combobox->itemText(i), QDir::Dirs,
QDirIterator it(ao_app->get_real_path(ao_app->get_theme_path("", ui_theme_combobox->itemText(i))), QDir::Dirs,
QDirIterator::NoIteratorFlags);
while (it.hasNext()) {
QString actualname = QDir(it.next()).dirName();