From 35a89d527a45f493aa48bd50928dbdbd40f8284f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 7 Feb 2015 12:25:46 -0800 Subject: [PATCH] WIP on Firmware Upgrade conversion to Qml --- src/VehicleSetup/FirmwareUpgrade.qml | 37 ++++++++++++++++++++++++++++ src/VehicleSetup/SetupView.cc | 11 ++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 src/VehicleSetup/FirmwareUpgrade.qml diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml new file mode 100644 index 000000000..1dcbdcefb --- /dev/null +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -0,0 +1,37 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Controls.Styles 1.2 + +import QGroundControl.Controls 1.0 +import QGroundControl.FactControls 1.0 +import QGroundControl.Palette 1.0 + +Rectangle { + width: 600 + height: 400 + + property var qgcPal: QGCPalette { colorGroup: QGCPalette.Active } + + color: qgcPal.window + + Text { + text: "FIRMWARE UPDATE" + color: qgcPal.windowText + font.pointSize: 20 + } + + Column { + QGCRadioButton { + text: qsTr("Standard Version (stable)") + } + QGCRadioButton { + text: qsTr("Beta Testing (beta)") + } + QGCRadioButton { + text: qsTr("Developer Build (master)") + } + QGCRadioButton { + text: qsTr("Custom firmware file...") + } + } +} diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc index fd13f54e7..c4c4db7d1 100644 --- a/src/VehicleSetup/SetupView.cc +++ b/src/VehicleSetup/SetupView.cc @@ -132,8 +132,17 @@ void SetupView::_firmwareButtonClicked(void) QGCMessageBox::warning("Setup", "Firmware Update cannot be performed while vehicle is armed."); return; } - + +#if 1 PX4FirmwareUpgrade* setup = new PX4FirmwareUpgrade(this); +#else + // NYI + QGCQmlWidgetHolder* setup = new QGCQmlWidgetHolder; + Q_CHECK_PTR(setup); + + //setup->setAutoPilot(_autoPilotPlugin); + setup->setSource(QUrl::fromUserInput("qrc:/qml/FirmwareUpgrade.qml")); +#endif _changeSetupWidget(setup); } -- 2.22.0