Browse Source

Merge pull request #8214 from mavlink/pr-cleanup

Cleanup
QGC4.4
Gus Grubba 5 years ago committed by GitHub
parent
commit
35deed1545
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/FlightDisplay/FlightDisplayView.qml
  2. 2
      src/FlightDisplay/MultiVehicleList.qml
  3. 3
      src/QmlControls/QGCLabel.qml

2
src/FlightDisplay/FlightDisplayView.qml

@ -440,7 +440,7 @@ Item {
id: cameraLoader id: cameraLoader
anchors.fill: parent anchors.fill: parent
visible: !QGroundControl.videoManager.isGStreamer 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") : ""
} }
} }

2
src/FlightDisplay/MultiVehicleList.qml

@ -67,7 +67,7 @@ Item {
} }
QGCButton { QGCButton {
text: "Start Mision" text: "Start Mission"
onClicked: guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission) onClicked: guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission)
} }
} }

3
src/QmlControls/QGCLabel.qml

@ -6,9 +6,8 @@ import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
Text { Text {
QGCPalette { id: __qgcPal; colorGroupEnabled: enabled }
font.pointSize: ScreenTools.defaultFontPointSize font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily font.family: ScreenTools.normalFontFamily
color: __qgcPal.text color: qgcPal.text
antialiasing: true antialiasing: true
} }

Loading…
Cancel
Save