Commit 42147a4b authored by Sashmita Raghav's avatar Sashmita Raghav

Connect subtitle model with timeline

parent 9362014e
......@@ -1457,21 +1457,10 @@ Rectangle {
}
Connections {
target: timeline
onFrameFormatChanged: ruler.adjustFormat()
onSelectionChanged: {
if (dragProxy.draggedItem > -1 && !timeline.exists(dragProxy.draggedItem)) {
endDrag()
}
}
}
DelegateModel {
id: subtitleDelegateModel
model: subtitleModel
Item{
Item {
id: subtitleRoot
visible : true
Rectangle {
......@@ -1484,6 +1473,17 @@ Rectangle {
}
}
Connections {
target: timeline
onFrameFormatChanged: ruler.adjustFormat()
onSelectionChanged: {
if (dragProxy.draggedItem > -1 && !timeline.exists(dragProxy.draggedItem)) {
endDrag()
}
}
}
// This provides continuous scrolling at the left/right edges.
Timer {
id: scrollTimer
......
......@@ -172,6 +172,7 @@ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, M
ft.setPointSize(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pointSize());
setFont(ft);
rootContext()->setContextProperty("miniFont", font());
rootContext()->setContextProperty("subtitleModel", pCore->projectManager()->current()->getSubtitleModel().get());
const QStringList effs = sortedItems(KdenliveSettings::favorite_effects(), false).values();
const QStringList trans = sortedItems(KdenliveSettings::favorite_transitions(), true).values();
......
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