MonitorEditWidget *edit = monitor->getEffectEdit();
edit->removeCustomControls();
edit->addCustomButton(KIcon("transform-crop"), i18n("Show previous keyframe"), this, SLOT(slotShowPreviousKeyFrame(bool)), true, KdenliveSettings::onmonitoreffects_geometryshowprevious());
- edit->showVisibilityButton(true);
m_scene = edit->getScene();
-
+ m_scene->cleanup();
/*
Setup of timeline and keyframe controls
m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
m_ui.buttonSync->setIconSize(iconSize);
- connect(m_timeline, SIGNAL(positionChanged(int)), this, SLOT(slotPositionChanged(int)));
+ connect(m_timeline, SIGNAL(requestSeek(int)), this, SLOT(slotRequestSeek(int)));
connect(m_timeline, SIGNAL(keyframeMoved(int)), this, SLOT(slotKeyframeMoved(int)));
connect(m_timeline, SIGNAL(addKeyframe(int)), this, SLOT(slotAddKeyframe(int)));
connect(m_timeline, SIGNAL(removeKeyframe(int)), this, SLOT(slotDeleteKeyframe(int)));
m_spinHeight = new DragValue(i18nc("Frame height", "H"), m_monitor->render->renderHeight(), 0, 1, 99000, -1, QString(), false, this);
m_ui.horizontalLayout->addWidget(m_spinHeight, 0, 3);
+ m_ui.horizontalLayout->setColumnStretch(4, 10);
+
QMenu *menu = new QMenu(this);
QAction *adjustSize = new QAction(i18n("Adjust to original size"), this);
connect(adjustSize, SIGNAL(triggered()), this, SLOT(slotAdjustToFrameSize()));
connect(m_spinWidth, SIGNAL(valueChanged(double)), this, SLOT(slotSetWidth(double)));
connect(m_spinHeight, SIGNAL(valueChanged(double)), this, SLOT(slotSetHeight(double)));
- connect(m_spinSize, SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
+ connect(m_spinSize, SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
connect(m_opacity, SIGNAL(valueChanged(double)), this, SLOT(slotSetOpacity(double)));
Setup of configuration controls
*/
- connect(edit, SIGNAL(showEdit(bool)), this, SLOT(slotShowScene(bool)));
-
connect(m_scene, SIGNAL(addKeyframe()), this, SLOT(slotAddKeyframe()));
connect(this, SIGNAL(parameterChanged()), this, SLOT(slotUpdateProperties()));
}
Mlt::Geometry *g = m_extraGeometries.takeFirst();
delete g;
}
- if (m_monitor) {
- m_monitor->getEffectEdit()->showVisibilityButton(false);
- }
}
void GeometryWidget::slotShowPreviousKeyFrame(bool show)
QStringList list = val.split(';', QString::SkipEmptyParts);
val.clear();
val.append(list.takeFirst().section('/', 0, 0));
- foreach (const QString value, list) {
+ foreach (const QString &value, list) {
val.append(';' + value.section('/', 0, 0));
}
}
{
m_inPoint = minframe;
m_outPoint = maxframe;
- m_scene->cleanup();
if (m_geometry)
m_geometry->parse(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
connect(m_rect, SIGNAL(changed()), this, SLOT(slotUpdateGeometry()));
m_scene->centerView();
slotPositionChanged(0, false);
- slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
}
void GeometryWidget::addParameter(const QDomElement elem)
}
}
+void GeometryWidget::slotRequestSeek(int pos)
+{
+ if (KdenliveSettings::transitionfollowcursor())
+ emit seekToPos(m_clipPos + pos);
+}
+
void GeometryWidget::slotPositionChanged(int pos, bool seek)
{
else
m_timePos->setValue(pos);
- m_timeline->blockSignals(true);
+ //m_timeline->blockSignals(true);
m_timeline->setValue(pos);
- m_timeline->blockSignals(false);
+ //m_timeline->blockSignals(false);
Mlt::GeometryItem item;
Mlt::GeometryItem previousItem;
}
-void GeometryWidget::slotCheckMonitorPosition(int renderPos)
-{
- if (m_showScene) {
- /*
- We do only get the position in timeline if this geometry belongs to a transition,
- therefore we need two ways here.
- */
- if (m_isEffect) {
- emit checkMonitorPosition(renderPos);
- } else {
- if (renderPos >= m_clipPos && renderPos <= m_clipPos + m_outPoint - m_inPoint) {
- if (!m_scene->views().at(0)->isVisible())
- m_monitor->slotShowEffectScene(true);
- } else {
- m_monitor->slotShowEffectScene(false);
- }
- }
- }
-}
-
void GeometryWidget::slotUpdateGeometry()
{
emit seekToPos(m_clipPos + m_timePos->getValue());
}
-void GeometryWidget::slotShowScene(bool show)
-{
- m_showScene = show;
- if (!m_showScene)
- m_monitor->slotShowEffectScene(false);
- else
- slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
-}
-
void GeometryWidget::setFrameSize(QPoint size)
{
m_frameSize = size;