Browse Source

Merge pull request #8806 from DonLakeFlyer/master

Cherry pick #8802 from stable
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
1e48583182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      ChangeLog.md
  2. 5
      src/QmlControls/LogReplayStatusBar.qml
  3. 4
      src/QmlControls/QGCCheckBox.qml

1
ChangeLog.md

@ -16,6 +16,7 @@ Note: This file only contains high level features or important fixes. @@ -16,6 +16,7 @@ Note: This file only contains high level features or important fixes.
## 4.0.8 - Not yet released
* iOS: Modify QGC file storage location to support new Files app
* Mobile: Fix Log Replay status bar file selection
## 4.0.7 - Stable

5
src/QmlControls/LogReplayStatusBar.qml

@ -28,13 +28,16 @@ Rectangle { @@ -28,13 +28,16 @@ Rectangle {
QGCFileDialog {
id: filePicker
title: qsTr("Select Telemetery Log")
nameFilters: [qsTr("Telemetry Logs (*.%1)").arg(QGroundControl.settingsManager.appSettings.telemetryFileExtension), qsTr("All Files (*)")]
nameFilters: [qsTr("Telemetry Logs (*.%1)").arg(_logFileExtension), qsTr("All Files (*)")]
fileExtension: _logFileExtension
selectExisting: true
folder: QGroundControl.settingsManager.appSettings.telemetrySavePath
onAcceptedForLoad: {
controller.link = QGroundControl.linkManager.startLogReplay(file)
close()
}
property string _logFileExtension: QGroundControl.settingsManager.appSettings.telemetryFileExtension
}
LogReplayLinkController {

4
src/QmlControls/QGCCheckBox.qml

@ -39,8 +39,8 @@ CheckBox { @@ -39,8 +39,8 @@ CheckBox {
implicitHeight: implicitWidth
Rectangle {
anchors.fill: parent
color: control.enabled ? "white" : "gray"
border.color: qgcPal.text
color: control.enabled ? "white" : _qgcPal.text
border.color: _qgcPal.text
border.width: 1
opacity: control.checkedState === Qt.PartiallyChecked ? 0.5 : 1
QGCColoredImage {

Loading…
Cancel
Save