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
2aa572e7
Commit
2aa572e7
authored
May 13, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3371 from DonLakeFlyer/AFConfigReset
Fix double Reset button
parents
641665eb
2c9c086f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
AirframeComponent.qml
src/AutoPilotPlugins/PX4/AirframeComponent.qml
+1
-1
QGCView.qml
src/QmlControls/QGCView.qml
+0
-3
No files found.
src/AutoPilotPlugins/PX4/AirframeComponent.qml
View file @
2aa572e7
...
...
@@ -79,7 +79,7 @@ QGCView {
id
:
customConfigDialog
message
:
qsTr
(
"
Your vehicle is using a custom airframe configuration.
"
)
+
qsTr
(
"
This configuration can only be modified through the Parameter Editor.
\n\n
"
)
+
qsTr
(
"
If you want to
R
eset your airframe configuration and select a standard configuration, click 'Reset' above.
"
)
qsTr
(
"
If you want to
r
eset your airframe configuration and select a standard configuration, click 'Reset' above.
"
)
property
Fact
sys_autostart
:
controller
.
getParameterFact
(
-
1
,
"
SYS_AUTOSTART
"
)
...
...
src/QmlControls/QGCView.qml
View file @
2aa572e7
...
...
@@ -107,9 +107,6 @@ FactPanel {
}
else
if
(
buttons
&
StandardButton
.
Abort
)
{
__rejectButton
.
text
=
qsTr
(
"
Abort
"
)
__rejectButton
.
visible
=
true
}
else
if
(
buttons
&
StandardButton
.
Reset
)
{
__rejectButton
.
text
=
qsTr
(
"
Reset
"
)
__rejectButton
.
visible
=
true
}
}
...
...
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