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

[Gui] attempt to fix getting NaviCube font name

Browse Source 
- as discussed here: https://forum.freecad.org/viewtopic.php?t=76233 maybe the conversion to ".toLatin1()" is unsafe on some systems for non-ASCII characters on the font names
This commit is contained in:
Uwe
2023-02-20 02:48:23 +01:00
parent cfc08e6dce
commit 9bc526c076
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/DlgSettingsNavigation.cpp
View File

@@ -187,7 +187,7 @@ void DlgSettingsNavigation::loadSettings()
// fill up font styles
hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/NaviCube");
QByteArray defaultSansserifFont = NaviCube::getDefaultSansserifFont().family().toLatin1();
std::string defaultSansserifFont = NaviCube::getDefaultSansserifFont().family().toStdString();
// we purposely allow all available fonts on the system
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -200,9 +200,9 @@ void DlgSettingsNavigation::loadSettings()
// if the parameter has not yet been set, do so immediately
// this assures it is set even if the user cancels the dialog
if (hGrp->GetASCII("FontString", "").empty())
hGrp->SetASCII("FontString", defaultSansserifFont.constData());
hGrp->SetASCII("FontString", defaultSansserifFont.c_str());
int indexFamilyNames = familyNames.indexOf(
QString::fromStdString(hGrp->GetASCII("FontString", defaultSansserifFont)));
QString::fromStdString(hGrp->GetASCII("FontString", defaultSansserifFont.c_str())));
if (indexFamilyNames < 0)
indexFamilyNames = 0;
ui->naviCubeFontName->setCurrentIndex(indexFamilyNames);