From 3b802c0c0fdf3e5835a45cb8809de6c8b2b286be Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 25 Jan 2017 22:11:47 -0500 Subject: [PATCH] reboot vehicle from param menu --- src/QmlControls/ParameterEditor.qml | 22 +++++++++++++++++++++ src/QmlControls/ParameterEditorController.h | 10 +++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 50c8d837f..45f883553 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -118,6 +118,11 @@ QGCView { onTriggered: controller.clearRCToParam() visible: _showRCToParam } + MenuSeparator { } + MenuItem { + text: qsTr("Reboot Vehicle") + onTriggered: showDialog(rebootVehicleConfirmComponent, qsTr("Reboot Vehicle"), qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok) + } } } @@ -294,4 +299,21 @@ QGCView { } } } + + Component { + id: rebootVehicleConfirmComponent + + QGCViewDialog { + function accept() { + QGroundControl.multiVehicleManager.activeVehicle.rebootVehicle() + hideDialog() + } + + QGCLabel { + width: parent.width + wrapMode: Text.WordWrap + text: qsTr("Select Ok to reboot vehicle.") + } + } + } } // QGCView diff --git a/src/QmlControls/ParameterEditorController.h b/src/QmlControls/ParameterEditorController.h index 74e2d3e05..2c8b275fa 100644 --- a/src/QmlControls/ParameterEditorController.h +++ b/src/QmlControls/ParameterEditorController.h @@ -36,20 +36,20 @@ public: Q_PROPERTY(QmlObjectListModel* parameters MEMBER _parameters CONSTANT) Q_PROPERTY(QVariantList componentIds MEMBER _componentIds CONSTANT) - Q_INVOKABLE QStringList getGroupsForComponent(int componentId); - Q_INVOKABLE QStringList getParametersForGroup(int componentId, QString group); + Q_INVOKABLE QStringList getGroupsForComponent(int componentId); + Q_INVOKABLE QStringList getParametersForGroup(int componentId, QString group); Q_INVOKABLE QStringList searchParametersForComponent(int componentId, const QString& searchText, bool searchInName=true, bool searchInDescriptions=true); - Q_INVOKABLE void clearRCToParam(void); + Q_INVOKABLE void clearRCToParam(void); Q_INVOKABLE void saveToFilePicker(void); Q_INVOKABLE void loadFromFilePicker(void); Q_INVOKABLE void saveToFile(const QString& filename); Q_INVOKABLE void loadFromFile(const QString& filename); Q_INVOKABLE void refresh(void); Q_INVOKABLE void resetAllToDefaults(void); - Q_INVOKABLE void setRCToParam(const QString& paramName); + Q_INVOKABLE void setRCToParam(const QString& paramName); - QList model(void); + QList model(void); signals: void searchTextChanged(QString searchText); -- 2.22.0