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
4d55d0c5
Unverified
Commit
4d55d0c5
authored
5 years ago
by
Gus Grubba
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7463 from mavlink/koreanFonts
Load Korean fonts when needed
parents
d5044690
9a551c85
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
QGCApplication.cc
src/QGCApplication.cc
+10
-6
No files found.
src/QGCApplication.cc
View file @
4d55d0c5
...
@@ -391,12 +391,6 @@ void QGCApplication::setLanguage()
...
@@ -391,12 +391,6 @@ void QGCApplication::setLanguage()
break
;
break
;
case
12
:
case
12
:
locale
=
QLocale
(
QLocale
::
Korean
);
locale
=
QLocale
(
QLocale
::
Korean
);
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/NanumGothic-Regular"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/NanumGothic-Regular font"
;
}
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/NanumGothic-Bold"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/NanumGothic-Bold font"
;
}
break
;
break
;
case
13
:
case
13
:
locale
=
QLocale
(
QLocale
::
Norwegian
);
locale
=
QLocale
(
QLocale
::
Norwegian
);
...
@@ -421,6 +415,16 @@ void QGCApplication::setLanguage()
...
@@ -421,6 +415,16 @@ void QGCApplication::setLanguage()
break
;
break
;
}
}
}
}
//-- We have specific fonts for Korean
if
(
locale
==
QLocale
::
Korean
)
{
qDebug
()
<<
"Loading Korean fonts"
<<
locale
.
name
();
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/NanumGothic-Regular"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/NanumGothic-Regular font"
;
}
if
(
QFontDatabase
::
addApplicationFont
(
":/fonts/NanumGothic-Bold"
)
<
0
)
{
qWarning
()
<<
"Could not load /fonts/NanumGothic-Bold font"
;
}
}
qDebug
()
<<
"Loading localization for"
<<
locale
.
name
();
qDebug
()
<<
"Loading localization for"
<<
locale
.
name
();
_app
->
removeTranslator
(
&
_QGCTranslator
);
_app
->
removeTranslator
(
&
_QGCTranslator
);
_app
->
removeTranslator
(
&
_QGCTranslatorQt
);
_app
->
removeTranslator
(
&
_QGCTranslatorQt
);
...
...
This diff is collapsed.
Click to expand it.
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