Commit 3f751ffe authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix safe zone not centered, add center cross

parent d19bb34a
......@@ -60,6 +60,10 @@ Item {
}
}
Item {
id: monitorOverlay
height: root.height - root.rulerHeight
width: root.width
SceneToolBar {
id: sceneToolBar
anchors {
......@@ -96,6 +100,18 @@ Item {
height: frame.height * 0.8
anchors.centerIn: parent
}
Rectangle {
color: "cyan"
width: root.width / 5
height: 1
anchors.centerIn: parent
}
Rectangle {
color: "cyan"
height: root.width / 5
width: 1
anchors.centerIn: parent
}
}
}
......@@ -106,7 +122,6 @@ Item {
anchors {
left: parent.left
bottom: parent.bottom
bottomMargin: root.rulerHeight
}
height: parent.height / 6
//font.pixelSize * 3
......@@ -142,10 +157,9 @@ Item {
font.pixelSize: root.baseUnit
visible: root.showTimecode
anchors {
right: root.right
bottom: root.bottom
right: parent.right
bottom: parent.bottom
rightMargin: 4
bottomMargin: root.rulerHeight
}
}
Text {
......@@ -158,10 +172,9 @@ Item {
visible: root.showFps
font.pixelSize: root.baseUnit
anchors {
right: timecode.visible ? timecode.left : root.right
bottom: root.bottom
right: timecode.visible ? timecode.left : parent.right
bottom: parent.bottom
rightMargin: 10
bottomMargin: root.rulerHeight
}
}
TextField {
......@@ -173,11 +186,9 @@ Item {
marker.focus = false
root.editCurrentMarker()
}
anchors {
left: parent.left
bottom: parent.bottom
bottomMargin: root.rulerHeight
}
visible: root.showMarkers && text != ""
text: root.markerText
......@@ -191,6 +202,7 @@ Item {
}
font.pixelSize: root.baseUnit
}
}
MonitorRuler {
id: clipMonitorRuler
anchors {
......
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.2
import Kdenlive.Controls 1.0
import QtQuick 2.4
import AudioThumb 1.0
Item {
id: root
......@@ -38,7 +41,6 @@ Item {
font.family: "Arial"
}
onZoomChanged: {
sceneToolBar.setZoom(root.zoom)
}
......@@ -58,6 +60,10 @@ Item {
}
}
Item {
id: monitorOverlay
height: root.height - root.rulerHeight
width: root.width
SceneToolBar {
id: sceneToolBar
anchors {
......@@ -76,6 +82,7 @@ Item {
height: root.profile.y * root.scaley
anchors.centerIn: parent
visible: root.showSafezone
Rectangle {
id: safezone
objectName: "safezone"
......@@ -93,6 +100,18 @@ Item {
height: frame.height * 0.8
anchors.centerIn: parent
}
Rectangle {
color: "cyan"
width: root.width / 5
height: 1
anchors.centerIn: parent
}
Rectangle {
color: "cyan"
height: root.width / 5
width: 1
anchors.centerIn: parent
}
}
}
......@@ -103,16 +122,14 @@ Item {
style: Text.Outline;
styleColor: "black"
text: root.timecode
visible: root.showTimecode
font.pixelSize: root.baseUnit
visible: root.showTimecode
anchors {
right: root.right
bottom: root.bottom
right: parent.right
bottom: parent.bottom
rightMargin: 4
bottomMargin: root.rulerHeight
}
}
Text {
id: fpsdropped
objectName: "fpsdropped"
......@@ -123,13 +140,11 @@ Item {
visible: root.showFps
font.pixelSize: root.baseUnit
anchors {
right: timecode.visible ? timecode.left : root.right
bottom: root.bottom
right: timecode.visible ? timecode.left : parent.right
bottom: parent.bottom
rightMargin: 10
bottomMargin: root.rulerHeight
}
}
TextField {
id: marker
objectName: "markertext"
......@@ -139,24 +154,23 @@ Item {
marker.focus = false
root.editCurrentMarker()
}
anchors {
left: parent.left
bottom: parent.bottom
bottomMargin: root.rulerHeight
}
visible: root.showMarkers && text != ""
maximumLength: 20
text: root.markerText
maximumLength: 20
style: TextFieldStyle {
textColor: "white"
background: Rectangle {
color: "#990000ff"
color: "#99ff0000"
width: marker.width
}
}
font.pixelSize: root.baseUnit
}
}
MonitorRuler {
id: clipMonitorRuler
anchors {
......
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