rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-1648 Only use one font for all PFD stuff

Browse Source
This commit is contained in:
Laurent Lalanne 2015-01-04 13:29:58 +01:00
parent 57b8014fa8
commit c1286eb56e
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml
View File

@ -24,11 +24,6 @@ Rectangle {
Item { Item {
id: sceneItem id: sceneItem
FontLoader {
id: pt_bold_narrow
source: "qrc:/pfdqml/fonts/PTN77F.ttf"
}
FontLoader { FontLoader {
id: pt_bold id: pt_bold
source: "qrc:/pfdqml/fonts/PTS75F.ttf" source: "qrc:/pfdqml/fonts/PTS75F.ttf"

6
ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml
View File

@ -204,9 +204,9 @@ Item {
text: ["MANUAL","STAB 1","STAB 2", "STAB 3", "STAB 4", "STAB 5", "STAB 6", "POS HOLD", "COURSELOCK", text: ["MANUAL","STAB 1","STAB 2", "STAB 3", "STAB 4", "STAB 5", "STAB 6", "POS HOLD", "COURSELOCK",
"POS ROAM", "HOME LEASH", "ABS POS", "RTB", "LAND", "PATHPLAN", "POI", "AUTOCRUISE"][FlightStatus.FlightMode] "POS ROAM", "HOME LEASH", "ABS POS", "RTB", "LAND", "PATHPLAN", "POI", "AUTOCRUISE"][FlightStatus.FlightMode]
font { font {
family: pt_bold_narrow.name family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.8) pixelSize: Math.floor(parent.height * 0.74)
weight: Font.Bold weight: Font.DemiBold
} }
} }
} }

1
ground/openpilotgcs/src/plugins/pfdqml/PfdResources.qrc
View File

@ -1,6 +1,5 @@
<RCC> <RCC>
<qresource prefix="/pfdqml"> <qresource prefix="/pfdqml">
<file>fonts/PTN77F.ttf</file>
<file>fonts/PTS75F.ttf</file> <file>fonts/PTS75F.ttf</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
ground/openpilotgcs/src/plugins/pfdqml/fonts/PTN77F.ttf
View File

Binary file not shown.