Browse Source

Merge pull request #6011 from DonLakeFlyer/iOSAutoConnect

Fix AutoConnect settings for iOS
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
b6dc73b167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 21
      src/Settings/AutoConnectSettings.cc
  2. 2
      src/ui/preferences/GeneralSettings.qml

21
src/Settings/AutoConnectSettings.cc

@ -60,6 +60,9 @@ Fact* AutoConnectSettings::autoConnectPixhawk(void) @@ -60,6 +60,9 @@ Fact* AutoConnectSettings::autoConnectPixhawk(void)
{
if (!_autoConnectPixhawkFact) {
_autoConnectPixhawkFact = _createSettingsFact(autoConnectPixhawkSettingsName);
#ifdef __ios__
_autoConnectPixhawkFact->setVisible(false);
#endif
}
return _autoConnectPixhawkFact;
@ -69,6 +72,9 @@ Fact* AutoConnectSettings::autoConnectSiKRadio(void) @@ -69,6 +72,9 @@ Fact* AutoConnectSettings::autoConnectSiKRadio(void)
{
if (!_autoConnectSiKRadioFact) {
_autoConnectSiKRadioFact = _createSettingsFact(autoConnectSiKRadioSettingsName);
#ifdef __ios__
_autoConnectSiKRadioFact->setVisible(false);
#endif
}
return _autoConnectSiKRadioFact;
@ -78,6 +84,9 @@ Fact* AutoConnectSettings::autoConnectPX4Flow(void) @@ -78,6 +84,9 @@ Fact* AutoConnectSettings::autoConnectPX4Flow(void)
{
if (!_autoConnectPX4FlowFact) {
_autoConnectPX4FlowFact = _createSettingsFact(autoConnectPX4FlowSettingsName);
#ifdef __ios__
_autoConnectPX4FlowFact->setVisible(false);
#endif
}
return _autoConnectPX4FlowFact;
@ -87,6 +96,9 @@ Fact* AutoConnectSettings::autoConnectRTKGPS(void) @@ -87,6 +96,9 @@ Fact* AutoConnectSettings::autoConnectRTKGPS(void)
{
if (!_autoConnectRTKGPSFact) {
_autoConnectRTKGPSFact = _createSettingsFact(autoConnectRTKGPSSettingsName);
#ifdef __ios__
_autoConnectRTKGPSFact->setVisible(false);
#endif
}
return _autoConnectRTKGPSFact;
@ -96,6 +108,9 @@ Fact* AutoConnectSettings::autoConnectLibrePilot(void) @@ -96,6 +108,9 @@ Fact* AutoConnectSettings::autoConnectLibrePilot(void)
{
if (!_autoConnectLibrePilotFact) {
_autoConnectLibrePilotFact = _createSettingsFact(autoConnectLibrePilotSettingsName);
#ifdef __ios__
_autoConnectLibrePilotFact->setVisible(false);
#endif
}
return _autoConnectLibrePilotFact;
@ -105,6 +120,9 @@ Fact* AutoConnectSettings::autoConnectNmeaPort(void) @@ -105,6 +120,9 @@ Fact* AutoConnectSettings::autoConnectNmeaPort(void)
{
if (!_autoConnectNmeaPortFact) {
_autoConnectNmeaPortFact = _createSettingsFact(autoConnectNmeaPortName);
#ifdef __ios__
_autoConnectNmeaPortFact->setVisible(false);
#endif
}
return _autoConnectNmeaPortFact;
@ -114,6 +132,9 @@ Fact* AutoConnectSettings::autoConnectNmeaBaud(void) @@ -114,6 +132,9 @@ Fact* AutoConnectSettings::autoConnectNmeaBaud(void)
{
if (!_autoConnectNmeaBaudFact) {
_autoConnectNmeaBaudFact = _createSettingsFact(autoConnectNmeaBaudName);
#ifdef __ios__
_autoConnectNmeaBaudFact->setVisible(false);
#endif
}
return _autoConnectNmeaBaudFact;

2
src/ui/preferences/GeneralSettings.qml

@ -485,7 +485,7 @@ QGCView { @@ -485,7 +485,7 @@ QGCView {
FactCheckBox {
text: autoConnectRepeater.names[index]
fact: modelData
visible: !ScreenTools.isiOS && modelData.visible
visible: modelData.visible
}
}
}

Loading…
Cancel
Save