Browse Source

Merge pull request #4472 from dagar/reboot

reboot vehicle from param menu
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
8b379ecba4
  1. 22
      src/QmlControls/ParameterEditor.qml
  2. 10
      src/QmlControls/ParameterEditorController.h

22
src/QmlControls/ParameterEditor.qml

@ -118,6 +118,11 @@ QGCView { @@ -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 { @@ -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

10
src/QmlControls/ParameterEditorController.h

@ -36,20 +36,20 @@ public: @@ -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<QObject*> model(void);
QList<QObject*> model(void);
signals:
void searchTextChanged(QString searchText);

Loading…
Cancel
Save