X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fgeometrywidget.cpp;h=7b2bca0950d50ab4be97f7eea1f0284e5b00b250;hb=8057b2842a6aa46dc60cba6e0c15fb3281e10d3b;hp=ed9dd5eb60a5b33922262008523fc6da2e4d1b81;hpb=297e484a74fe72ebd1bcf346d82f208b03bde0b6;p=kdenlive diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp index ed9dd5eb..7b2bca09 100644 --- a/src/geometrywidget.cpp +++ b/src/geometrywidget.cpp @@ -24,15 +24,18 @@ #include "keyframehelper.h" #include "timecodedisplay.h" #include "monitorscene.h" +#include "monitorscenecontrolwidget.h" +#include "onmonitoritems/onmonitorrectitem.h" #include "kdenlivesettings.h" #include #include -#include #include #include -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)), @@ -120,37 +123,13 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, 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())); @@ -161,10 +140,12 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, 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); } @@ -185,9 +166,9 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra m_outPoint = maxframe; if (m_geometry) - m_geometry->parse(elem.attribute("value").toUtf8().data(), 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(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->renderWidth(), m_monitor->render->renderHeight()); + 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" || maxframe < minframe) { // Keyframes are disabled @@ -207,15 +188,9 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra 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); @@ -248,12 +223,14 @@ void GeometryWidget::slotPositionChanged(int pos, bool seek) 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")); @@ -326,7 +303,7 @@ void GeometryWidget::slotPreviousKeyframe() // 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); @@ -358,7 +335,7 @@ 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 to ways here. + therefore we need two ways here. */ if (m_isEffect) { emit checkMonitorPosition(renderPos); @@ -378,6 +355,7 @@ void GeometryWidget::slotUpdateGeometry() { 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; @@ -398,7 +376,7 @@ void GeometryWidget::slotUpdateProperties() 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); @@ -450,7 +428,7 @@ void GeometryWidget::slotSetHeight(int value) 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(); } @@ -481,13 +459,13 @@ void GeometryWidget::slotMoveLeft() 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(); }