Commit 7ea3296d authored by acfloria's avatar acfloria

Add AdvancedLinkSettings fact to the general app settings

This setting enables/disables the LinkIndicator toolbar in which the primary link can be chosen.
parent 77df3be8
...@@ -124,6 +124,13 @@ ...@@ -124,6 +124,13 @@
"type": "bool", "type": "bool",
"defaultValue": false "defaultValue": false
}, },
{
"name": "AdvancedLinkSettings",
"shortDescription": "Allow advanced link settings.",
"longDescription": "Allow the user to pick the priority link and adding the high latency property to a link.",
"type": "bool",
"defaultValue": false
},
{ {
"name": "BaseDeviceFontPointSize", "name": "BaseDeviceFontPointSize",
"shortDescription": "Application font size", "shortDescription": "Application font size",
......
...@@ -34,6 +34,7 @@ const char* AppSettings::showLargeCompassName = "ShowLar ...@@ -34,6 +34,7 @@ const char* AppSettings::showLargeCompassName = "ShowLar
const char* AppSettings::savePathName = "SavePath"; const char* AppSettings::savePathName = "SavePath";
const char* AppSettings::autoLoadMissionsName = "AutoLoadMissions"; const char* AppSettings::autoLoadMissionsName = "AutoLoadMissions";
const char* AppSettings::useChecklistName = "UseChecklist"; const char* AppSettings::useChecklistName = "UseChecklist";
const char* AppSettings::advancedLinkSettingsName = "AdvancedLinkSettings";
const char* AppSettings::mapboxTokenName = "MapboxToken"; const char* AppSettings::mapboxTokenName = "MapboxToken";
const char* AppSettings::esriTokenName = "EsriToken"; const char* AppSettings::esriTokenName = "EsriToken";
const char* AppSettings::defaultFirmwareTypeName = "DefaultFirmwareType"; const char* AppSettings::defaultFirmwareTypeName = "DefaultFirmwareType";
...@@ -367,6 +368,15 @@ Fact* AppSettings::autoLoadMissions(void) ...@@ -367,6 +368,15 @@ Fact* AppSettings::autoLoadMissions(void)
return _autoLoadMissionsFact; return _autoLoadMissionsFact;
} }
Fact* AppSettings::advancedLinkSettings(void)
{
if (!_advancedLinkSettingsFact) {
_advancedLinkSettingsFact = _createSettingsFact(advancedLinkSettingsName);
}
return _advancedLinkSettingsFact;
}
Fact* AppSettings::mapboxToken(void) Fact* AppSettings::mapboxToken(void)
{ {
if (!_mapboxTokenFact) { if (!_mapboxTokenFact) {
......
...@@ -38,6 +38,7 @@ public: ...@@ -38,6 +38,7 @@ public:
Q_PROPERTY(Fact* savePath READ savePath CONSTANT) Q_PROPERTY(Fact* savePath READ savePath CONSTANT)
Q_PROPERTY(Fact* autoLoadMissions READ autoLoadMissions CONSTANT) Q_PROPERTY(Fact* autoLoadMissions READ autoLoadMissions CONSTANT)
Q_PROPERTY(Fact* useChecklist READ useChecklist CONSTANT) Q_PROPERTY(Fact* useChecklist READ useChecklist CONSTANT)
Q_PROPERTY(Fact* advancedLinkSettings READ advancedLinkSettings CONSTANT)
Q_PROPERTY(Fact* mapboxToken READ mapboxToken CONSTANT) Q_PROPERTY(Fact* mapboxToken READ mapboxToken CONSTANT)
Q_PROPERTY(Fact* esriToken READ esriToken CONSTANT) Q_PROPERTY(Fact* esriToken READ esriToken CONSTANT)
Q_PROPERTY(Fact* defaultFirmwareType READ defaultFirmwareType CONSTANT) Q_PROPERTY(Fact* defaultFirmwareType READ defaultFirmwareType CONSTANT)
...@@ -77,6 +78,7 @@ public: ...@@ -77,6 +78,7 @@ public:
Fact* savePath (void); Fact* savePath (void);
Fact* autoLoadMissions (void); Fact* autoLoadMissions (void);
Fact* useChecklist (void); Fact* useChecklist (void);
Fact* advancedLinkSettings (void);
Fact* mapboxToken (void); Fact* mapboxToken (void);
Fact* esriToken (void); Fact* esriToken (void);
Fact* defaultFirmwareType (void); Fact* defaultFirmwareType (void);
...@@ -113,6 +115,7 @@ public: ...@@ -113,6 +115,7 @@ public:
static const char* savePathName; static const char* savePathName;
static const char* autoLoadMissionsName; static const char* autoLoadMissionsName;
static const char* useChecklistName; static const char* useChecklistName;
static const char* advancedLinkSettingsName;
static const char* mapboxTokenName; static const char* mapboxTokenName;
static const char* esriTokenName; static const char* esriTokenName;
static const char* defaultFirmwareTypeName; static const char* defaultFirmwareTypeName;
...@@ -164,6 +167,7 @@ private: ...@@ -164,6 +167,7 @@ private:
SettingsFact* _savePathFact; SettingsFact* _savePathFact;
SettingsFact* _autoLoadMissionsFact; SettingsFact* _autoLoadMissionsFact;
SettingsFact* _useChecklistFact; SettingsFact* _useChecklistFact;
SettingsFact* _advancedLinkSettingsFact;
SettingsFact* _mapboxTokenFact; SettingsFact* _mapboxTokenFact;
SettingsFact* _esriTokenFact; SettingsFact* _esriTokenFact;
SettingsFact* _defaultFirmwareTypeFact; SettingsFact* _defaultFirmwareTypeFact;
......
...@@ -378,6 +378,16 @@ QGCView { ...@@ -378,6 +378,16 @@ QGCView {
property Fact _autoLoad: QGroundControl.settingsManager.appSettings.autoLoadMissions property Fact _autoLoad: QGroundControl.settingsManager.appSettings.autoLoadMissions
} }
//-----------------------------------------------------------------
//-- Advanced Link Settings
FactCheckBox {
text: qsTr("Advanced Link Settings")
fact: _advancedLinkSettings
visible: _advancedLinkSettings.visible
property Fact _advancedLinkSettings: QGroundControl.settingsManager.appSettings.advancedLinkSettings
}
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Save path //-- Save path
RowLayout { RowLayout {
......
...@@ -32,6 +32,7 @@ Item { ...@@ -32,6 +32,7 @@ Item {
font.pointSize: ScreenTools.mediumFontPointSize font.pointSize: ScreenTools.mediumFontPointSize
color: qgcPal.buttonText color: qgcPal.buttonText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: QGroundControl.settingsManager.appSettings.advancedLinkSettings.rawValue
Menu { Menu {
id: linkSelectionMenu id: linkSelectionMenu
} }
......
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