diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc index 443442cbf17b732733cea9af031368ec20d93c1e..96f32dd2fe0ab7956c7852a9627463918b82b174 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc @@ -219,7 +219,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData group = group.remove(QRegExp("[0-9]*$")); // remove any numbers from the end QString shortDescription = xml.attributes().value("humanName").toString(); - QString longDescription = xml.attributes().value("docmentation").toString(); + QString longDescription = xml.attributes().value("documentation").toString(); QString userLevel = xml.attributes().value("user").toString(); qCDebug(APMParameterMetaDataVerboseLog) << "Found parameter name:" << name diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index a291df47d9bc4241ca21fa16ac992c85b4bedf59..96ea9458cc8be419adda3ff87340636be73903ab 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -158,35 +158,46 @@ QGCViewDialog { QGCLabel { text: fact.name } - Row { - spacing: defaultTextWidth + Column { + spacing: defaultTextHeight / 2 + anchors.left: parent.left + anchors.right: parent.right - QGCLabel { text: qsTr("Units:") } - QGCLabel { text: fact.units ? fact.units : qsTr("none") } - } + Row { + spacing: defaultTextWidth - Row { - spacing: defaultTextWidth - visible: !fact.minIsDefaultForType + QGCLabel { text: qsTr("Units:") } + QGCLabel { text: fact.units ? fact.units : qsTr("none") } + } - QGCLabel { text: qsTr("Minimum value:") } - QGCLabel { text: fact.minString } - } + Row { + spacing: defaultTextWidth + visible: !fact.minIsDefaultForType - Row { - spacing: defaultTextWidth - visible: !fact.maxIsDefaultForType + QGCLabel { text: qsTr("Minimum value:") } + QGCLabel { text: fact.minString } + } - QGCLabel { text: qsTr("Maximum value:") } - QGCLabel { text: fact.maxString } - } + Row { + spacing: defaultTextWidth + visible: !fact.maxIsDefaultForType - Row { - spacing: defaultTextWidth + QGCLabel { text: qsTr("Maximum value:") } + QGCLabel { text: fact.maxString } + } - QGCLabel { text: qsTr("Default value:") } - QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") } - } + Row { + spacing: defaultTextWidth + + QGCLabel { text: qsTr("Default value:") } + QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") } + } + + QGCLabel { + visible: fact.rebootRequired + text: "Reboot required after change" + } + } // Column QGCLabel { width: parent.width