From e2696ac47b3a9a1d90334a868caedd71efa5d2c3 Mon Sep 17 00:00:00 2001 From: Don Gagne <DonLakeFlyer@users.noreply.github.com> Date: Sun, 31 May 2020 10:25:39 -0700 Subject: [PATCH] Merge pull request #8802 from mavlink/LogReplayLoad Mobile Log Replay: Fix file dialog --- ChangeLog.md | 1 + src/QmlControls/LogReplayStatusBar.qml | 5 ++++- src/QmlControls/QGCCheckBox.qml | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2b4787f..019be5c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -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 diff --git a/src/QmlControls/LogReplayStatusBar.qml b/src/QmlControls/LogReplayStatusBar.qml index 327d1c4..f341624 100644 --- a/src/QmlControls/LogReplayStatusBar.qml +++ b/src/QmlControls/LogReplayStatusBar.qml @@ -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 { diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index cc1ee82..9a8e694 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -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 {