Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
964a42dd
Commit
964a42dd
authored
Aug 30, 2019
by
Jean-Baptiste Mardelle
Browse files
Cleanup monitor marker display (use QtQuick2)
parent
f41906a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/monitor/view/kdenliveclipmonitor.qml
View file @
964a42dd
import
QtQuick
.
Controls
1.4
import
QtQuick
.
Controls
.
Styles
1.4
import
QtQuick
.
Controls
2.2
import
QtQuick
.
Window
2.2
import
Kdenlive
.
Controls
1.0
import
QtQuick
2.6
...
...
@@ -186,14 +185,21 @@ Item {
}
visible
:
root
.
showMarkers
&&
text
!=
""
text
:
controller
.
markerComment
maximumLength
:
20
style
:
TextFieldStyle
{
textColor
:
"
white
"
background
:
Rectangle
{
width
:
textMetrics
.
width
+
10
horizontalAlignment
:
TextInput
.
AlignHCenter
background
:
Rectangle
{
color
:
controller
.
position
==
controller
.
zoneIn
?
"
#9900ff00
"
:
controller
.
position
==
controller
.
zoneOut
?
"
#99ff0000
"
:
"
#990000ff
"
width
:
marker
.
width
}
}
color
:
"
white
"
leftPadding
:
0
rightPadding
:
0
TextMetrics
{
id
:
textMetrics
font
:
marker
.
font
text
:
controller
.
markerComment
}
maximumLength
:
20
}
}
MouseArea
{
...
...
@@ -227,14 +233,12 @@ Item {
Row
{
ToolButton
{
id
:
videoDragButton
iconName
:
"
kdenlive-show-video
"
tooltip
:
i18n
(
"
Video only drag
"
)
icon.name
:
"
kdenlive-show-video
"
enabled
:
false
}
ToolButton
{
id
:
audioDragButton
iconName
:
"
audio-volume-medium
"
tooltip
:
i18n
(
"
Audio only drag
"
)
icon.name
:
"
audio-volume-medium
"
enabled
:
false
}
}
...
...
src/monitor/view/kdenlivemonitor.qml
View file @
964a42dd
import
QtQuick
.
Controls
1.4
import
QtQuick
.
Controls
.
Styles
1.4
import
QtQuick
.
Controls
2.2
import
QtQuick
.
Window
2.2
import
Kdenlive
.
Controls
1.0
import
QtQuick
2.4
...
...
@@ -148,6 +147,21 @@ Item {
font
:
fixedFont
objectName
:
"
markertext
"
activeFocusOnPress
:
true
text
:
controller
.
markerComment
width
:
textMetrics
.
width
+
10
horizontalAlignment
:
TextInput
.
AlignHCenter
background
:
Rectangle
{
color
:
controller
.
position
==
controller
.
zoneIn
?
"
#9900ff00
"
:
controller
.
position
==
controller
.
zoneOut
?
"
#99ff0000
"
:
"
#990000ff
"
}
color
:
"
white
"
leftPadding
:
0
rightPadding
:
0
TextMetrics
{
id
:
textMetrics
font
:
marker
.
font
text
:
controller
.
markerComment
}
onEditingFinished
:
{
root
.
markerText
=
marker
.
displayText
marker
.
focus
=
false
...
...
@@ -158,15 +172,7 @@ Item {
bottom
:
parent
.
bottom
}
visible
:
root
.
showMarkers
&&
text
!=
""
text
:
controller
.
markerComment
maximumLength
:
20
style
:
TextFieldStyle
{
textColor
:
"
white
"
background
:
Rectangle
{
color
:
controller
.
position
==
controller
.
zoneIn
?
"
#9900ff00
"
:
controller
.
position
==
controller
.
zoneOut
?
"
#99ff0000
"
:
"
#990000ff
"
width
:
marker
.
width
}
}
maximumLength
:
25
}
}
}
...
...
Write
Preview
Supports
Markdown
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