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
168bc8ec
Commit
168bc8ec
authored
Apr 15, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle fonts
parent
0e4d256c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
QGCApplication.cc
src/QGCApplication.cc
+8
-0
MainToolBarIndicators.qml
src/ui/toolbar/MainToolBarIndicators.qml
+2
-2
No files found.
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
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