#include "graphicsscenerectmove.h"
#include "geometryval.h"
+#include "kdenlivesettings.h"
-Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile) {
+Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile), m_geom(NULL), m_path(NULL), paramRect(NULL), m_fixedMode(false) {
ui.setupUi(this);
QVBoxLayout* vbox = new QVBoxLayout(ui.widget);
QGraphicsView *view = new QGraphicsView(this);
scene->addItem(m_frameBorder);
ui.buttonNext->setIcon(KIcon("media-skip-forward"));
+ ui.buttonNext->setToolTip(i18n("Go to next keyframe"));
ui.buttonPrevious->setIcon(KIcon("media-skip-backward"));
+ ui.buttonPrevious->setToolTip(i18n("Go to previous keyframe"));
ui.buttonAdd->setIcon(KIcon("document-new"));
+ ui.buttonAdd->setToolTip(i18n("Add keyframe"));
ui.buttonDelete->setIcon(KIcon("edit-delete"));
+ ui.buttonDelete->setToolTip(i18n("Delete keyframe"));
QMenu *configMenu = new QMenu(i18n("Misc..."), this);
ui.buttonMenu->setIcon(KIcon("system-run"));
ui.buttonMenu->setMenu(configMenu);
ui.buttonMenu->setPopupMode(QToolButton::QToolButton::InstantPopup);
+
+ m_scaleMenu = new QMenu(i18n("Resize..."), this);
+ configMenu->addMenu(m_scaleMenu);
+ m_scaleMenu->addAction(i18n("50%"), this, SLOT(slotResize50()));
+ m_scaleMenu->addAction(i18n("100%"), this, SLOT(slotResize100()));
+ m_scaleMenu->addAction(i18n("200%"), this, SLOT(slotResize200()));
+
+
+ m_alignMenu = new QMenu(i18n("Align..."), this);
+ configMenu->addMenu(m_alignMenu);
+ m_alignMenu->addAction(i18n("Center"), this, SLOT(slotAlignCenter()));
+ m_alignMenu->addAction(i18n("Hor. Center"), this, SLOT(slotAlignHCenter()));
+ m_alignMenu->addAction(i18n("Vert. Center"), this, SLOT(slotAlignVCenter()));
+ m_alignMenu->addAction(i18n("Right"), this, SLOT(slotAlignRight()));
+ m_alignMenu->addAction(i18n("Left"), this, SLOT(slotAlignLeft()));
+ m_alignMenu->addAction(i18n("Top"), this, SLOT(slotAlignTop()));
+ m_alignMenu->addAction(i18n("Bottom"), this, SLOT(slotAlignBottom()));
+
+
+ m_syncAction = configMenu->addAction(i18n("Sync timeline cursor"), this, SLOT(slotSyncCursor()));
+ m_syncAction->setCheckable(true);
+ m_syncAction->setChecked(KdenliveSettings::transitionfollowcursor());
+
//scene->setSceneRect(0, 0, profile.width * 2, profile.height * 2);
//view->fitInView(m_frameBorder, Qt::KeepAspectRatio);
const double sc = 100.0 / profile.height * 0.8;
QRectF srect = view->sceneRect();
- view->setSceneRect(srect.x(), -srect.height() / 2, srect.width(), srect.height() * 2);
- view->scale(sc, sc);
+ view->setSceneRect(srect.x(), -srect.height() / 3, srect.width(), srect.height() + srect.height() / 3 * 2);
+ scene->setZoom(sc);
view->centerOn(m_frameBorder);
connect(ui.buttonNext , SIGNAL(clicked()) , this , SLOT(slotNextFrame()));
connect(ui.buttonPrevious , SIGNAL(clicked()) , this , SLOT(slotPreviousFrame()));
connect(ui.buttonDelete , SIGNAL(clicked()) , this , SLOT(slotDeleteFrame()));
connect(ui.buttonAdd , SIGNAL(clicked()) , this , SLOT(slotAddFrame()));
+ connect(scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateTransitionProperties()));
+}
+
+void Geometryval::slotAlignCenter() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos((m_profile.width - paramRect->rect().width()) / 2, (m_profile.height - paramRect->rect().height()) / 2);
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotAlignHCenter() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos((m_profile.width - paramRect->rect().width()) / 2, paramRect->pos().y());
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotAlignVCenter() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos(paramRect->pos().x(), (m_profile.height - paramRect->rect().height()) / 2);
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotAlignTop() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos(paramRect->pos().x(), 0);
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotAlignBottom() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos(paramRect->pos().x(), m_profile.height - paramRect->rect().height());
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotAlignLeft() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos(0, paramRect->pos().y());
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotAlignRight() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setPos(m_profile.width - paramRect->rect().width(), paramRect->pos().y());
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotResize50() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setRect(0, 0, m_profile.width / 2, m_profile.height / 2);
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotResize100() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setRect(0, 0, m_profile.width, m_profile.height);
+ slotUpdateTransitionProperties();
+}
+
+void Geometryval::slotResize200() {
+ int pos = ui.spinPos->value();
+ Mlt::GeometryItem item;
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
+ // no keyframe under cursor
+ return;
+ }
+ paramRect->setRect(0, 0, m_profile.width * 2, m_profile.height * 2);
+ slotUpdateTransitionProperties();
}
void Geometryval::slotTransparencyChanged(int transp) {
int pos = ui.spinPos->value();
Mlt::GeometryItem item;
- int error = m_geom->next_key(&item, pos);
- if (error || item.frame() != pos) {
+ int error = m_geom->fetch(&item, pos);
+ if (error || item.key() == false) {
// no keyframe under cursor
return;
}
emit parameterChanged();
}
-void Geometryval::slotPositionChanged(int pos) {
+void Geometryval::slotSyncCursor() {
+ KdenliveSettings::setTransitionfollowcursor(m_syncAction->isChecked());
+}
+
+void Geometryval::slotPositionChanged(int pos, bool seek) {
+ if (seek && KdenliveSettings::transitionfollowcursor()) emit seekToPos(pos);
ui.spinPos->setValue(pos);
m_helper->setValue(pos);
Mlt::GeometryItem item;
ui.buttonDelete->setEnabled(false);
ui.widget->setEnabled(false);
ui.spinTransp->setEnabled(false);
+ m_scaleMenu->setEnabled(false);
+ m_alignMenu->setEnabled(false);
} else {
ui.buttonAdd->setEnabled(false);
ui.buttonDelete->setEnabled(true);
ui.widget->setEnabled(true);
ui.spinTransp->setEnabled(true);
+ m_scaleMenu->setEnabled(true);
+ m_alignMenu->setEnabled(true);
}
paramRect->setPos(item.x(), item.y());
paramRect->setRect(0, 0, item.w(), item.h());
void Geometryval::slotDeleteFrame() {
m_geom->remove(ui.spinPos->value());
+ ui.buttonAdd->setEnabled(true);
+ ui.buttonDelete->setEnabled(false);
+ ui.widget->setEnabled(false);
+ ui.spinTransp->setEnabled(false);
+ m_scaleMenu->setEnabled(false);
+ m_alignMenu->setEnabled(false);
m_helper->update();
}
ui.buttonDelete->setEnabled(true);
ui.widget->setEnabled(true);
ui.spinTransp->setEnabled(true);
+ m_scaleMenu->setEnabled(true);
+ m_alignMenu->setEnabled(true);
m_helper->update();
}
void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame) {
param = par;
QString val = par.attribute("value");
+ if (par.attribute("fixed") == "1") {
+ m_fixedMode = true;
+ }
char *tmp = (char *) qstrdup(val.toUtf8().data());
- m_geom = new Mlt::Geometry(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
+ if (m_geom) m_geom->parse(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
+ else m_geom = new Mlt::Geometry(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
delete[] tmp;
- kDebug() << " / / UPDATING TRANSITION VALUE: " << m_geom->serialise();
- //read param her and set rect
- m_helper->setKeyGeometry(m_geom, maxFrame - minFrame - 1);
- QDomDocument doc;
- doc.appendChild(doc.importNode(par, true));
- kDebug() << "IMPORTED TRANS: " << doc.toString();
- ui.spinPos->setMaximum(maxFrame - minFrame - 1);
- Mlt::GeometryItem item;
- m_path = new QGraphicsPathItem();
- m_path->setPen(QPen(Qt::red));
- updateTransitionPath();
- connect(scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateTransitionProperties()));
+ //kDebug() << " / / UPDATING TRANSITION VALUE: " << m_geom->serialise();
+ //read param her and set rect
+ if (m_fixedMode) {
+ m_helper->setHidden(true);
+ ui.spinPos->setHidden(true);
+ } else {
+ m_helper->setKeyGeometry(m_geom, maxFrame - minFrame - 1);
+ m_helper->update();
+ /*QDomDocument doc;
+ doc.appendChild(doc.importNode(par, true));
+ kDebug() << "IMPORTED TRANS: " << doc.toString();*/
+ ui.spinPos->setMaximum(maxFrame - minFrame - 1);
+ if (m_path == NULL) {
+ m_path = new QGraphicsPathItem();
+ m_path->setPen(QPen(Qt::red));
+ scene->addItem(m_path);
+ }
+ updateTransitionPath();
+ }
+ Mlt::GeometryItem item;
m_geom->fetch(&item, 0);
+ if (paramRect) delete paramRect;
paramRect = new QGraphicsRectItem(QRectF(0, 0, item.w(), item.h()));
paramRect->setPos(item.x(), item.y());
paramRect->setZValue(0);
paramRect->setPen(QPen(QBrush(QColor(255, 0, 0, 255)), 1.0));
scene->addItem(paramRect);
- scene->addItem(m_path);
- slotPositionChanged(0);
- connect(ui.spinPos, SIGNAL(valueChanged(int)), this , SLOT(slotPositionChanged(int)));
- connect(ui.spinTransp, SIGNAL(valueChanged(int)), this , SLOT(slotTransparencyChanged(int)));
+ slotPositionChanged(0, false);
+ if (!m_fixedMode) {
+ connect(ui.spinPos, SIGNAL(valueChanged(int)), this , SLOT(slotPositionChanged(int)));
+ connect(ui.spinTransp, SIGNAL(valueChanged(int)), this , SLOT(slotTransparencyChanged(int)));
+ }
}
void Geometryval::updateTransitionPath() {
+ if (m_fixedMode) return;
Mlt::GeometryItem item;
int pos = 0;
int counter = 0;
projects / kdenlive / blobdiff