Browse Source

Merge pull request #3371 from DonLakeFlyer/AFConfigReset

Fix double Reset button
QGC4.4
Don Gagne 9 years ago
parent
commit
2aa572e7f7
  1. 2
      src/AutoPilotPlugins/PX4/AirframeComponent.qml
  2. 3
      src/QmlControls/QGCView.qml

2
src/AutoPilotPlugins/PX4/AirframeComponent.qml

@ -79,7 +79,7 @@ QGCView { @@ -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 Reset your airframe configuration and select a standard configuration, click 'Reset' above.")
qsTr("If you want to reset your airframe configuration and select a standard configuration, click 'Reset' above.")
property Fact sys_autostart: controller.getParameterFact(-1, "SYS_AUTOSTART")

3
src/QmlControls/QGCView.qml

@ -107,9 +107,6 @@ FactPanel { @@ -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
}
}

Loading…
Cancel
Save