From d680de81c053d0342f8eace65b10ae880685069f Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Tue, 20 May 2025 08:42:00 +0200 Subject: [PATCH] Start: fix restoring of user saved Unit schema This is partially reverting change done in 1155f0d75281. Fixes: 1155f0d75281 ("Base: simplify UnitsSchemas management") --- src/Mod/Start/Gui/GeneralSettingsWidget.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Mod/Start/Gui/GeneralSettingsWidget.cpp b/src/Mod/Start/Gui/GeneralSettingsWidget.cpp index 3f365193c0..6a0a10ab74 100644 --- a/src/Mod/Start/Gui/GeneralSettingsWidget.cpp +++ b/src/Mod/Start/Gui/GeneralSettingsWidget.cpp @@ -215,15 +215,17 @@ void GeneralSettingsWidget::retranslateUi() _unitSystemComboBox->clear(); + const ParameterGrp::handle hGrpUnits = + App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Units"); + auto userSchema = hGrpUnits->GetInt("UserSchema", 0); + auto addItem = [&, index {0}](const std::string& item) mutable { _unitSystemComboBox->addItem(QString::fromStdString(item), index++); }; auto descriptions = Base::UnitsApi::getDescriptions(); std::for_each(descriptions.begin(), descriptions.end(), addItem); - const ParameterGrp::handle hGrpUnits = - App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Units"); - _unitSystemComboBox->setCurrentIndex(static_cast(hGrpUnits->GetInt("UserSchema", 0))); + _unitSystemComboBox->setCurrentIndex(userSchema); _navigationStyleLabel->setText(createLabelText(tr("Navigation Style"))); _navigationStyleComboBox->clear();