keyframesdock.cpp (shotcut-22.10.22) | : | keyframesdock.cpp (shotcut-22.11.25) | ||
---|---|---|---|---|
skipping to change at line 422 | skipping to change at line 422 | |||
void KeyframesDock::setCurrentFilter(QmlFilter *filter, QmlMetadata *meta) | void KeyframesDock::setCurrentFilter(QmlFilter *filter, QmlMetadata *meta) | |||
{ | { | |||
m_filter = filter; | m_filter = filter; | |||
m_metadata = meta; | m_metadata = meta; | |||
if (!m_filter || !m_filter->producer().is_valid()) { | if (!m_filter || !m_filter->producer().is_valid()) { | |||
m_filter = &m_emptyQmlFilter; | m_filter = &m_emptyQmlFilter; | |||
m_metadata = &m_emptyQmlMetadata; | m_metadata = &m_emptyQmlMetadata; | |||
} | } | |||
m_model.load(m_filter, m_metadata); | m_model.load(m_filter, m_metadata); | |||
disconnect(this, SIGNAL(changed())); | disconnect(this, SIGNAL(changed())); | |||
connect(m_filter, SIGNAL(changed()), SIGNAL(changed())); | connect(m_filter, SIGNAL(changed(QString)), SIGNAL(changed())); | |||
connect(m_filter, SIGNAL(changed(QString)), &m_model, SLOT(onFilterChanged(Q String))); | connect(m_filter, SIGNAL(changed(QString)), &m_model, SLOT(onFilterChanged(Q String))); | |||
connect(m_filter, SIGNAL(animateInChanged()), &m_model, SLOT(reload())); | connect(m_filter, SIGNAL(animateInChanged()), &m_model, SLOT(reload())); | |||
connect(m_filter, SIGNAL(animateOutChanged()), &m_model, SLOT(reload())); | connect(m_filter, SIGNAL(animateOutChanged()), &m_model, SLOT(reload())); | |||
connect(m_filter, SIGNAL(inChanged(int)), &m_model, SLOT(onFilterInChanged(i nt))); | connect(m_filter, SIGNAL(inChanged(int)), &m_model, SLOT(onFilterInChanged(i nt))); | |||
emit newFilter(); | emit newFilter(); | |||
} | } | |||
bool KeyframesDock::event(QEvent *event) | bool KeyframesDock::event(QEvent *event) | |||
{ | { | |||
bool result = QDockWidget::event(event); | bool result = QDockWidget::event(event); | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |