Unverified Commit 35deed15 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #8214 from mavlink/pr-cleanup

Cleanup
parents 5c2fd315 d8fdf673
......@@ -440,7 +440,7 @@ Item {
id: cameraLoader
anchors.fill: parent
visible: !QGroundControl.videoManager.isGStreamer
source: QGroundControl.videoManager.uvcEnabled ? "qrc:/qml/FlightDisplayViewUVC.qml" : "qrc:/qml/FlightDisplayViewDummy.qml"
source: visible ? (QGroundControl.videoManager.uvcEnabled ? "qrc:/qml/FlightDisplayViewUVC.qml" : "qrc:/qml/FlightDisplayViewDummy.qml") : ""
}
}
......
......@@ -67,7 +67,7 @@ Item {
}
QGCButton {
text: "Start Mision"
text: "Start Mission"
onClicked: guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission)
}
}
......
......@@ -6,9 +6,8 @@ import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
Text {
QGCPalette { id: __qgcPal; colorGroupEnabled: enabled }
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
color: __qgcPal.text
color: qgcPal.text
antialiasing: true
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment