From 33dc3ae5957f82c61f931b6915d70808c701ca70 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 5 Jan 2020 22:32:41 -0400 Subject: [PATCH 1/3] Fix typo --- src/FlightDisplay/MultiVehicleList.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index f8a7890..3b5db44 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -67,7 +67,7 @@ Item { } QGCButton { - text: "Start Mision" + text: "Start Mission" onClicked: guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission) } } From 11c9c79e7d8f00d6eb1f8b047f06b2b0319a085e Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 5 Jan 2020 22:58:35 -0400 Subject: [PATCH 2/3] If using a GStreamer video source, don't load anything for UVC --- src/FlightDisplay/FlightDisplayView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 2d581d1..45f5297 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -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") : "" } } From d8fdf6732c2d9d99b50ab0be1ef9ad9ace158d2c Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 5 Jan 2020 23:00:02 -0400 Subject: [PATCH 3/3] Don't create a new instance (and a new binding) of QGCPalette for every instance of QGCLabel. --- src/QmlControls/QGCLabel.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index ec55e35..ef0bded 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -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 }