Commit 7e6588f6 authored by mak's avatar mak

moved visible check from textOutput to container

parent 732b0e0e
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* 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 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
...@@ -25,18 +24,12 @@ QGCView { ...@@ -25,18 +24,12 @@ QGCView {
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
...@@ -92,12 +85,12 @@ QGCView { ...@@ -92,12 +85,12 @@ QGCView {
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)
} }
} }
...@@ -120,7 +113,6 @@ QGCView { ...@@ -120,7 +113,6 @@ QGCView {
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