From 009cde41600df04ccea3fa72d1ebb0771642933f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 5 Jun 2019 16:13:39 -0700 Subject: [PATCH] Add show Teleemtry Log Replay Status Bar to Fly View settings --- src/Settings/FlyView.SettingsGroup.json | 6 ++++++ src/Settings/FlyViewSettings.cc | 1 + src/Settings/FlyViewSettings.h | 3 +++ src/ui/preferences/GeneralSettings.qml | 11 +++++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Settings/FlyView.SettingsGroup.json b/src/Settings/FlyView.SettingsGroup.json index a6d63260e..4e861daa4 100644 --- a/src/Settings/FlyView.SettingsGroup.json +++ b/src/Settings/FlyView.SettingsGroup.json @@ -12,5 +12,11 @@ "type": "double", "units": "m", "defaultValue": 121.92 +}, +{ + "name": "showLogReplayStatusBar", + "shortDescription": "Show/Hide Log Replay status bar", + "type": "bool", + "defaultValue": false } ] diff --git a/src/Settings/FlyViewSettings.cc b/src/Settings/FlyViewSettings.cc index ee4ee9b0e..68ef5dc80 100644 --- a/src/Settings/FlyViewSettings.cc +++ b/src/Settings/FlyViewSettings.cc @@ -19,3 +19,4 @@ DECLARE_SETTINGGROUP(FlyView, "FlyView") DECLARE_SETTINGSFACT(FlyViewSettings, guidedMinimumAltitude) DECLARE_SETTINGSFACT(FlyViewSettings, guidedMaximumAltitude) +DECLARE_SETTINGSFACT(FlyViewSettings, showLogReplayStatusBar) diff --git a/src/Settings/FlyViewSettings.h b/src/Settings/FlyViewSettings.h index 91d1cc378..a6dda7be1 100644 --- a/src/Settings/FlyViewSettings.h +++ b/src/Settings/FlyViewSettings.h @@ -16,7 +16,10 @@ class FlyViewSettings : public SettingsGroup Q_OBJECT public: FlyViewSettings(QObject* parent = nullptr); + DEFINE_SETTING_NAME_GROUP() + DEFINE_SETTINGFACT(guidedMinimumAltitude) DEFINE_SETTINGFACT(guidedMaximumAltitude) + DEFINE_SETTINGFACT(showLogReplayStatusBar) }; diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 85e4742e0..ce9186de1 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -247,7 +247,6 @@ Rectangle { } } - FactCheckBox { text: qsTr("Mute all audio output") fact: _audioMuted @@ -430,13 +429,21 @@ Rectangle { spacing: _margins FactCheckBox { - text: qsTr("Use preflight checklist") + text: qsTr("Use Preflight Checklist") fact: _useChecklist visible: _useChecklist.visible property Fact _useChecklist: QGroundControl.settingsManager.appSettings.useChecklist } + FactCheckBox { + text: qsTr("Show Telemetry Log Replay Status Bar") + fact: _showLogReplayStatusBar + visible: _showLogReplayStatusBar.visible + + property Fact _showLogReplayStatusBar: QGroundControl.settingsManager.flyViewSettings.showLogReplayStatusBar + } + FactCheckBox { text: qsTr("Virtual Joystick") visible: _virtualJoystick.visible -- 2.22.0