Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
168bc8ec
Commit
168bc8ec
authored
Apr 15, 2019
by
Gus Grubba
Browse files
Handle fonts
parent
0e4d256c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/QGCApplication.cc
View file @
168bc8ec
...
...
@@ -25,6 +25,7 @@
#include
<QAction>
#include
<QStringListModel>
#include
<QRegularExpression>
#include
<QFontDatabase>
#ifdef QGC_ENABLE_BLUETOOTH
#include
<QBluetoothLocalDevice>
...
...
@@ -466,6 +467,13 @@ 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"
;
}
QSettings
settings
;
// Exit main application when last window is closed
...
...
src/ui/toolbar/MainToolBarIndicators.qml
View file @
168bc8ec
...
...
@@ -98,7 +98,7 @@ Item {
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
visible
:
!
communicationLost
visible
:
activeVehicle
&&
!
communicationLost
fillMode
:
Image
.
PreserveAspectFit
source
:
_outdoorPalette
?
_brandImageOutdoor
:
_brandImageIndoor
mipmap
:
true
...
...
@@ -133,7 +133,7 @@ Item {
anchors.fill
:
parent
layoutDirection
:
Qt
.
RightToLeft
spacing
:
ScreenTools
.
defaultFontPixelWidth
visible
:
communicationLost
visible
:
activeVehicle
&&
communicationLost
QGCButton
{
id
:
disconnectButton
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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