Setup of timeline and keyframe controls
*/
- ((QGridLayout *)(m_ui.widgetTimeWrapper->layout()))->addWidget(m_timePos, 1, 6);
+ ((QGridLayout *)(m_ui.widgetTimeWrapper->layout()))->addWidget(m_timePos, 1, 5);
QVBoxLayout *layout = new QVBoxLayout(m_ui.frameTimeline);
m_timeline = new KeyframeHelper(m_ui.frameTimeline);
m_ui.buttonNext->setIcon(KIcon("media-skip-forward"));
m_ui.buttonNext->setToolTip(i18n("Go to next keyframe"));
m_ui.buttonNext->setIconSize(iconSize);
- m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
+ m_ui.buttonAddDelete->setIcon(KIcon("list-add"));
m_ui.buttonAddDelete->setToolTip(i18n("Add keyframe"));
m_ui.buttonAddDelete->setIconSize(iconSize);
- m_ui.buttonSync->setIcon(KIcon("insert-link"));
- m_ui.buttonSync->setToolTip(i18n("Synchronize with timeline cursor"));
- m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
- m_ui.buttonSync->setIconSize(iconSize);
-
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_ui.buttonPrevious, SIGNAL(clicked()), this, SLOT(slotPreviousKeyframe()));
connect(m_ui.buttonNext, SIGNAL(clicked()), this, SLOT(slotNextKeyframe()));
connect(m_ui.buttonAddDelete, SIGNAL(clicked()), this, SLOT(slotAddDeleteKeyframe()));
- connect(m_ui.buttonSync, SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
m_spinX = new DragValue(i18nc("x axis position", "X"), 0, 0, -99000, 99000, -1, QString(), false, this);
m_ui.horizontalLayout->addWidget(m_spinX, 0, 0);
m_ui.horizontalLayout->setColumnStretch(4, 10);
QMenu *menu = new QMenu(this);
- QAction *adjustSize = new QAction(i18n("Adjust to original size"), this);
+ QAction *adjustSize = new QAction(KIcon("zoom-fit-best"), 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);
+ QAction *fitToWidth = new QAction(KIcon("zoom-fit-width"), i18n("Fit to width"), this);
connect(fitToWidth, SIGNAL(triggered()), this, SLOT(slotFitToWidth()));
- menu->addAction(fitToWidth);
- QAction *fitToHeight = new QAction(i18n("Fit to height"), this);
+ QAction *fitToHeight = new QAction(KIcon("zoom-fit-height"), i18n("Fit to height"), this);
connect(fitToHeight, SIGNAL(triggered()), this, SLOT(slotFitToHeight()));
- menu->addAction(fitToHeight);
- menu->addSeparator();
+
QAction *importKeyframes = new QAction(i18n("Import keyframes from clip"), this);
connect(importKeyframes, SIGNAL(triggered()), this, SIGNAL(importClipKeyframes()));
menu->addAction(importKeyframes);
+ QAction *resetKeyframes = new QAction(i18n("Reset keyframes"), this);
+ connect(resetKeyframes, SIGNAL(triggered()), this, SLOT(slotResetKeyframes()));
+ menu->addAction(resetKeyframes);
menu->addSeparator();
+
+ QAction *syncTimeline = new QAction(KIcon("insert-link"), i18n("Synchronize with timeline cursor"), this);
+ syncTimeline->setCheckable(true);
+ syncTimeline->setChecked(KdenliveSettings::transitionfollowcursor());
+ connect(syncTimeline, SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
+ menu->addAction(syncTimeline);
+
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);
+ m_ui.buttonOptions->setIcon(KIcon("configure"));
+ m_ui.buttonOptions->setToolTip(i18n("Options"));
+ m_ui.buttonOptions->setIconSize(iconSize);
QHBoxLayout *alignLayout = new QHBoxLayout;
alignLayout->setSpacing(0);
alignButton->setDefaultAction(alignbottom);
alignButton->setAutoRaise(true);
alignLayout->addWidget(alignButton);
+
+ alignButton = new QToolButton;
+ alignButton->setDefaultAction(adjustSize);
+ alignButton->setAutoRaise(true);
+ alignLayout->addWidget(alignButton);
+
+ alignButton = new QToolButton;
+ alignButton->setDefaultAction(fitToWidth);
+ alignButton->setAutoRaise(true);
+ alignLayout->addWidget(alignButton);
+
+ alignButton = new QToolButton;
+ alignButton->setDefaultAction(fitToHeight);
+ alignButton->setAutoRaise(true);
+ alignLayout->addWidget(alignButton);
alignLayout->addStretch(10);
m_ui.horizontalLayout->addLayout(alignLayout, 1, 0, 1, 4);
GeometryWidget::~GeometryWidget()
{
- m_scene->setEnabled(true);
+ m_scene->setEnabled(false);
delete m_timePos;
delete m_timeline;
delete m_spinX;
delete m_spinWidth;
delete m_spinHeight;
delete m_opacity;
- m_scene->removeItem(m_rect);
- m_scene->removeItem(m_geomPath);
- if (m_rect) delete m_rect;
- if (m_geomPath) delete m_geomPath;
+ if (m_rect) {
+ m_scene->removeItem(m_rect);
+ delete m_rect;
+ }
+ if (m_geomPath) {
+ m_scene->removeItem(m_geomPath);
+ delete m_geomPath;
+ }
if (m_previous) delete m_previous;
delete m_geometry;
m_extraGeometryNames.clear();
} else {
m_ui.widgetTimeWrapper->setHidden(false);
m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
- m_timeline->update();
m_timePos->setRange(0, m_outPoint - m_inPoint);
}
m_rect->setEnabled(false);
m_scene->setEnabled(false);
m_ui.widgetGeometry->setEnabled(false);
- m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
+ m_ui.buttonAddDelete->setIcon(KIcon("list-add"));
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"));
+ m_ui.buttonAddDelete->setIcon(KIcon("list-remove"));
m_ui.buttonAddDelete->setToolTip(i18n("Delete keyframe"));
}
}
m_timeline->update();
+ if (m_geomPath) m_geomPath->setPoints(m_geometry);
slotPositionChanged(pos, false);
emit parameterChanged();
}
updateMonitorGeometry();
}
-void GeometryWidget::importKeyframes(const QString &data)
+void GeometryWidget::slotResetKeyframes()
+{
+ // Delete existing keyframes
+ Mlt::GeometryItem item;
+ while (!m_geometry->next_key(&item, 1)) {
+ m_geometry->remove(item.frame());
+ }
+
+ // Create neutral first keyframe
+ item.frame(0);
+ item.x(0);
+ item.y(0);
+ item.w(m_monitor->render->frameRenderWidth());
+ item.h(m_monitor->render->renderHeight());
+ item.mix(100);
+ m_geometry->insert(item);
+ m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
+ if (m_geomPath) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
+ }
+ slotPositionChanged(-1, false);
+ emit parameterChanged();
+
+}
+
+void GeometryWidget::importKeyframes(const QString &data, int maximum)
{
QStringList list = data.split(';', QString::SkipEmptyParts);
+ if (list.isEmpty()) return;
QPoint screenSize = m_frameSize;
if (screenSize == QPoint() || screenSize.x() == 0 || screenSize.y() == 0) {
screenSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
}
- for (int i = 0; i < list.count(); i++) {
- Mlt::GeometryItem item;
+ // Clear existing keyframes
+ Mlt::GeometryItem item;
+
+ while (!m_geometry->next_key(&item, 0)) {
+ m_geometry->remove(item.frame());
+ }
+
+ int offset = 1;
+ if (maximum > 0 && list.count() > maximum) {
+ offset = list.count() / maximum;
+ }
+ for (int i = 0; i < list.count(); i += offset) {
QString geom = list.at(i);
if (geom.contains('=')) {
item.frame(geom.section('=', 0, 0).toInt());
+ geom = geom.section('=', 1);
}
- geom = geom.section('=', 1);
+ else item.frame(0);
if (geom.contains('/')) {
item.x(geom.section('/', 0, 0).toDouble());
item.y(geom.section('/', 1, 1).section(':', 0, 0).toDouble());
item.mix(100);
m_geometry->insert(item);
}
+ m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
+ if (m_geomPath) m_geomPath->setPoints(m_geometry);
+ slotPositionChanged(-1, false);
emit parameterChanged();
}
+
#include "geometrywidget.moc"
<rect>
<x>0</x>
<y>0</y>
- <width>129</width>
- <height>85</height>
+ <width>312</width>
+ <height>183</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>0</number>
</property>
- <item row="1" column="0">
- <widget class="QToolButton" name="buttonPrevious">
- <property name="text">
- <string>...</string>
+ <item row="1" column="3">
+ <widget class="QToolButton" name="buttonOptions">
+ <property name="popupMode">
+ <enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QToolButton" name="buttonNext">
+ <item row="1" column="4">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <widget class="QToolButton" name="buttonAddDelete">
<property name="text">
<string>...</string>
</property>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QToolButton" name="buttonAddDelete">
+ <item row="1" column="5">
+ <widget class="QFrame" name="frameTimePos"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QToolButton" name="buttonPrevious">
<property name="text">
<string>...</string>
</property>
</property>
</widget>
</item>
- <item row="1" column="5">
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="2">
+ <widget class="QToolButton" name="buttonNext">
+ <property name="text">
+ <string>...</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <property name="autoRaise">
+ <bool>true</bool>
</property>
- </spacer>
+ </widget>
</item>
- <item row="0" column="0" colspan="7">
+ <item row="0" column="0" colspan="6">
<widget class="QFrame" name="frameTimeline">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
</property>
</widget>
</item>
- <item row="1" column="6">
- <widget class="QFrame" name="frameTimePos"/>
- </item>
- <item row="1" column="4">
- <widget class="QToolButton" name="buttonSync">
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="Line" name="line_3">
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
<property name="leftMargin">
<number>0</number>
</property>
- <item>
- <widget class="QToolButton" name="buttonOptions">
- <property name="text">
- <string>Options</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- <property name="autoRaise">
- <bool>false</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>
<tabstop>buttonPrevious</tabstop>
<tabstop>buttonAddDelete</tabstop>
<tabstop>buttonNext</tabstop>
- <tabstop>buttonSync</tabstop>
</tabstops>
<resources/>
<connections/>
<rect>
<x>0</x>
<y>0</y>
- <width>255</width>
- <height>115</height>
+ <width>248</width>
+ <height>163</height>
</rect>
</property>
<property name="windowTitle">
- <string>Scene Cut</string>
+ <string>Import Keyframes</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Data to import</string>
- </property>
- </widget>
+ <item row="4" column="0" colspan="2">
+ <widget class="QLabel" name="keyframe_info"/>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="data_list">
</property>
</widget>
</item>
+ <item row="5" column="0" rowspan="2" colspan="2">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>218</width>
+ <height>2</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QCheckBox" name="limit_keyframes">
+ <property name="text">
+ <string>Limit keyframes number</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="max_keyframes">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>1000</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QCheckBox" name="import_size">
+ <property name="text">
+ <string>Size</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="import_position">
<property name="text">
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="import_size">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Size</string>
+ <string>Data to import</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>218</width>
- <height>2</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="1">
+ <item row="7" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</hint>
</hints>
</connection>
+ <connection>
+ <sender>limit_keyframes</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>max_keyframes</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>86</x>
+ <y>94</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>207</x>
+ <y>94</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>