From 2c9c086fe5da89d94bab217f4d86c05e0c83948c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 13 May 2016 16:23:17 -0400 Subject: [PATCH] Fix double Reset button --- src/AutoPilotPlugins/PX4/AirframeComponent.qml | 2 +- src/QmlControls/QGCView.qml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index 47e9cc030..e65d51cfa 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -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") diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml index 9f3cab3b7..6d69f1360 100644 --- a/src/QmlControls/QGCView.qml +++ b/src/QmlControls/QGCView.qml @@ -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 } } -- 2.22.0