Browse Source

Add show Teleemtry Log Replay Status Bar to Fly View settings

QGC4.4
Don Gagne 6 years ago
parent
commit
009cde4160
  1. 6
      src/Settings/FlyView.SettingsGroup.json
  2. 1
      src/Settings/FlyViewSettings.cc
  3. 3
      src/Settings/FlyViewSettings.h
  4. 11
      src/ui/preferences/GeneralSettings.qml

6
src/Settings/FlyView.SettingsGroup.json

@ -12,5 +12,11 @@ @@ -12,5 +12,11 @@
"type": "double",
"units": "m",
"defaultValue": 121.92
},
{
"name": "showLogReplayStatusBar",
"shortDescription": "Show/Hide Log Replay status bar",
"type": "bool",
"defaultValue": false
}
]

1
src/Settings/FlyViewSettings.cc

@ -19,3 +19,4 @@ DECLARE_SETTINGGROUP(FlyView, "FlyView") @@ -19,3 +19,4 @@ DECLARE_SETTINGGROUP(FlyView, "FlyView")
DECLARE_SETTINGSFACT(FlyViewSettings, guidedMinimumAltitude)
DECLARE_SETTINGSFACT(FlyViewSettings, guidedMaximumAltitude)
DECLARE_SETTINGSFACT(FlyViewSettings, showLogReplayStatusBar)

3
src/Settings/FlyViewSettings.h

@ -16,7 +16,10 @@ class FlyViewSettings : public SettingsGroup @@ -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)
};

11
src/ui/preferences/GeneralSettings.qml

@ -247,7 +247,6 @@ Rectangle { @@ -247,7 +247,6 @@ Rectangle {
}
}
FactCheckBox {
text: qsTr("Mute all audio output")
fact: _audioMuted
@ -430,7 +429,7 @@ Rectangle { @@ -430,7 +429,7 @@ Rectangle {
spacing: _margins
FactCheckBox {
text: qsTr("Use preflight checklist")
text: qsTr("Use Preflight Checklist")
fact: _useChecklist
visible: _useChecklist.visible
@ -438,6 +437,14 @@ Rectangle { @@ -438,6 +437,14 @@ Rectangle {
}
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
fact: _virtualJoystick

Loading…
Cancel
Save