Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1e485831
Unverified
Commit
1e485831
authored
Jun 08, 2020
by
Don Gagne
Committed by
GitHub
Jun 08, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8806 from DonLakeFlyer/master
Cherry pick #8802 from stable
parents
553fa8a0
e2696ac4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
ChangeLog.md
ChangeLog.md
+1
-0
LogReplayStatusBar.qml
src/QmlControls/LogReplayStatusBar.qml
+4
-1
QGCCheckBox.qml
src/QmlControls/QGCCheckBox.qml
+2
-2
No files found.
ChangeLog.md
View file @
1e485831
...
@@ -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
## 4.0.8 - Not yet released
*
iOS: Modify QGC file storage location to support new Files app
*
iOS: Modify QGC file storage location to support new Files app
*
Mobile: Fix Log Replay status bar file selection
## 4.0.7 - Stable
## 4.0.7 - Stable
...
...
src/QmlControls/LogReplayStatusBar.qml
View file @
1e485831
...
@@ -28,13 +28,16 @@ Rectangle {
...
@@ -28,13 +28,16 @@ Rectangle {
QGCFileDialog
{
QGCFileDialog
{
id
:
filePicker
id
:
filePicker
title
:
qsTr
(
"
Select Telemetery Log
"
)
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
selectExisting
:
true
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
telemetrySavePath
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
telemetrySavePath
onAcceptedForLoad
:
{
onAcceptedForLoad
:
{
controller
.
link
=
QGroundControl
.
linkManager
.
startLogReplay
(
file
)
controller
.
link
=
QGroundControl
.
linkManager
.
startLogReplay
(
file
)
close
()
close
()
}
}
property
string
_logFileExtension
:
QGroundControl
.
settingsManager
.
appSettings
.
telemetryFileExtension
}
}
LogReplayLinkController
{
LogReplayLinkController
{
...
...
src/QmlControls/QGCCheckBox.qml
View file @
1e485831
...
@@ -39,8 +39,8 @@ CheckBox {
...
@@ -39,8 +39,8 @@ CheckBox {
implicitHeight
:
implicitWidth
implicitHeight
:
implicitWidth
Rectangle
{
Rectangle
{
anchors.fill
:
parent
anchors.fill
:
parent
color
:
control
.
enabled
?
"
white
"
:
"
gray
"
color
:
control
.
enabled
?
"
white
"
:
_qgcPal
.
text
border.color
:
qgcPal
.
text
border.color
:
_
qgcPal
.
text
border.width
:
1
border.width
:
1
opacity
:
control
.
checkedState
===
Qt
.
PartiallyChecked
?
0.5
:
1
opacity
:
control
.
checkedState
===
Qt
.
PartiallyChecked
?
0.5
:
1
QGCColoredImage
{
QGCColoredImage
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment