Unverified Commit 08d6ac3a authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #6319 from Rogni/CustomCommandWidget

Added clickable link and ScrollView to CustomCommandWidget
parents cafac557 b01216ce
......@@ -34,7 +34,7 @@ QGCView {
"So make sure to test your changes thoroughly before using them in flight.</p>" +
"<p>Click 'Load Custom Qml file' to provide your custom qml file.</p>" +
"<p>Click 'Reset' to reset to none.</p>" +
"<p>Example usage: http://https://dev.qgroundcontrol.com/en/tools/custom_command_widget.html</p>"
"<p>Example usage: <a href='https://dev.qgroundcontrol.com/en/tools/custom_command_widget.html'>https://dev.qgroundcontrol.com/en/tools/custom_command_widget.html</a></p>"
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
......@@ -87,15 +87,20 @@ QGCView {
}
}
}
QGCLabel {
id: textOutput
QGCFlickable {
id: container
anchors.fill: loader
wrapMode: Text.WordWrap
textFormat: Text.RichText
contentHeight: textOutput.height
flickableDirection: QGCFlickable.VerticalFlick
visible: !loader.visible
QGCLabel {
id: textOutput
width: container.width
wrapMode: Text.WordWrap
textFormat: Text.RichText
onLinkActivated: Qt.openUrlExternally(link)
}
}
Row {
id: buttonRow
spacing: ScreenTools.defaultFontPixelWidth
......@@ -115,6 +120,7 @@ QGCView {
onClicked: controller.clearQmlFile()
}
}
}
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment