Commit 54fd7b3f authored by Till Theato's avatar Till Theato
Browse files

Geometry Widget:

- Use by default
- Replace sync checkbox with button

svn path=/trunk/kdenlive/; revision=4734
parent f61b5d4b
......@@ -52,7 +52,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
Setup of timeline and keyframe controls
*/
((QGridLayout *)(m_ui.widgetTimeWrapper->layout()))->addWidget(m_timePos, 1, 4);
((QGridLayout *)(m_ui.widgetTimeWrapper->layout()))->addWidget(m_timePos, 1, 6);
QVBoxLayout *layout = new QVBoxLayout(m_ui.frameTimeline);
m_timeline = new KeyframeHelper(m_ui.frameTimeline);
......@@ -66,6 +66,11 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
m_ui.buttonAddDelete->setToolTip(i18n("Add keyframe"));
m_ui.buttonSync->setIcon(KIcon("insert-link"));
m_ui.buttonSync->setToolTip(i18n("Synchronize with timeline cursor"));
m_ui.buttonSync->setCheckable(true);
m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
connect(m_timeline, SIGNAL(positionChanged(int)), this, SLOT(slotPositionChanged(int)));
connect(m_timeline, SIGNAL(keyframeMoved(int)), this, SLOT(slotKeyframeMoved(int)));
connect(m_timeline, SIGNAL(addKeyframe(int)), this, SLOT(slotAddKeyframe(int)));
......@@ -74,6 +79,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
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)));
/*
......@@ -119,12 +125,10 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
m_ui.buttonConfig->setToolTip(i18n("Show/Hide settings"));
m_ui.buttonConfig->setCheckable(true);
m_ui.groupSettings->setHidden(true);
m_ui.checkSync->setChecked(KdenliveSettings::transitionfollowcursor());
m_ui.checkDirectUpdate->setChecked(m_scene->getDirectUpdate());
connect(m_ui.buttonConfig, SIGNAL(toggled(bool)), m_ui.groupSettings, SLOT(setVisible(bool)));
connect(m_ui.checkSync, SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
connect(m_ui.checkShowScene, SIGNAL(toggled(bool)), this, SLOT(slotShowScene(bool)));
connect(m_ui.checkDirectUpdate, SIGNAL(toggled(bool)), m_scene, SLOT(slotSetDirectUpdate(bool)));
......@@ -201,6 +205,7 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
void GeometryWidget::slotSyncPosition(int relTimelinePos)
{
// 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());
......
......@@ -52,7 +52,7 @@
<entry name="on_monitor_effects" type="Bool">
<label>Use on-monitor effects.</label>
<default>false</default>
<default>true</default>
</entry>
</group>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>381</width>
<height>304</height>
<width>366</width>
<height>282</height>
</rect>
</property>
<property name="windowTitle">
......@@ -332,7 +332,7 @@
</property>
</widget>
</item>
<item row="1" column="3">
<item row="1" column="5">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -345,7 +345,7 @@
</property>
</spacer>
</item>
<item row="0" column="0" colspan="5">
<item row="0" column="0" colspan="7">
<widget class="QFrame" name="frameTimeline">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
......@@ -367,9 +367,35 @@
</property>
</widget>
</item>
<item row="1" column="4">
<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="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="3">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>15</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
......@@ -451,16 +477,6 @@
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<widget class="QCheckBox" name="checkSync">
<property name="text">
<string>Synchronize with timeline cursor</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkShowScene">
<property name="text">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment