Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b6dc73b1
Unverified
Commit
b6dc73b1
authored
Jan 13, 2018
by
Don Gagne
Committed by
GitHub
Jan 13, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6011 from DonLakeFlyer/iOSAutoConnect
Fix AutoConnect settings for iOS
parents
748b0531
f6a1cb6f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
AutoConnectSettings.cc
src/Settings/AutoConnectSettings.cc
+21
-0
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+1
-1
No files found.
src/Settings/AutoConnectSettings.cc
View file @
b6dc73b1
...
...
@@ -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)
{
if
(
!
_autoConnectSiKRadioFact
)
{
_autoConnectSiKRadioFact
=
_createSettingsFact
(
autoConnectSiKRadioSettingsName
);
#ifdef __ios__
_autoConnectSiKRadioFact
->
setVisible
(
false
);
#endif
}
return
_autoConnectSiKRadioFact
;
...
...
@@ -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)
{
if
(
!
_autoConnectRTKGPSFact
)
{
_autoConnectRTKGPSFact
=
_createSettingsFact
(
autoConnectRTKGPSSettingsName
);
#ifdef __ios__
_autoConnectRTKGPSFact
->
setVisible
(
false
);
#endif
}
return
_autoConnectRTKGPSFact
;
...
...
@@ -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)
{
if
(
!
_autoConnectNmeaPortFact
)
{
_autoConnectNmeaPortFact
=
_createSettingsFact
(
autoConnectNmeaPortName
);
#ifdef __ios__
_autoConnectNmeaPortFact
->
setVisible
(
false
);
#endif
}
return
_autoConnectNmeaPortFact
;
...
...
@@ -114,6 +132,9 @@ Fact* AutoConnectSettings::autoConnectNmeaBaud(void)
{
if
(
!
_autoConnectNmeaBaudFact
)
{
_autoConnectNmeaBaudFact
=
_createSettingsFact
(
autoConnectNmeaBaudName
);
#ifdef __ios__
_autoConnectNmeaBaudFact
->
setVisible
(
false
);
#endif
}
return
_autoConnectNmeaBaudFact
;
...
...
src/ui/preferences/GeneralSettings.qml
View file @
b6dc73b1
...
...
@@ -485,7 +485,7 @@ QGCView {
FactCheckBox
{
text
:
autoConnectRepeater
.
names
[
index
]
fact
:
modelData
visible
:
!
ScreenTools
.
isiOS
&&
modelData
.
visible
visible
:
modelData
.
visible
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment