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
cf881a96
Unverified
Commit
cf881a96
authored
Jan 27, 2020
by
Gus Grubba
Committed by
GitHub
Jan 27, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8251 from patrickelectric/video_enable
VideoPageWidget: Enable camera control if using gstreamer
parents
b8000343
2c773fcc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
VideoPageWidget.qml
src/FlightMap/Widgets/VideoPageWidget.qml
+4
-4
No files found.
src/FlightMap/Widgets/VideoPageWidget.qml
View file @
cf881a96
...
@@ -99,12 +99,12 @@ Item {
...
@@ -99,12 +99,12 @@ Item {
//-- Video Fit
//-- Video Fit
QGCLabel
{
QGCLabel
{
text
:
qsTr
(
"
Video Screen Fit
"
)
text
:
qsTr
(
"
Video Screen Fit
"
)
visible
:
!
_camera
||
!
_camera
.
autoStream
visible
:
QGroundControl
.
videoManager
.
isGStreamer
font.pointSize
:
ScreenTools
.
smallFontPointSize
font.pointSize
:
ScreenTools
.
smallFontPointSize
}
}
FactComboBox
{
FactComboBox
{
fact
:
QGroundControl
.
settingsManager
.
videoSettings
.
videoFit
fact
:
QGroundControl
.
settingsManager
.
videoSettings
.
videoFit
visible
:
!
_camera
||
!
_camera
.
autoStream
visible
:
QGroundControl
.
videoManager
.
isGStreamer
indexModel
:
false
indexModel
:
false
Layout.alignment
:
Qt
.
AlignHCenter
Layout.alignment
:
Qt
.
AlignHCenter
}
}
...
@@ -112,7 +112,7 @@ Item {
...
@@ -112,7 +112,7 @@ Item {
QGCLabel
{
QGCLabel
{
text
:
_recordingVideo
?
qsTr
(
"
Stop Recording
"
)
:
qsTr
(
"
Record Stream
"
)
text
:
_recordingVideo
?
qsTr
(
"
Stop Recording
"
)
:
qsTr
(
"
Record Stream
"
)
font.pointSize
:
ScreenTools
.
smallFontPointSize
font.pointSize
:
ScreenTools
.
smallFontPointSize
visible
:
(
!
_camera
||
!
_camera
.
autoStream
)
&&
QGroundControl
.
settingsManager
.
videoSettings
.
showRecControl
.
rawValue
visible
:
QGroundControl
.
videoManager
.
isGStreamer
}
}
// Button to start/stop video recording
// Button to start/stop video recording
Item
{
Item
{
...
@@ -120,7 +120,7 @@ Item {
...
@@ -120,7 +120,7 @@ Item {
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
width
:
height
width
:
height
Layout.alignment
:
Qt
.
AlignHCenter
Layout.alignment
:
Qt
.
AlignHCenter
visible
:
(
!
_camera
||
!
_camera
.
autoStream
)
&&
QGroundControl
.
settingsManager
.
videoSettings
.
showRecControl
.
rawValue
visible
:
QGroundControl
.
videoManager
.
isGStreamer
Rectangle
{
Rectangle
{
id
:
recordBtnBackground
id
:
recordBtnBackground
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
...
...
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