Skip to content

Q
qgroundcontrol
Commit 7e6588f6 authored by mak's avatar mak
Browse files
Options

moved visible check from textOutput to container

parent 732b0e0e
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 57 deletions
src/ViewWidgets/CustomCommandWidget.qml
View file @ 7e6588f6
...@@ -6,41 +6,34 @@ ...@@ -6,41 +6,34 @@
* COPYING.md in the root of the source code directory. * COPYING.md in the root of the source code directory.
* *
****************************************************************************/ ****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick 2.3 import QGroundControl 1.0
import QtQuick.Controls 1.2 import QGroundControl.Palette 1.0
import QtQuick.Controls.Styles 1.4 import QGroundControl.Controls 1.0
import QtQuick.Dialogs 1.2 import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
QGCView { QGCView {
id: qgcView id: qgcView
viewPanel: panel viewPanel: panel
property var _activeVehicle: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable ? QGroundControl.multiVehicleManager.activeVehicle : null property var _activeVehicle: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable ? QGroundControl.multiVehicleManager.activeVehicle : null
property real _margins: ScreenTools.defaultFontPixelHeight property real _margins: ScreenTools.defaultFontPixelHeight
property string _noVehicleText: qsTr("No vehicle connected") property string _noVehicleText: qsTr("No vehicle connected")
property string _assignQmlFile: "<p>" + property string _assignQmlFile: "<p>" + "You can create your own commands and parameter editing user interface in this widget. " + "You do this by providing your own Qml file. " + "This support is a work in progress and the details may change somewhat in the future. " + "By using this feature you are connecting directly to the internals of QGroundControl. " + "Doing so incorrectly may cause instability both in QGroundControl and/or your vehicle. " + "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: <a href='https://dev.qgroundcontrol.com/en/tools/custom_command_widget.html'>https://dev.qgroundcontrol.com/en/tools/custom_command_widget.html</a></p>"
"You can create your own commands and parameter editing user interface in this widget. " +
"You do this by providing your own Qml file. " +
"This support is a work in progress and the details may change somewhat in the future. " +
"By using this feature you are connecting directly to the internals of QGroundControl. " +
"Doing so incorrectly may cause instability both in QGroundControl and/or your vehicle. " +
"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: <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 } QGCPalette {
id: qgcPal
colorGroupEnabled: enabled
}
CustomCommandWidgetController { CustomCommandWidgetController {
id: controller id: controller
factPanel: panel factPanel: panel
onCustomQmlFileChanged: _updateLoader() onCustomQmlFileChanged: _updateLoader()
} }
...@@ -63,21 +56,21 @@ QGCView { ...@@ -63,21 +56,21 @@ QGCView {
} }
QGCViewPanel { QGCViewPanel {
id: panel id: panel
anchors.fill: parent anchors.fill: parent
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: qgcPal.window color: qgcPal.window
Loader { Loader {
id: loader id: loader
anchors.margins: _margins anchors.margins: _margins
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: buttonRow.top anchors.bottom: buttonRow.top
visible: false visible: false
onStatusChanged: { onStatusChanged: {
if (loader.status == Loader.Error) { if (loader.status == Loader.Error) {
...@@ -89,38 +82,37 @@ QGCView { ...@@ -89,38 +82,37 @@ QGCView {
} }
QGCFlickable { QGCFlickable {
id: container id: container
anchors.fill: loader anchors.fill: loader
contentHeight: textOutput.height contentHeight: textOutput.height
flickableDirection: QGCFlickable.VerticalFlick flickableDirection: QGCFlickable.VerticalFlick
visible: !loader.visible
QGCLabel { QGCLabel {
id: textOutput id: textOutput
width: container.width width: container.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
textFormat: Text.RichText textFormat: Text.RichText
visible: !loader.visible onLinkActivated: Qt.openUrlExternally(link)
onLinkActivated: Qt.openUrlExternally(link)
} }
} }
Row { Row {
id: buttonRow id: buttonRow
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
anchors.margins: _margins anchors.margins: _margins
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCButton { QGCButton {
text: qsTr("Load Custom Qml file...") text: qsTr("Load Custom Qml file...")
width: ScreenTools.defaultFontPixelWidth * 22 width: ScreenTools.defaultFontPixelWidth * 22
onClicked: controller.selectQmlFile() onClicked: controller.selectQmlFile()
} }
QGCButton { QGCButton {
text: qsTr("Reset") text: qsTr("Reset")
width: ScreenTools.defaultFontPixelWidth * 22 width: ScreenTools.defaultFontPixelWidth * 22
onClicked: controller.clearQmlFile() 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