#include "keyframehelper.h"
#include "timecodedisplay.h"
#include "monitorscene.h"
+#include "monitorscenecontrolwidget.h"
+#include "onmonitoritems/onmonitorrectitem.h"
#include "kdenlivesettings.h"
#include <QtCore>
#include <QGraphicsView>
-#include <QGraphicsRectItem>
#include <QVBoxLayout>
#include <QGridLayout>
-GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, QWidget* parent ):
+
+
+GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, QWidget* parent):
QWidget(parent),
m_monitor(monitor),
m_timePos(new TimecodeDisplay(timecode)),
Setup of configuration controls
*/
- m_ui.buttonConfig->setIcon(KIcon("system-run"));
- m_ui.buttonConfig->setToolTip(i18n("Show/Hide settings"));
- m_ui.groupSettings->setHidden(true);
-
- m_ui.buttonShowScene->setIcon(KIcon("video-display"));
- m_ui.buttonShowScene->setToolTip(i18n("Show monitor scene"));
- m_ui.buttonDirectUpdate->setIcon(KIcon("transform-scale"));
- m_ui.buttonDirectUpdate->setToolTip(i18n("Update parameters while monitor scene changes"));
- m_ui.buttonDirectUpdate->setChecked(KdenliveSettings::monitorscene_directupdate());
-
- m_ui.buttonZoomFit->setIcon(KIcon("zoom-fit-best"));
- m_ui.buttonZoomFit->setToolTip(i18n("Fit zoom to monitor size"));
- m_ui.buttonZoomOriginal->setIcon(KIcon("zoom-original"));
- m_ui.buttonZoomOriginal->setToolTip(i18n("Original size"));
- m_ui.buttonZoomIn->setIcon(KIcon("zoom-in"));
- m_ui.buttonZoomIn->setToolTip(i18n("Zoom in"));
- m_ui.buttonZoomOut->setIcon(KIcon("zoom-out"));
- m_ui.buttonZoomOut->setToolTip(i18n("Zoom out"));
+ m_config = new MonitorSceneControlWidget(m_scene, m_ui.frameSettings);
+ QHBoxLayout *settingsLayout = new QHBoxLayout(m_ui.frameSettings);
+ settingsLayout->addWidget(m_config);
+ settingsLayout->setContentsMargins(0, 0, 0, 0);
+ ((QGridLayout *)m_ui.widgetConfigButton->layout())->addWidget(m_config->getShowHideButton(), 1, 1);
+ connect(m_config, SIGNAL(showScene(bool)), this, SLOT(slotShowScene(bool)));
- connect(m_ui.buttonConfig, SIGNAL(toggled(bool)), m_ui.groupSettings, SLOT(setVisible(bool)));
-
- connect(m_ui.sliderZoom, SIGNAL(valueChanged(int)), m_scene, SLOT(slotZoom(int)));
- connect(m_scene, SIGNAL(zoomChanged(int)), m_ui.sliderZoom, SLOT(setValue(int)));
- connect(m_ui.buttonZoomFit, SIGNAL(clicked()), m_scene, SLOT(slotZoomFit()));
- connect(m_ui.buttonZoomOriginal, SIGNAL(clicked()), m_scene, SLOT(slotZoomOriginal()));
- connect(m_ui.buttonZoomIn, SIGNAL(clicked()), m_scene, SLOT(slotZoomIn()));
- connect(m_ui.buttonZoomOut, SIGNAL(clicked()), m_scene, SLOT(slotZoomOut()));
- m_scene->slotZoomFit();
-
- connect(m_ui.buttonShowScene, SIGNAL(toggled(bool)), this, SLOT(slotShowScene(bool)));
- connect(m_ui.buttonDirectUpdate, SIGNAL(toggled(bool)), m_scene, SLOT(slotSetDirectUpdate(bool)));
connect(m_scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateGeometry()));
+ connect(m_scene, SIGNAL(addKeyframe()), this, SLOT(slotAddKeyframe()));
connect(m_monitor, SIGNAL(renderPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
connect(this, SIGNAL(parameterChanged()), this, SLOT(slotUpdateProperties()));
}
GeometryWidget::~GeometryWidget()
{
+ m_scene->setEnabled(true);
delete m_timePos;
delete m_timeline;
m_scene->removeItem(m_rect);
delete m_geometry;
+ delete m_config;
if (m_monitor)
m_monitor->slotEffectScene(false);
}
m_inPoint = minframe;
m_outPoint = maxframe;
- char *tmp = (char *) qstrdup(elem.attribute("value").toUtf8().data());
if (m_geometry)
- m_geometry->parse(tmp, maxframe - minframe, m_monitor->render->renderWidth(), m_monitor->render->renderHeight());
+ m_geometry->parse(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
else
- m_geometry = new Mlt::Geometry(tmp, maxframe - minframe, m_monitor->render->renderWidth(), m_monitor->render->renderHeight());
- delete[] tmp;
+ m_geometry = new Mlt::Geometry(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
- if (elem.attribute("fixed") == "1") {
+ if (elem.attribute("fixed") == "1" || maxframe < minframe) {
// Keyframes are disabled
m_ui.widgetTimeWrapper->setHidden(true);
} else {
m_geometry->fetch(&item, 0);
delete m_rect;
- m_rect = new QGraphicsRectItem(QRectF(0, 0, item.w(), item.h()));
+ m_rect = new OnMonitorRectItem(QRectF(0, 0, item.w(), item.h()), m_scene);
m_rect->setPos(item.x(), item.y());
m_rect->setZValue(0);
- m_rect->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-
- QPen framepen(Qt::SolidLine);
- framepen.setColor(Qt::yellow);
- m_rect->setPen(framepen);
- m_rect->setBrush(Qt::transparent);
m_scene->addItem(m_rect);
slotPositionChanged(0, false);
Mlt::GeometryItem item;
if (m_geometry->fetch(&item, pos) || item.key() == false) {
// no keyframe
+ m_rect->setEnabled(false);
m_scene->setEnabled(false);
m_ui.widgetGeometry->setEnabled(false);
m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
m_ui.buttonAddDelete->setToolTip(i18n("Add keyframe"));
} else {
// keyframe
+ m_rect->setEnabled(true);
m_scene->setEnabled(true);
m_ui.widgetGeometry->setEnabled(true);
m_ui.buttonAddDelete->setIcon(KIcon("edit-delete"));
{
slotPositionChanged(pos);
slotUpdateGeometry();
+ QTimer::singleShot(100, this, SIGNAL(parameterChanged()));
}
void GeometryWidget::slotAddKeyframe(int pos)
// Go to start if no keyframe is found
int currentPos = m_timePos->getValue();
int pos = 0;
- if(!m_geometry->prev_key(&item, currentPos - 1) && item.frame() < currentPos)
+ if (!m_geometry->prev_key(&item, currentPos - 1) && item.frame() < currentPos)
pos = item.frame();
slotPositionChanged(pos);
if (m_showScene) {
/*
We do only get the position in timeline if this geometry belongs to a transition,
- therefore we need to ways here.
+ therefore we need two ways here.
*/
if (m_isEffect) {
emit checkMonitorPosition(renderPos);
{
Mlt::GeometryItem item;
int pos = m_timePos->getValue();
+
// get keyframe and make sure it is the correct one
if (m_geometry->next_key(&item, pos) || item.frame() != pos)
return;
QPointF rectPos = m_rect->pos();
int size;
if (rectSize.width() / m_monitor->render->dar() < rectSize.height())
- size = (int)((rectSize.width() * 100.0 / m_monitor->render->renderWidth()) + 0.5);
+ size = (int)((rectSize.width() * 100.0 / m_monitor->render->frameRenderWidth()) + 0.5);
else
size = (int)((rectSize.height() * 100.0 / m_monitor->render->renderHeight()) + 0.5);
void GeometryWidget::slotResize(int value)
{
m_rect->setRect(0, 0,
- (int)((m_monitor->render->renderWidth() * value / 100.0) + 0.5),
+ (int)((m_monitor->render->frameRenderWidth() * value / 100.0) + 0.5),
(int)((m_monitor->render->renderHeight() * value / 100.0) + 0.5));
slotUpdateGeometry();
}
void GeometryWidget::slotCenterH()
{
- m_rect->setPos((m_monitor->render->renderWidth() - m_rect->rect().width()) / 2, m_rect->pos().y());
+ m_rect->setPos((m_monitor->render->frameRenderWidth() - m_rect->rect().width()) / 2, m_rect->pos().y());
slotUpdateGeometry();
}
void GeometryWidget::slotMoveRight()
{
- m_rect->setPos(m_monitor->render->renderWidth() - m_rect->rect().width(), m_rect->pos().y());
+ m_rect->setPos(m_monitor->render->frameRenderWidth() - m_rect->rect().width(), m_rect->pos().y());
slotUpdateGeometry();
}
void GeometryWidget::slotSetSynchronize(bool sync)
{
KdenliveSettings::setTransitionfollowcursor(sync);
+ if (sync)
+ emit seekToPos(m_clipPos + m_timePos->getValue());
}
void GeometryWidget::slotShowScene(bool show)
projects / kdenlive / blobdiff