Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0cace323
Commit
0cace323
authored
May 07, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't load custom fonts when using Chinese or Korean
parent
7eeffd6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
QGCApplication.cc
src/QGCApplication.cc
+11
-5
No files found.
src/QGCApplication.cc
View file @
0cace323
...
...
@@ -474,11 +474,17 @@ void QGCApplication::_initCommon()
bool
QGCApplication
::
_initForNormalAppBoot
()
{
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/opensans"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/opensans font"
;
}
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/opensans-demibold"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/opensans-demibold font"
;
//-- See App.SettinsGroup.json for index
int
langID
=
toolbox
()
->
settingsManager
()
->
appSettings
()
->
language
()
->
rawValue
().
toInt
();
//-- Don't load custom fonts if not using standard character set
if
(
langID
!=
6
/*Korean*/
&&
langID
!=
9
/*Chinese*/
)
{
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/opensans"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/opensans font"
;
}
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/opensans-demibold"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/opensans-demibold font"
;
}
}
QSettings
settings
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment