"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/qml/views/timeline/timeline.qml" between
shotcut-20.09.01.tar.gz and shotcut-20.09.13.tar.gz

About: Shotcut is a cross-platform (Qt) advanced video editor.

timeline.qml  (shotcut-20.09.01):timeline.qml  (shotcut-20.09.13)
skipping to change at line 60 skipping to change at line 60
} }
function zoomIn() { function zoomIn() {
adjustZoom(0.0625) adjustZoom(0.0625)
} }
function zoomOut() { function zoomOut() {
adjustZoom(-0.0625) adjustZoom(-0.0625)
} }
function zoomToFit() {
setZoom(Math.pow((scrollView.width - 50) * multitrack.scaleFactor / trac
ksContainer.width - 0.01, 1/3))
}
function resetZoom() { function resetZoom() {
setZoom(1.0) setZoom(1.0)
} }
function makeTracksTaller() { function makeTracksTaller() {
multitrack.trackHeight += 20 multitrack.trackHeight += 20
} }
function makeTracksShorter() { function makeTracksShorter() {
multitrack.trackHeight = Math.max(10, multitrack.trackHeight - 20) multitrack.trackHeight = Math.max(10, multitrack.trackHeight - 20)
skipping to change at line 160 skipping to change at line 164
visible: trackHeaderRepeater.count visible: trackHeaderRepeater.count
z: 1 z: 1
Label { Label {
text: qsTr('Output') text: qsTr('Output')
color: activePalette.windowText color: activePalette.windowText
elide: Qt.ElideRight elide: Qt.ElideRight
x: 8 x: 8
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: parent.width - 8 width: parent.width - 8
} }
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: {
timeline.selectMultitrack()
if (mouse.button == Qt.RightButton) {
menu.popup()
}
}
}
ToolButton { ToolButton {
visible: multitrack.filtered visible: multitrack.filtered
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 4 anchors.rightMargin: 4
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
implicitWidth: 20 implicitWidth: 20
implicitHeight: 20 implicitHeight: 20
iconName: 'view-filter' iconName: 'view-filter'
iconSource: 'qrc:///icons/oxygen/32x32/status/view-filter.pn g' iconSource: 'qrc:///icons/oxygen/32x32/status/view-filter.pn g'
tooltip: qsTr('Filters') tooltip: qsTr('Filters')
onClicked: { onClicked: {
timeline.selectMultitrack() timeline.selectMultitrack()
timeline.filteredClicked() timeline.filteredClicked()
} }
} }
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: {
timeline.selectMultitrack()
if (mouse.button == Qt.RightButton) {
menu.popup()
}
}
}
} }
Flickable { Flickable {
// Non-slider scroll area for the track headers. // Non-slider scroll area for the track headers.
contentY: scrollView.flickableItem.contentY contentY: scrollView.flickableItem.contentY
width: headerWidth width: headerWidth
height: trackHeaders.height height: trackHeaders.height
interactive: false interactive: false
Column { Column {
id: trackHeaders id: trackHeaders
skipping to change at line 652 skipping to change at line 656
onDragging: Logic.dragging(pos, duration) onDragging: Logic.dragging(pos, duration)
onDropped: Logic.dropped() onDropped: Logic.dropped()
onDropAccepted: Logic.acceptDrop(xml) onDropAccepted: Logic.acceptDrop(xml)
onSelectionChanged: { onSelectionChanged: {
cornerstone.selected = timeline.isMultitrackSelected() cornerstone.selected = timeline.isMultitrackSelected()
var selectedTrack = timeline.selectedTrack() var selectedTrack = timeline.selectedTrack()
for (var i = 0; i < trackHeaderRepeater.count; i++) for (var i = 0; i < trackHeaderRepeater.count; i++)
trackHeaderRepeater.itemAt(i).selected = (i === selectedTrack) trackHeaderRepeater.itemAt(i).selected = (i === selectedTrack)
propertiesMenuItem.visible = (cornerstone.selected || (selectedTrack >= 0 && selectedTrack < trackHeaderRepeater.count)) propertiesMenuItem.visible = (cornerstone.selected || (selectedTrack >= 0 && selectedTrack < trackHeaderRepeater.count))
} }
onZoomIn: zoomIn()
onZoomOut: zoomOut()
onZoomToFit: zoomToFit()
onResetZoom: resetZoom()
onMakeTracksShorter: makeTracksShorter()
onMakeTracksTaller: makeTracksTaller()
} }
Connections { Connections {
target: multitrack target: multitrack
onLoaded: toolbar.scaleSlider.value = Math.pow(multitrack.scaleFactor - 0.01, 1.0 / 3.0) onLoaded: toolbar.scaleSlider.value = Math.pow(multitrack.scaleFactor - 0.01, 1.0 / 3.0)
onScaleFactorChanged: if (settings.timelineCenterPlayhead) Logic.scrollI fNeeded() onScaleFactorChanged: if (settings.timelineCenterPlayhead) Logic.scrollI fNeeded()
} }
// This provides continuous scrolling at the left/right edges. // This provides continuous scrolling at the left/right edges.
Timer { Timer {
 End of changes. 4 change blocks. 
10 lines changed or deleted 21 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)