Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
08d6ac3a
Unverified
Commit
08d6ac3a
authored
Apr 16, 2018
by
Don Gagne
Committed by
GitHub
Apr 16, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6319 from Rogni/CustomCommandWidget
Added clickable link and ScrollView to CustomCommandWidget
parents
cafac557
b01216ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
8 deletions
+14
-8
CustomCommandWidget.qml
src/ViewWidgets/CustomCommandWidget.qml
+14
-8
No files found.
src/ViewWidgets/CustomCommandWidget.qml
View file @
08d6ac3a
...
...
@@ -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
()
}
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment