Unverified Commit 4f0d8ab3 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #7245 from stefandunca/pr-mavlink_log_opt

Feature: add option to hide MAVLink Logging from settings
parents 6e490d1b 80d9f884
......@@ -53,6 +53,7 @@ public:
Q_PROPERTY(float devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged)
Q_PROPERTY(float devicePixelDensity READ devicePixelDensity NOTIFY devicePixelDensityChanged)
Q_PROPERTY(bool checkFirmwareVersion READ checkFirmwareVersion CONSTANT)
Q_PROPERTY(bool showMavlinkLogOptions READ showMavlinkLogOptions CONSTANT)
/// Should QGC hide its settings menu and colapse it into one single menu (Settings and Vehicle Setup)?
/// @return true if QGC should consolidate both menus into one.
......@@ -96,6 +97,7 @@ public:
virtual bool showSimpleMissionStart () const { return false; }
virtual bool disableVehicleConnection () const { return false; } ///< true: vehicle connection is disabled
virtual bool checkFirmwareVersion () const { return true; }
virtual bool showMavlinkLogOptions () const { return true; }
#if defined(__mobile__)
virtual bool useMobileFileDialog () const { return true;}
......
......@@ -32,6 +32,7 @@ Rectangle {
property real _columnSpacing: ScreenTools.defaultFontPixelHeight * 0.25
property bool _uploadedSelected: false
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property var _showMavlinkLog: QGroundControl.corePlugin.options.showMavlinkLogOptions
QGCPalette { id: qgcPal }
......@@ -249,6 +250,7 @@ Rectangle {
height: mavlogLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
visible: _showMavlinkLog
QGCLabel {
id: mavlogLabel
text: qsTr("MAVLink 2.0 Logging (PX4 Firmware Only)")
......@@ -261,6 +263,7 @@ Rectangle {
color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
visible: _showMavlinkLog
Column {
id: mavlogColumn
width: gcsColumn.width
......@@ -309,6 +312,7 @@ Rectangle {
height: logLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
visible: _showMavlinkLog
QGCLabel {
id: logLabel
text: qsTr("MAVLink 2.0 Log Uploads (PX4 Firmware Only)")
......@@ -321,6 +325,7 @@ Rectangle {
color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
visible: _showMavlinkLog
Column {
id: logColumn
spacing: _columnSpacing
......@@ -535,6 +540,7 @@ Rectangle {
height: logFilesLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
visible: _showMavlinkLog
QGCLabel {
id: logFilesLabel
text: qsTr("Saved Log Files")
......@@ -547,6 +553,7 @@ Rectangle {
color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
visible: _showMavlinkLog
Column {
id: logFilesColumn
spacing: _columnSpacing * 4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment