#include "keyframehelper.h"
#include "timecodedisplay.h"
#include "monitorscene.h"
-#include "monitorscenecontrolwidget.h"
+#include "monitoreditwidget.h"
#include "onmonitoritems/onmonitorrectitem.h"
#include "kdenlivesettings.h"
+#include "dragvalue.h"
#include <QtCore>
#include <QGraphicsView>
#include <QVBoxLayout>
#include <QGridLayout>
+#include <QMenu>
-GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, bool disabled, QWidget* parent):
+GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, QWidget* parent):
QWidget(parent),
m_monitor(monitor),
m_timePos(new TimecodeDisplay(timecode)),
m_showScene(true)
{
m_ui.setupUi(this);
- m_scene = monitor->getEffectScene();
+ setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+ MonitorEditWidget *edit = monitor->getEffectEdit();
+ edit->showVisibilityButton(true);
+ m_scene = edit->getScene();
/*
connect(m_ui.buttonAddDelete, SIGNAL(clicked()), this, SLOT(slotAddDeleteKeyframe()));
connect(m_ui.buttonSync, SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
-
+ m_spinX = new DragValue(i18n("X"), 0, 0, -1, QString(), false, this);
+ m_spinX->setRange(-10000, 10000);
+ m_ui.horizontalLayout->addWidget(m_spinX);
+
+ m_spinY = new DragValue(i18n("Y"), 0, 0, -1, QString(), false, this);
+ m_spinY->setRange(-10000, 10000);
+ m_ui.horizontalLayout->addWidget(m_spinY);
+
+ m_spinWidth = new DragValue(i18n("W"), m_monitor->render->frameRenderWidth(), 0, -1, QString(), false, this);
+ m_spinWidth->setRange(1, 10000);
+ m_ui.horizontalLayout->addWidget(m_spinWidth);
+
+ m_spinHeight = new DragValue(i18n("H"), m_monitor->render->renderHeight(), 0, -1, QString(), false, this);
+ m_spinHeight->setRange(1, 10000);
+ m_ui.horizontalLayout->addWidget(m_spinHeight);
+ m_ui.horizontalLayout->addStretch(10);
+
+ m_spinSize = new DragValue(i18n("Size"), 100, 2, -1, i18n("%"), false, this);
+ m_spinSize->setRange(1, 10000);
+ m_ui.horizontalLayout2->addWidget(m_spinSize);
+
+ m_opacity = new DragValue(i18n("Opacity"), 100, 0, -1, i18n("%"), true, this);
+ m_ui.horizontalLayout2->addWidget(m_opacity);
+
/*
Setup of geometry controls
*/
- m_ui.buttonMoveLeft->setIcon(KIcon("kdenlive-align-left"));
- m_ui.buttonMoveLeft->setToolTip(i18n("Move to left"));
- m_ui.buttonCenterH->setIcon(KIcon("kdenlive-align-hor"));
- m_ui.buttonCenterH->setToolTip(i18n("Center horizontally"));
- m_ui.buttonMoveRight->setIcon(KIcon("kdenlive-align-right"));
- m_ui.buttonMoveRight->setToolTip(i18n("Move to right"));
- m_ui.buttonMoveTop->setIcon(KIcon("kdenlive-align-top"));
- m_ui.buttonMoveTop->setToolTip(i18n("Move to top"));
- m_ui.buttonCenterV->setIcon(KIcon("kdenlive-align-vert"));
- m_ui.buttonCenterV->setToolTip(i18n("Center vertically"));
- m_ui.buttonMoveBottom->setIcon(KIcon("kdenlive-align-bottom"));
- m_ui.buttonMoveBottom->setToolTip(i18n("Move to bottom"));
-
- connect(m_ui.spinX, SIGNAL(valueChanged(int)), this, SLOT(slotSetX(int)));
- connect(m_ui.spinY, SIGNAL(valueChanged(int)), this, SLOT(slotSetY(int)));
- connect(m_ui.spinWidth, SIGNAL(valueChanged(int)), this, SLOT(slotSetWidth(int)));
- connect(m_ui.spinHeight, SIGNAL(valueChanged(int)), this, SLOT(slotSetHeight(int)));
-
- connect(m_ui.spinSize, SIGNAL(valueChanged(int)), this, SLOT(slotResize(int)));
-
- connect(m_ui.spinOpacity, SIGNAL(valueChanged(int)), this, SLOT(slotSetOpacity(int)));
- connect(m_ui.sliderOpacity, SIGNAL(valueChanged(int)), m_ui.spinOpacity, SLOT(setValue(int)));
-
- connect(m_ui.buttonMoveLeft, SIGNAL(clicked()), this, SLOT(slotMoveLeft()));
+ connect(m_spinX, SIGNAL(valueChanged(int)), this, SLOT(slotSetX(int)));
+ connect(m_spinY, SIGNAL(valueChanged(int)), this, SLOT(slotSetY(int)));
+ connect(m_spinWidth, SIGNAL(valueChanged(int)), this, SLOT(slotSetWidth(int)));
+ connect(m_spinHeight, SIGNAL(valueChanged(int)), this, SLOT(slotSetHeight(int)));
+
+ connect(m_spinSize, SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
+
+ connect(m_opacity, SIGNAL(valueChanged(int)), this, SLOT(slotSetOpacity(int)));
+
+ QMenu *menu = new QMenu(this);
+ QAction *adjustSize = new QAction(i18n("Adjust to original size"), this);
+ connect(adjustSize, SIGNAL(triggered()), this, SLOT(slotAdjustToFrameSize()));
+ menu->addAction(adjustSize);
+ QAction *fitToWidth = new QAction(i18n("Fit to width"), this);
+ connect(fitToWidth, SIGNAL(triggered()), this, SLOT(slotFitToWidth()));
+ menu->addAction(fitToWidth);
+ QAction *fitToHeight = new QAction(i18n("Fit to height"), this);
+ connect(fitToHeight, SIGNAL(triggered()), this, SLOT(slotFitToHeight()));
+ menu->addAction(fitToHeight);
+ menu->addSeparator();
+
+ QAction *alignleft = new QAction(KIcon("kdenlive-align-left"), i18n("Align left"), this);
+ connect(alignleft, SIGNAL(triggered()), this, SLOT(slotMoveLeft()));
+ menu->addAction(alignleft);
+ QAction *alignhcenter = new QAction(KIcon("kdenlive-align-hor"), i18n("Center horizontally"), this);
+ connect(alignhcenter, SIGNAL(triggered()), this, SLOT(slotCenterH()));
+ menu->addAction(alignhcenter);
+ QAction *alignright = new QAction(KIcon("kdenlive-align-right"), i18n("Align right"), this);
+ connect(alignright, SIGNAL(triggered()), this, SLOT(slotMoveRight()));
+ menu->addAction(alignright);
+ QAction *aligntop = new QAction(KIcon("kdenlive-align-top"), i18n("Align top"), this);
+ connect(aligntop, SIGNAL(triggered()), this, SLOT(slotMoveTop()));
+ menu->addAction(aligntop);
+ QAction *alignvcenter = new QAction(KIcon("kdenlive-align-vert"), i18n("Center vertically"), this);
+ connect(alignvcenter, SIGNAL(triggered()), this, SLOT(slotCenterV()));
+ menu->addAction(alignvcenter);
+ QAction *alignbottom = new QAction(KIcon("kdenlive-align-bottom"), i18n("Align bottom"), this);
+ connect(alignbottom, SIGNAL(triggered()), this, SLOT(slotMoveBottom()));
+ menu->addAction(alignbottom);
+ m_ui.buttonOptions->setMenu(menu);
+
+ /*connect(m_ui.buttonMoveLeft, SIGNAL(clicked()), this, SLOT(slotMoveLeft()));
connect(m_ui.buttonCenterH, SIGNAL(clicked()), this, SLOT(slotCenterH()));
connect(m_ui.buttonMoveRight, SIGNAL(clicked()), this, SLOT(slotMoveRight()));
connect(m_ui.buttonMoveTop, SIGNAL(clicked()), this, SLOT(slotMoveTop()));
connect(m_ui.buttonCenterV, SIGNAL(clicked()), this, SLOT(slotCenterV()));
- connect(m_ui.buttonMoveBottom, SIGNAL(clicked()), this, SLOT(slotMoveBottom()));
+ connect(m_ui.buttonMoveBottom, SIGNAL(clicked()), this, SLOT(slotMoveBottom()));*/
/*
Setup of configuration controls
*/
- 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)));
- slotShowScene(!disabled);
-
+ connect(edit, SIGNAL(showEdit(bool)), this, SLOT(slotShowScene(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()));
m_scene->setEnabled(true);
delete m_timePos;
delete m_timeline;
+ delete m_spinX;
+ delete m_spinY;
+ delete m_spinWidth;
+ delete m_spinHeight;
+ delete m_opacity;
m_scene->removeItem(m_rect);
delete m_geometry;
- delete m_config;
- if (m_monitor)
+ if (m_monitor) {
+ m_monitor->getEffectEdit()->showVisibilityButton(false);
m_monitor->slotEffectScene(false);
+ }
}
void GeometryWidget::updateTimecodeFormat()
}
// no opacity
- if (elem.attribute("opacity") == "false")
- m_ui.widgetOpacity->setHidden(true);
+ if (elem.attribute("opacity") == "false") {
+ m_opacity->setHidden(true);
+ m_ui.horizontalLayout2->addStretch(2);
+ }
Mlt::GeometryItem item;
m_geometry->fetch(&item, 0);
delete m_rect;
- m_rect = new OnMonitorRectItem(QRectF(0, 0, item.w(), item.h()), m_scene);
+ m_rect = new OnMonitorRectItem(QRectF(0, 0, item.w(), item.h()), m_monitor->render->dar());
m_rect->setPos(item.x(), item.y());
m_rect->setZValue(0);
m_scene->addItem(m_rect);
+ connect(m_rect, SIGNAL(changed()), this, SLOT(slotUpdateGeometry()));
slotPositionChanged(0, false);
slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
{
// do only sync if this effect is keyframable
if (m_timePos->maximum() > 0 && KdenliveSettings::transitionfollowcursor()) {
- relTimelinePos = qMax(0, relTimelinePos);
- relTimelinePos = qMin(relTimelinePos, m_timePos->maximum());
+ relTimelinePos = qBound(0, relTimelinePos, m_timePos->maximum());
if (relTimelinePos != m_timePos->getValue())
slotPositionChanged(relTimelinePos, false);
}
m_rect->setPos(item.x(), item.y());
m_rect->setRect(0, 0, item.w(), item.h());
- m_ui.spinOpacity->blockSignals(true);
- m_ui.sliderOpacity->blockSignals(true);
- m_ui.spinOpacity->setValue(item.mix());
- m_ui.sliderOpacity->setValue(item.mix());
- m_ui.spinOpacity->blockSignals(false);
- m_ui.sliderOpacity->blockSignals(false);
+ m_opacity->blockSignals(true);
+ m_opacity->setValue(item.mix());
+ m_opacity->blockSignals(false);
slotUpdateProperties();
item.y(rectpos.y());
item.w(r.width());
item.h(r.height());
- item.mix(m_ui.spinOpacity->value());
+ item.mix(m_opacity->value());
m_geometry->insert(item);
m_timeline->update();
{
QRectF rectSize = m_rect->rect().normalized();
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->frameRenderWidth()) + 0.5);
+ double size;
+ if (rectSize.width() / m_monitor->render->dar() > rectSize.height())
+ size = rectSize.width() * 100.0 / m_monitor->render->frameRenderWidth();
else
- size = (int)((rectSize.height() * 100.0 / m_monitor->render->renderHeight()) + 0.5);
-
- m_ui.spinX->blockSignals(true);
- m_ui.spinY->blockSignals(true);
- m_ui.spinWidth->blockSignals(true);
- m_ui.spinHeight->blockSignals(true);
- m_ui.spinSize->blockSignals(true);
-
- m_ui.spinX->setValue(rectPos.x());
- m_ui.spinY->setValue(rectPos.y());
- m_ui.spinWidth->setValue(rectSize.width());
- m_ui.spinHeight->setValue(rectSize.height());
- m_ui.spinSize->setValue(size);
-
- m_ui.spinX->blockSignals(false);
- m_ui.spinY->blockSignals(false);
- m_ui.spinWidth->blockSignals(false);
- m_ui.spinHeight->blockSignals(false);
- m_ui.spinSize->blockSignals(false);
+ size = rectSize.height() * 100.0 / m_monitor->render->renderHeight();
+
+ m_spinX->blockSignals(true);
+ m_spinY->blockSignals(true);
+ m_spinWidth->blockSignals(true);
+ m_spinHeight->blockSignals(true);
+ m_spinSize->blockSignals(true);
+
+ m_spinX->setValue(rectPos.x());
+ m_spinY->setValue(rectPos.y());
+ m_spinWidth->setValue(rectSize.width());
+ m_spinHeight->setValue(rectSize.height());
+ m_spinSize->setValue(size);
+
+ m_spinX->blockSignals(false);
+ m_spinY->blockSignals(false);
+ m_spinWidth->blockSignals(false);
+ m_spinHeight->blockSignals(false);
+ m_spinSize->blockSignals(false);
}
void GeometryWidget::slotSetX(int value)
{
- m_rect->setPos(value, m_ui.spinY->value());
+ m_rect->setPos(value, m_spinY->value());
slotUpdateGeometry();
}
void GeometryWidget::slotSetY(int value)
{
- m_rect->setPos(m_ui.spinX->value(), value);
+ m_rect->setPos(m_spinX->value(), value);
slotUpdateGeometry();
}
void GeometryWidget::slotSetWidth(int value)
{
- m_rect->setRect(0, 0, value, m_ui.spinHeight->value());
+ m_rect->setRect(0, 0, value, m_spinHeight->value());
slotUpdateGeometry();
}
void GeometryWidget::slotSetHeight(int value)
{
- m_rect->setRect(0, 0, m_ui.spinWidth->value(), value);
+ m_rect->setRect(0, 0, m_spinWidth->value(), value);
slotUpdateGeometry();
}
-void GeometryWidget::slotResize(int value)
+void GeometryWidget::slotResize(double value)
{
m_rect->setRect(0, 0,
(int)((m_monitor->render->frameRenderWidth() * value / 100.0) + 0.5),
void GeometryWidget::slotSetOpacity(int value)
{
- m_ui.sliderOpacity->blockSignals(true);
- m_ui.sliderOpacity->setValue(value);
- m_ui.sliderOpacity->blockSignals(false);
-
int pos = m_timePos->getValue();
Mlt::GeometryItem item;
if (m_geometry->fetch(&item, pos) || item.key() == false)
return;
item.mix(value);
m_geometry->insert(item);
-
emit parameterChanged();
}
slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
}
+void GeometryWidget::setFrameSize(QPoint size)
+{
+ m_frameSize = size;
+}
+
+void GeometryWidget::slotAdjustToFrameSize()
+{
+ if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+ m_spinWidth->setValue((int) (m_frameSize.x() / m_monitor->render->sar() + 0.5));
+ m_spinHeight->setValue(m_frameSize.y());
+}
+
+void GeometryWidget::slotFitToWidth()
+{
+ if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+ double factor = (double) m_monitor->render->frameRenderWidth() / m_frameSize.x() * m_monitor->render->sar();
+ m_spinHeight->setValue((int) (m_frameSize.y() * factor + 0.5));
+ m_spinWidth->setValue(m_monitor->render->frameRenderWidth());
+}
+
+void GeometryWidget::slotFitToHeight()
+{
+ if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+ double factor = (double) m_monitor->render->renderHeight() / m_frameSize.y();
+ m_spinHeight->setValue(m_monitor->render->renderHeight());
+ m_spinWidth->setValue((int) (m_frameSize.x() / m_monitor->render->sar() * factor + 0.5));
+}
+
#include "geometrywidget.moc"
projects / kdenlive / blobdiff