kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Gui] Preferences - fix the theme combobox index lookup...

Browse Source 
...when the user has FreeCAD-themes (and no doubt other theme addons) installed.
This commit is contained in:
Syres916
2024-07-11 23:50:26 +01:00
committed by GitHub
parent ac2b65c37b
commit dbb7c6e5b8
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Gui/PreferencePages/DlgSettingsGeneral.cpp
View File

@@ -425,18 +425,44 @@ void DlgSettingsGeneral::loadThemes()
{
ui->themesCombobox->clear();
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow");
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/MainWindow");
QString currentTheme = QString::fromLatin1(hGrp->GetASCII("Theme", "").c_str());
Application::Instance->prefPackManager()->rescan();
auto packs = Application::Instance->prefPackManager()->preferencePacks();
QString currentStyleSheet = QString::fromLatin1(hGrp->GetASCII("StyleSheet", "").c_str());
QFileInfo fi(currentStyleSheet);
currentStyleSheet = fi.baseName();
QString themeClassic = QString::fromStdString("classic"); // handle the upcoming name change
QString similarTheme;
QString packName;
for (const auto& pack : packs) {
if (pack.second.metadata().type() == "Theme") {
packName = QString::fromStdString(pack.first);
if (packName.contains(themeClassic, Qt::CaseInsensitive)) {
themeClassic = QString::fromStdString(pack.first);
}
if (packName.contains(currentStyleSheet, Qt::CaseInsensitive)) {
similarTheme = QString::fromStdString(pack.first);
}
ui->themesCombobox->addItem(QString::fromStdString(pack.first));
}
}
if (currentTheme.isEmpty()) {
if (!currentStyleSheet.isEmpty()
&& !similarTheme.isEmpty()) { // a user upgrading from 0.21 or earlier
hGrp->SetASCII("Theme", similarTheme.toStdString());
currentTheme = QString::fromLatin1(hGrp->GetASCII("Theme", "").c_str());
}
else { // a brand new user
hGrp->SetASCII("Theme", themeClassic.toStdString());
currentTheme = QString::fromLatin1(hGrp->GetASCII("Theme", "").c_str());
}
}
int index = ui->themesCombobox->findText(currentTheme);
if (index >= 0 && index < ui->themesCombobox->count()) {
ui->themesCombobox->setCurrentIndex(index);