X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstack%2Feffectstackview2.cpp;h=c5f8ec8d5c3fd1358a5b0449b7ae7fdcfb752748;hb=5beaaab806a7678bc2046ce5e102e1a0193d2407;hp=dc09c99ebb5ecea1bbbd320f14b382570fed742c;hpb=2436bd91119bc5a349237db700643829e7eb21d6;p=kdenlive diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index dc09c99e..c5f8ec8d 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -49,26 +50,28 @@ EffectStackView2::EffectStackView2(Monitor *monitor, QWidget *parent) : m_trackindex(-1), m_draggedEffect(NULL), m_draggedGroup(NULL), - m_groupIndex(0) + m_groupIndex(0), + m_monitorSceneWanted(false) { m_effectMetaInfo.trackMode = false; m_effectMetaInfo.monitor = monitor; m_effects = QList (); + setAcceptDrops(true); m_ui.setupUi(this); setFont(KGlobalSettings::smallestReadableFont()); m_ui.checkAll->setToolTip(i18n("Enable/Disable all effects")); m_ui.buttonShowComments->setIcon(KIcon("help-about")); m_ui.buttonShowComments->setToolTip(i18n("Show additional information for the parameters")); - + connect(m_ui.checkAll, SIGNAL(stateChanged(int)), this, SLOT(slotCheckAll(int))); connect(m_ui.buttonShowComments, SIGNAL(clicked()), this, SLOT(slotShowComments())); m_ui.labelComment->setHidden(true); setEnabled(false); - - setStyleSheet(CollapsibleEffect::getStyleSheet()); + + setStyleSheet(getStyleSheet()); } EffectStackView2::~EffectStackView2() @@ -77,34 +80,45 @@ EffectStackView2::~EffectStackView2() void EffectStackView2::updatePalette() { - setStyleSheet(CollapsibleEffect::getStyleSheet()); + setStyleSheet(getStyleSheet()); } void EffectStackView2::slotRenderPos(int pos) { if (m_effects.isEmpty()) return; + if (m_monitorSceneWanted) slotCheckMonitorPosition(pos); if (!m_effectMetaInfo.trackMode && m_clipref) pos = pos - m_clipref->startPos().frames(KdenliveSettings::project_fps()); - for (int i = 0; i< m_effects.count(); i++) + for (int i = 0; i< m_effects.count(); ++i) m_effects.at(i)->slotSyncEffectsPos(pos); } +void EffectStackView2::slotClipItemUpdate() +{ + int inPoint = m_clipref->cropStart().frames(KdenliveSettings::project_fps()); + int outPoint = m_clipref->cropDuration().frames(KdenliveSettings::project_fps()) + inPoint; + for (int i = 0; i < m_effects.count(); ++i) { + m_effects.at(i)->setRange(inPoint, outPoint); + } +} + void EffectStackView2::slotClipItemSelected(ClipItem* c) { if (c && !c->isEnabled()) return; if (c && c == m_clipref) { - } else { + if (m_clipref) disconnect(m_clipref, SIGNAL(updateRange()), this, SLOT(slotClipItemUpdate())); m_clipref = c; if (c) { + connect(m_clipref, SIGNAL(updateRange()), this, SLOT(slotClipItemUpdate())); QString cname = m_clipref->clipName(); if (cname.length() > 30) { - m_ui.checkAll->setToolTip(i18n("Effects for %1").arg(cname)); + m_ui.checkAll->setToolTip(i18n("Effects for %1", cname)); cname.truncate(27); - m_ui.checkAll->setText(i18n("Effects for %1").arg(cname) + "..."); + m_ui.checkAll->setText(i18n("Effects for %1", cname) + "..."); } else { m_ui.checkAll->setToolTip(QString()); - m_ui.checkAll->setText(i18n("Effects for %1").arg(cname)); + m_ui.checkAll->setText(i18n("Effects for %1", cname)); } m_ui.checkAll->setEnabled(true); QString size = c->baseClip()->getProperty("frame_size"); @@ -114,9 +128,12 @@ void EffectStackView2::slotClipItemSelected(ClipItem* c) } if (m_clipref == NULL) { //TODO: clear list, reset paramdesc and info - //ItemInfo info; - //m_effectedit->transferParamDesc(QDomElement(), info); - clear(); + // If monitor scene is displayed, hide it + if (m_monitorSceneWanted) { + m_effectMetaInfo.monitor->slotShowEffectScene(false); + } + m_monitorSceneWanted = false; + clear(); return; } setEnabled(true); @@ -125,7 +142,7 @@ void EffectStackView2::slotClipItemSelected(ClipItem* c) setupListView(); } -void EffectStackView2::slotTrackItemSelected(int ix, const TrackInfo info) +void EffectStackView2::slotTrackItemSelected(int ix, const TrackInfo &info) { m_clipref = NULL; m_effectMetaInfo.trackMode = true; @@ -133,7 +150,8 @@ void EffectStackView2::slotTrackItemSelected(int ix, const TrackInfo info) m_trackInfo = info; setEnabled(true); m_ui.checkAll->setToolTip(QString()); - m_ui.checkAll->setText(i18n("Effects for track %1").arg(info.trackName.isEmpty() ? QString::number(ix) : info.trackName)); + m_ui.checkAll->setText(i18n("Effects for track %1", info.trackName.isEmpty() ? QString::number(ix) : info.trackName)); + m_ui.checkAll->setEnabled(true); m_trackindex = ix; setupListView(); } @@ -142,6 +160,7 @@ void EffectStackView2::slotTrackItemSelected(int ix, const TrackInfo info) void EffectStackView2::setupListView() { blockSignals(true); + m_monitorSceneWanted = false; m_draggedEffect = NULL; m_draggedGroup = NULL; disconnect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); @@ -149,7 +168,7 @@ void EffectStackView2::setupListView() m_groupIndex = 0; QWidget *view = m_ui.container->takeWidget(); if (view) { - delete view; + delete view; } blockSignals(false); view = new QWidget(m_ui.container); @@ -158,102 +177,125 @@ void EffectStackView2::setupListView() QVBoxLayout *vbox1 = new QVBoxLayout(view); vbox1->setContentsMargins(0, 0, 0, 0); vbox1->setSpacing(0); - - if (m_currentEffectList.isEmpty()) m_ui.labelComment->setHidden(true); - for (int i = 0; i < m_currentEffectList.count(); i++) { + int effectsCount = m_currentEffectList.count(); + + // Make sure we always have one effect selected + if (!m_effectMetaInfo.trackMode) { + int selectedEffect = m_clipref->selectedEffectIndex(); + if (selectedEffect < 1 && effectsCount > 0) m_clipref->setSelectedEffect(1); + else if (selectedEffect > effectsCount) m_clipref->setSelectedEffect(effectsCount); + } + + for (int i = 0; i < effectsCount; ++i) { QDomElement d = m_currentEffectList.at(i).cloneNode().toElement(); if (d.isNull()) { kDebug() << " . . . . WARNING, NULL EFFECT IN STACK!!!!!!!!!"; continue; } - + CollapsibleGroup *group = NULL; - EffectInfo effectInfo; - effectInfo.fromString(d.attribute("kdenlive_info")); - if (effectInfo.groupIndex >= 0) { - // effect is in a group - for (int j = 0; j < vbox1->count(); j++) { - CollapsibleGroup *eff = static_cast(vbox1->itemAt(j)->widget()); - if (eff->isGroup() && eff->groupIndex() == effectInfo.groupIndex) { - group = eff; - break; - } - } - - if (group == NULL) { - group = new CollapsibleGroup(effectInfo.groupIndex, i == 0, i == m_currentEffectList.count() - 1, effectInfo.groupName, m_ui.container->widget()); - connect(group, SIGNAL(moveEffect(int,int,int,QString)), this, SLOT(slotMoveEffect(int,int,int,QString))); - connect(group, SIGNAL(unGroup(CollapsibleGroup*)), this , SLOT(slotUnGroup(CollapsibleGroup*))); - connect(group, SIGNAL(groupRenamed(CollapsibleGroup *)), this, SLOT(slotRenameGroup(CollapsibleGroup*))); - connect(group, SIGNAL(reloadEffects()), this , SIGNAL(reloadEffects())); - connect(group, SIGNAL(deleteGroup(QDomDocument)), this , SLOT(slotDeleteGroup(QDomDocument))); - vbox1->addWidget(group); - group->installEventFilter( this ); - } - if (effectInfo.groupIndex >= m_groupIndex) m_groupIndex = effectInfo.groupIndex + 1; - } + EffectInfo effectInfo; + effectInfo.fromString(d.attribute("kdenlive_info")); + if (effectInfo.groupIndex >= 0) { + // effect is in a group + for (int j = 0; j < vbox1->count(); j++) { + CollapsibleGroup *eff = static_cast(vbox1->itemAt(j)->widget()); + if (eff->isGroup() && eff->groupIndex() == effectInfo.groupIndex) { + group = eff; + break; + } + } + + if (group == NULL) { + group = new CollapsibleGroup(effectInfo.groupIndex, i == 0, i == effectsCount - 1, effectInfo, m_ui.container->widget()); + connectGroup(group); + vbox1->addWidget(group); + group->installEventFilter( this ); + } + if (effectInfo.groupIndex >= m_groupIndex) m_groupIndex = effectInfo.groupIndex + 1; + } /*QDomDocument doc; doc.appendChild(doc.importNode(d, true)); kDebug() << "IMPORTED STK: " << doc.toString();*/ - - ItemInfo info; - bool isSelected = false; - if (m_effectMetaInfo.trackMode) { + + ItemInfo info; + bool isSelected = false; + if (m_effectMetaInfo.trackMode) { info.track = m_trackInfo.type; info.cropDuration = GenTime(m_trackInfo.duration, KdenliveSettings::project_fps()); info.cropStart = GenTime(0); info.startPos = GenTime(-1); info.track = 0; - } - else { - info = m_clipref->info(); - } + } + else { + info = m_clipref->info(); + } - CollapsibleEffect *currentEffect = new CollapsibleEffect(d, m_currentEffectList.at(i), info, &m_effectMetaInfo, i == m_currentEffectList.count() - 1, view); - if (m_effectMetaInfo.trackMode) { - isSelected = currentEffect->effectIndex() == 1; - } - else { - isSelected = currentEffect->effectIndex() == m_clipref->selectedEffectIndex(); - } - if (isSelected) currentEffect->setActive(true); + CollapsibleEffect *currentEffect = new CollapsibleEffect(d, m_currentEffectList.at(i), info, &m_effectMetaInfo, i == effectsCount - 1, view); + if (m_effectMetaInfo.trackMode) { + isSelected = currentEffect->effectIndex() == 1; + } + else { + isSelected = currentEffect->effectIndex() == m_clipref->selectedEffectIndex(); + } + if (isSelected) { + currentEffect->setActive(true); + if (currentEffect->needsMonitorEffectScene()) m_monitorSceneWanted = true; + } m_effects.append(currentEffect); if (group) { - group->addGroupEffect(currentEffect); - } else { - vbox1->addWidget(currentEffect); - } + group->addGroupEffect(currentEffect); + } else { + vbox1->addWidget(currentEffect); + } + connectEffect(currentEffect); + } - // Check drag & drop - currentEffect->installEventFilter( this ); - - connect(currentEffect, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement, int))); - connect(currentEffect, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QString)), this , SLOT(slotStartFilterJob(QString,QString,QString,QString,QString,QString))); - connect(currentEffect, SIGNAL(deleteEffect(const QDomElement)), this , SLOT(slotDeleteEffect(const QDomElement))); - connect(currentEffect, SIGNAL(reloadEffects()), this , SIGNAL(reloadEffects())); - connect(currentEffect, SIGNAL(resetEffect(int)), this , SLOT(slotResetEffect(int))); - connect(currentEffect, SIGNAL(changeEffectPosition(int,bool)), this , SLOT(slotMoveEffectUp(int , bool))); - connect(currentEffect, SIGNAL(effectStateChanged(bool,int,bool)), this, SLOT(slotUpdateEffectState(bool,int,bool))); - connect(currentEffect, SIGNAL(activateEffect(int)), this, SLOT(slotSetCurrentEffect(int))); - connect(currentEffect, SIGNAL(checkMonitorPosition(int)), this, SLOT(slotCheckMonitorPosition(int))); - connect(currentEffect, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int))); - connect(currentEffect, SIGNAL(createGroup(int)), this , SLOT(slotCreateGroup(int))); - connect(currentEffect, SIGNAL(moveEffect(int,int,int,QString)), this , SLOT(slotMoveEffect(int,int,int,QString))); - connect(currentEffect, SIGNAL(addEffect(QDomElement)), this , SLOT(slotAddEffect(QDomElement))); - connect(currentEffect, SIGNAL(createRegion(int,KUrl)), this, SLOT(slotCreateRegion(int,KUrl))); - - //ui.title->setPixmap(icon.pixmap(QSize(12, 12))); + if (m_currentEffectList.isEmpty()) { + m_ui.labelComment->setHidden(true); + } + else { + // Adjust group effects (up / down buttons) + QList allGroups = m_ui.container->widget()->findChildren(); + for (int i = 0; i < allGroups.count(); ++i) { + allGroups.at(i)->adjustEffects(); + } + connect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); } + vbox1->addStretch(10); slotUpdateCheckAllButton(); - connect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); - + if (!m_monitorSceneWanted) { + // monitor scene not wanted + m_effectMetaInfo.monitor->slotShowEffectScene(false); + } + // Wait a little bit for the new layout to be ready, then check if we have a scrollbar QTimer::singleShot(200, this, SLOT(slotCheckWheelEventFilter())); } +void EffectStackView2::connectEffect(CollapsibleEffect *currentEffect) +{ + // Check drag & drop + currentEffect->installEventFilter( this ); + connect(currentEffect, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateEffectParams(QDomElement,QDomElement,int))); + connect(currentEffect, SIGNAL(startFilterJob(QString,QString,QString,QString,QMap)), this , SLOT(slotStartFilterJob(QString,QString,QString,QString,QMap))); + connect(currentEffect, SIGNAL(deleteEffect(QDomElement)), this , SLOT(slotDeleteEffect(QDomElement))); + connect(currentEffect, SIGNAL(reloadEffects()), this , SIGNAL(reloadEffects())); + connect(currentEffect, SIGNAL(resetEffect(int)), this , SLOT(slotResetEffect(int))); + connect(currentEffect, SIGNAL(changeEffectPosition(QList,bool)), this , SLOT(slotMoveEffectUp(QList,bool))); + connect(currentEffect, SIGNAL(effectStateChanged(bool,int,bool)), this, SLOT(slotUpdateEffectState(bool,int,bool))); + connect(currentEffect, SIGNAL(activateEffect(int)), this, SLOT(slotSetCurrentEffect(int))); + connect(currentEffect, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int))); + connect(currentEffect, SIGNAL(createGroup(int)), this , SLOT(slotCreateGroup(int))); + connect(currentEffect, SIGNAL(moveEffect(QList,int,int,QString)), this , SLOT(slotMoveEffect(QList,int,int,QString))); + connect(currentEffect, SIGNAL(addEffect(QDomElement)), this , SLOT(slotAddEffect(QDomElement))); + connect(currentEffect, SIGNAL(createRegion(int,KUrl)), this, SLOT(slotCreateRegion(int,KUrl))); + connect(currentEffect, SIGNAL(deleteGroup(QDomDocument)), this , SLOT(slotDeleteGroup(QDomDocument))); + connect(currentEffect, SIGNAL(importClipKeyframes()), this, SIGNAL(importClipKeyframes())); +} void EffectStackView2::slotCheckWheelEventFilter() { @@ -261,12 +303,12 @@ void EffectStackView2::slotCheckWheelEventFilter() // mouse wheel events, so that user can easily adjust effect params bool filterWheelEvent = false; if (m_ui.container->verticalScrollBar() && m_ui.container->verticalScrollBar()->isVisible()) { - // widget has scroll bar, - filterWheelEvent = true; + // widget has scroll bar, + filterWheelEvent = true; + } + for (int i = 0; i < m_effects.count(); ++i) { + m_effects.at(i)->filterWheelEvent = filterWheelEvent; } - for (int i = 0; i < m_effects.count(); i++) { - m_effects.at(i)->filterWheelEvent = filterWheelEvent; - } } void EffectStackView2::resizeEvent ( QResizeEvent * event ) @@ -275,48 +317,48 @@ void EffectStackView2::resizeEvent ( QResizeEvent * event ) QWidget::resizeEvent(event); } -bool EffectStackView2::eventFilter( QObject * o, QEvent * e ) +bool EffectStackView2::eventFilter( QObject * o, QEvent * e ) { // Check if user clicked in an effect's top bar to start dragging it if (e->type() == QEvent::MouseButtonPress) { - m_draggedEffect = qobject_cast(o); - if (m_draggedEffect) { - QMouseEvent *me = static_cast(e); - if (me->button() == Qt::LeftButton && (m_draggedEffect->frame->underMouse() || m_draggedEffect->title->underMouse())) { - m_clickPoint = me->globalPos(); - } - else { - m_clickPoint = QPoint(); - m_draggedEffect = NULL; - } - e->accept(); - return true; - } - m_draggedGroup = qobject_cast(o); - if (m_draggedGroup) { - QMouseEvent *me = static_cast(e); - if (me->button() == Qt::LeftButton && (m_draggedGroup->framegroup->underMouse() || m_draggedGroup->title()->underMouse())) - m_clickPoint = me->globalPos(); - else { - m_clickPoint = QPoint(); - m_draggedGroup = NULL; - } - e->accept(); - return true; - } - } + m_draggedEffect = qobject_cast(o); + if (m_draggedEffect) { + QMouseEvent *me = static_cast(e); + if (me->button() == Qt::LeftButton && (m_draggedEffect->frame->underMouse() || m_draggedEffect->title->underMouse())) { + m_clickPoint = me->globalPos(); + } + else { + m_clickPoint = QPoint(); + m_draggedEffect = NULL; + } + e->accept(); + return true; + } + m_draggedGroup = qobject_cast(o); + if (m_draggedGroup) { + QMouseEvent *me = static_cast(e); + if (me->button() == Qt::LeftButton && (m_draggedGroup->frame->underMouse() || m_draggedGroup->title()->underMouse())) + m_clickPoint = me->globalPos(); + else { + m_clickPoint = QPoint(); + m_draggedGroup = NULL; + } + e->accept(); + return true; + } + } /*if (e->type() == QEvent::MouseMove) { - if (qobject_cast(o)) { - QMouseEvent *me = static_cast(e); - if (me->buttons() != Qt::LeftButton) { - e->accept(); - return false; - } - else { - e->ignore(); - return true; - } - } + if (qobject_cast(o)) { + QMouseEvent *me = static_cast(e); + if (me->buttons() != Qt::LeftButton) { + e->accept(); + return false; + } + else { + e->ignore(); + return true; + } + } }*/ return QWidget::eventFilter(o, e); } @@ -324,9 +366,9 @@ bool EffectStackView2::eventFilter( QObject * o, QEvent * e ) void EffectStackView2::mouseMoveEvent(QMouseEvent * event) { if (m_draggedEffect || m_draggedGroup) { - if ((event->buttons() & Qt::LeftButton) && (m_clickPoint != QPoint()) && ((event->globalPos() - m_clickPoint).manhattanLength() >= QApplication::startDragDistance())) { - startDrag(); - } + if ((event->buttons() & Qt::LeftButton) && (m_clickPoint != QPoint()) && ((event->globalPos() - m_clickPoint).manhattanLength() >= QApplication::startDragDistance())) { + startDrag(); + } } } @@ -343,13 +385,27 @@ void EffectStackView2::startDrag() QDomDocument doc; QPixmap pixmap; if (m_draggedEffect) { - QDomElement effect = m_draggedEffect->effect().cloneNode().toElement(); - doc.appendChild(doc.importNode(effect, true)); - pixmap = QPixmap::grabWidget(m_draggedEffect->title); + QDomElement effect = m_draggedEffect->effect().cloneNode().toElement(); + if (m_effectMetaInfo.trackMode) { + // Keep clip crop start in case we want to paste effect + effect.setAttribute("clipstart", 0); + } + else { + // Keep clip crop start in case we want to paste effect + effect.setAttribute("clipstart", m_clipref->cropStart().frames(KdenliveSettings::project_fps())); + } + doc.appendChild(doc.importNode(effect, true)); + pixmap = QPixmap::grabWidget(m_draggedEffect->title); } else if (m_draggedGroup) { - doc = m_draggedGroup->effectsData(); - pixmap = QPixmap::grabWidget(m_draggedGroup->title()); + doc = m_draggedGroup->effectsData(); + if (m_effectMetaInfo.trackMode) { + doc.documentElement().setAttribute("clipstart", 0); + } + else { + doc.documentElement().setAttribute("clipstart", m_clipref->cropStart().frames(KdenliveSettings::project_fps())); + } + pixmap = QPixmap::grabWidget(m_draggedGroup->title()); } else return; QDrag *drag = new QDrag(this); @@ -366,13 +422,21 @@ void EffectStackView2::startDrag() } -void EffectStackView2::slotUpdateEffectState(bool disable, int index, bool updateMainStatus) +void EffectStackView2::slotUpdateEffectState(bool disable, int index, bool needsMonitorEffectScene) { + if (m_monitorSceneWanted && disable) { + m_effectMetaInfo.monitor->slotShowEffectScene(false); + m_monitorSceneWanted = false; + } + else if (!disable && !m_monitorSceneWanted && needsMonitorEffectScene) { + m_effectMetaInfo.monitor->slotShowEffectScene(true); + m_monitorSceneWanted = true; + } if (m_effectMetaInfo.trackMode) - emit changeEffectState(NULL, m_trackindex, index, disable); + emit changeEffectState(NULL, m_trackindex, QList () << index, disable); else - emit changeEffectState(m_clipref, -1, index, disable); - if (updateMainStatus) slotUpdateCheckAllButton(); + emit changeEffectState(m_clipref, -1, QList () <= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) { - if (!m_effectMetaInfo.monitor->getEffectEdit()->getScene()->views().at(0)->isVisible()) - m_effectMetaInfo.monitor->slotEffectScene(true); - } else { - m_effectMetaInfo.monitor->slotEffectScene(false); + if (m_monitorSceneWanted) { + if (m_effectMetaInfo.trackMode || (m_clipref && renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) { + if (!m_effectMetaInfo.monitor->effectSceneDisplayed()) { + m_effectMetaInfo.monitor->slotShowEffectScene(true); + } + } else { + m_effectMetaInfo.monitor->slotShowEffectScene(false); + } + } + else { + m_effectMetaInfo.monitor->slotShowEffectScene(false); } } @@ -417,9 +487,10 @@ int EffectStackView2::isTrackMode(bool *ok) const void EffectStackView2::clear() { m_effects.clear(); + m_monitorSceneWanted = false; QWidget *view = m_ui.container->takeWidget(); if (view) { - delete view; + delete view; } m_ui.checkAll->setToolTip(QString()); m_ui.checkAll->setText(QString()); @@ -438,21 +509,32 @@ void EffectStackView2::slotCheckAll(int state) } bool disabled = state == Qt::Unchecked; - for (int i = 0; i < m_effects.count(); i++) { - if (!m_effects.at(i)->isGroup()) { - m_effects.at(i)->slotEnable(disabled, false); - } + // Disable all effects + QList indexes; + for (int i = 0; i < m_effects.count(); ++i) { + m_effects.at(i)->slotDisable(disabled, false); + indexes << m_effects.at(i)->effectIndex(); + } + // Take care of groups + QList allGroups = m_ui.container->widget()->findChildren(); + for (int i = 0; i < allGroups.count(); ++i) { + allGroups.at(i)->slotEnable(disabled, false); } + + if (m_effectMetaInfo.trackMode) + emit changeEffectState(NULL, m_trackindex, indexes, disabled); + else + emit changeEffectState(m_clipref, -1, indexes, disabled); } void EffectStackView2::slotUpdateCheckAllButton() { bool hasEnabled = false; bool hasDisabled = false; - - for (int i = 0; i < m_effects.count(); i++) { - if (!m_effects.at(i)->enabledButton->isChecked()) hasEnabled = true; - else hasDisabled = true; + + for (int i = 0; i < m_effects.count(); ++i) { + if (!m_effects.at(i)->enabledButton->isChecked()) hasEnabled = true; + else hasDisabled = true; } m_ui.checkAll->blockSignals(true); @@ -467,15 +549,15 @@ void EffectStackView2::slotUpdateCheckAllButton() void EffectStackView2::deleteCurrentEffect() { - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->isActive()) { - slotDeleteEffect(m_effects.at(i)->effect()); - break; - } + slotDeleteEffect(m_effects.at(i)->effect()); + break; + } } } -void EffectStackView2::updateProjectFormat(MltVideoProfile profile, Timecode t) +void EffectStackView2::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t) { m_effectMetaInfo.profile = profile; m_effectMetaInfo.timecode = t; @@ -483,21 +565,21 @@ void EffectStackView2::updateProjectFormat(MltVideoProfile profile, Timecode t) void EffectStackView2::updateTimecodeFormat() { - for (int i = 0; i< m_effects.count(); i++) + for (int i = 0; i< m_effects.count(); ++i) m_effects.at(i)->updateTimecodeFormat(); } CollapsibleEffect *EffectStackView2::getEffectByIndex(int ix) { - for (int i = 0; i< m_effects.count(); i++) { + for (int i = 0; i< m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { - return m_effects.at(i); - } + return m_effects.at(i); + } } return NULL; } -void EffectStackView2::slotUpdateEffectParams(const QDomElement old, const QDomElement e, int ix) +void EffectStackView2::slotUpdateEffectParams(const QDomElement &old, const QDomElement &e, int ix) { if (m_effectMetaInfo.trackMode) emit updateEffect(NULL, m_trackindex, old, e, ix,false); @@ -513,14 +595,17 @@ void EffectStackView2::slotSetCurrentEffect(int ix) { if (m_clipref && ix != m_clipref->selectedEffectIndex()) { m_clipref->setSelectedEffect(ix); - for (int i = 0; i < m_effects.count(); i++) { - if (m_effects.at(i)->effectIndex() == ix) { - m_effects.at(i)->setActive(true); - m_ui.labelComment->setText(i18n(m_effects.at(i)->effect().firstChildElement("description").firstChildElement("full").text().toUtf8().data())); - m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || m_ui.labelComment->text().isEmpty()); - } - else m_effects.at(i)->setActive(false); - } + for (int i = 0; i < m_effects.count(); ++i) { + if (m_effects.at(i)->effectIndex() == ix) { + if (m_effects.at(i)->isActive()) return; + m_effects.at(i)->setActive(true); + m_monitorSceneWanted = m_effects.at(i)->needsMonitorEffectScene(); + slotCheckMonitorPosition(m_effectMetaInfo.monitor->render->seekFramePosition()); + m_ui.labelComment->setText(i18n(m_effects.at(i)->effect().firstChildElement("description").firstChildElement("full").text().toUtf8().data())); + m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || m_ui.labelComment->text().isEmpty()); + } + else m_effects.at(i)->setActive(false); + } } } @@ -530,18 +615,18 @@ void EffectStackView2::slotDeleteGroup(QDomDocument doc) ClipItem * clip = NULL; int ix; if (m_effectMetaInfo.trackMode) { - ix = m_trackindex; + ix = m_trackindex; } else { - clip = m_clipref; - ix = -1; + clip = m_clipref; + ix = -1; } - - for (int i = 0; i < effects.count(); i++) - emit removeEffect(clip, ix, effects.at(i).toElement()); + + for (int i = 0; i < effects.count(); ++i) + emit removeEffect(clip, ix, effects.at(i).toElement()); } -void EffectStackView2::slotDeleteEffect(const QDomElement effect) +void EffectStackView2::slotDeleteEffect(const QDomElement &effect) { if (m_effectMetaInfo.trackMode) emit removeEffect(NULL, m_trackindex, effect); @@ -549,30 +634,30 @@ void EffectStackView2::slotDeleteEffect(const QDomElement effect) emit removeEffect(m_clipref, -1, effect); } -void EffectStackView2::slotAddEffect(QDomElement effect) +void EffectStackView2::slotAddEffect(const QDomElement &effect) { emit addEffect(m_clipref, effect); } -void EffectStackView2::slotMoveEffectUp(int index, bool up) +void EffectStackView2::slotMoveEffectUp(const QList &indexes, bool up) { - if (up && index <= 1) return; - if (!up && index >= m_currentEffectList.count()) return; + if (up && indexes.first() <= 1) return; + if (!up && indexes.last() >= m_currentEffectList.count()) return; int endPos; if (up) { - endPos = index - 1; + endPos = indexes.first() - 1; } else { - endPos = index + 1; + endPos = indexes.last() + 1; } - if (m_effectMetaInfo.trackMode) emit changeEffectPosition(NULL, m_trackindex, index, endPos); - else emit changeEffectPosition(m_clipref, -1, index, endPos); + if (m_effectMetaInfo.trackMode) emit changeEffectPosition(NULL, m_trackindex, indexes, endPos); + else emit changeEffectPosition(m_clipref, -1, indexes, endPos); } -void EffectStackView2::slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QString&properties) +void EffectStackView2::slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QMap &extraParams) { if (!m_clipref) return; - emit startFilterJob(m_clipref->info(), m_clipref->clipProducer(), filterName, filterParams, finalFilterName, consumer, consumerParams, properties); + emit startFilterJob(m_clipref->info(), m_clipref->clipProducer(), filterName, filterParams, consumer, consumerParams, extraParams); } void EffectStackView2::slotResetEffect(int ix) @@ -600,11 +685,16 @@ void EffectStackView2::slotResetEffect(int ix) info.cropStart = GenTime(0); info.startPos = GenTime(-1); info.track = 0; - m_effects.at(ix)->updateWidget(info, dom, &m_effectMetaInfo); + for (int i = 0; i < m_effects.count(); ++i) { + if (m_effects.at(i)->effectIndex() == ix) { + m_effects.at(i)->updateWidget(info, dom, &m_effectMetaInfo); + break; + } + } emit updateEffect(NULL, m_trackindex, old, dom, ix,false); } else { m_clipref->initEffect(dom); - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { m_effects.at(i)->updateWidget(m_clipref->info(), dom, &m_effectMetaInfo); break; @@ -643,15 +733,15 @@ void EffectStackView2::slotCreateRegion(int ix, KUrl url) // refresh effect stack ItemInfo info; bool isSelected = false; - if (m_effectMetaInfo.trackMode) { - info.track = m_trackInfo.type; + if (m_effectMetaInfo.trackMode) { + info.track = m_trackInfo.type; info.cropDuration = GenTime(m_trackInfo.duration, KdenliveSettings::project_fps()); info.cropStart = GenTime(0); info.startPos = GenTime(-1); info.track = 0; } - else { - info = m_clipref->info(); + else if (m_clipref) { + info = m_clipref->info(); } CollapsibleEffect *current = getEffectByIndex(ix); m_effects.removeAll(current); @@ -660,12 +750,13 @@ void EffectStackView2::slotCreateRegion(int ix, KUrl url) m_currentEffectList.insert(region); current->deleteLater(); CollapsibleEffect *currentEffect = new CollapsibleEffect(region, m_currentEffectList.itemFromIndex(ix), info, &m_effectMetaInfo, ix == m_currentEffectList.count() - 1, m_ui.container->widget()); - connect(currentEffect, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement, int))); + connectEffect(currentEffect); + if (m_effectMetaInfo.trackMode) { - isSelected = currentEffect->effectIndex() == 1; + isSelected = currentEffect->effectIndex() == 1; } - else { - isSelected = currentEffect->effectIndex() == m_clipref->selectedEffectIndex(); + else if (m_clipref) { + isSelected = currentEffect->effectIndex() == m_clipref->selectedEffectIndex(); } if (isSelected) currentEffect->setActive(true); m_effects.append(currentEffect); @@ -679,9 +770,9 @@ void EffectStackView2::slotCreateRegion(int ix, KUrl url) // Check drag & drop currentEffect->installEventFilter( this ); - - QTimer::singleShot(200, this, SLOT(slotCheckWheelEventFilter())); - + + QTimer::singleShot(200, this, SLOT(slotCheckWheelEventFilter())); + } void EffectStackView2::slotCreateGroup(int ix) @@ -694,73 +785,86 @@ void EffectStackView2::slotCreateGroup(int ix) neweffect.setAttribute("kdenlive_info", effectinfo.toString()); ItemInfo info; - if (m_effectMetaInfo.trackMode) { - info.track = m_trackInfo.type; + if (m_effectMetaInfo.trackMode) { + info.track = m_trackInfo.type; info.cropDuration = GenTime(m_trackInfo.duration, KdenliveSettings::project_fps()); info.cropStart = GenTime(0); info.startPos = GenTime(-1); info.track = 0; - emit updateEffect(NULL, m_trackindex, oldeffect, neweffect, ix, false); + emit updateEffect(NULL, m_trackindex, oldeffect, neweffect, ix, false); } else { - emit updateEffect(m_clipref, -1, oldeffect, neweffect, ix, false); + emit updateEffect(m_clipref, -1, oldeffect, neweffect, ix, false); } - + QVBoxLayout *l = static_cast(m_ui.container->widget()->layout()); int groupPos = 0; CollapsibleEffect *effectToMove = NULL; - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { - effectToMove = m_effects.at(i); - groupPos = l->indexOf(effectToMove); - l->removeWidget(effectToMove); - break; - } + effectToMove = m_effects.at(i); + groupPos = l->indexOf(effectToMove); + l->removeWidget(effectToMove); + break; + } } - - CollapsibleGroup *group = new CollapsibleGroup(m_groupIndex, ix == 1, ix == m_currentEffectList.count() - 2, QString(), m_ui.container->widget()); + + CollapsibleGroup *group = new CollapsibleGroup(m_groupIndex, ix == 1, ix == m_currentEffectList.count() - 2, effectinfo, m_ui.container->widget()); m_groupIndex++; - connect(group, SIGNAL(moveEffect(int,int,int,QString)), this , SLOT(slotMoveEffect(int,int,int,QString))); + connectGroup(group); + l->insertWidget(groupPos, group); + group->installEventFilter( this ); + if (effectToMove) + group->addGroupEffect(effectToMove); +} + +void EffectStackView2::connectGroup(CollapsibleGroup *group) +{ + connect(group, SIGNAL(moveEffect(QList,int,int,QString)), this , SLOT(slotMoveEffect(QList,int,int,QString))); + connect(group, SIGNAL(addEffect(QDomElement)), this , SLOT(slotAddEffect(QDomElement))); connect(group, SIGNAL(unGroup(CollapsibleGroup*)), this , SLOT(slotUnGroup(CollapsibleGroup*))); - connect(group, SIGNAL(groupRenamed(CollapsibleGroup *)), this , SLOT(slotRenameGroup(CollapsibleGroup*))); + connect(group, SIGNAL(groupRenamed(CollapsibleGroup*)), this , SLOT(slotRenameGroup(CollapsibleGroup*))); connect(group, SIGNAL(reloadEffects()), this , SIGNAL(reloadEffects())); connect(group, SIGNAL(deleteGroup(QDomDocument)), this , SLOT(slotDeleteGroup(QDomDocument))); - l->insertWidget(groupPos, group); - group->installEventFilter( this ); - group->addGroupEffect(effectToMove); + connect(group, SIGNAL(changeEffectPosition(QList,bool)), this , SLOT(slotMoveEffectUp(QList,bool))); } -void EffectStackView2::slotMoveEffect(int currentIndex, int newIndex, int groupIndex, QString groupName) +void EffectStackView2::slotMoveEffect(QList currentIndexes, int newIndex, int groupIndex, QString groupName) { - CollapsibleEffect *effectToMove = getEffectByIndex(currentIndex); - if (effectToMove == NULL) return; + if (currentIndexes.count() == 1) { + CollapsibleEffect *effectToMove = getEffectByIndex(currentIndexes.at(0)); + if (effectToMove == NULL) return; - QDomElement oldeffect = effectToMove->effect(); - QDomElement neweffect = oldeffect.cloneNode().toElement(); - - EffectInfo effectinfo; - effectinfo.fromString(oldeffect.attribute("kdenlive_info")); - effectinfo.groupIndex = groupIndex; - effectinfo.groupName = groupName; - neweffect.setAttribute("kdenlive_info", effectinfo.toString()); + QDomElement oldeffect = effectToMove->effect(); + QDomElement neweffect = oldeffect.cloneNode().toElement(); - ItemInfo info; - if (m_effectMetaInfo.trackMode) { - info.track = m_trackInfo.type; - info.cropDuration = GenTime(m_trackInfo.duration, KdenliveSettings::project_fps()); - info.cropStart = GenTime(0); - info.startPos = GenTime(-1); - info.track = 0; - emit updateEffect(NULL, m_trackindex, oldeffect, neweffect, effectToMove->effectIndex(),false); - } else { - emit updateEffect(m_clipref, -1, oldeffect, neweffect, effectToMove->effectIndex(),false); + EffectInfo effectinfo; + effectinfo.fromString(oldeffect.attribute("kdenlive_info")); + effectinfo.groupIndex = groupIndex; + effectinfo.groupName = groupName; + neweffect.setAttribute("kdenlive_info", effectinfo.toString()); + + if (oldeffect.attribute("kdenlive_info") != effectinfo.toString()) { + // effect's group info or collapsed state changed + ItemInfo info; + if (m_effectMetaInfo.trackMode) { + info.track = m_trackInfo.type; + info.cropDuration = GenTime(m_trackInfo.duration, KdenliveSettings::project_fps()); + info.cropStart = GenTime(0); + info.startPos = GenTime(-1); + info.track = 0; + emit updateEffect(NULL, m_trackindex, oldeffect, neweffect, effectToMove->effectIndex(),false); + } else { + emit updateEffect(m_clipref, -1, oldeffect, neweffect, effectToMove->effectIndex(),false); + } + } } - //if (currentIndex == newIndex) return; + // Update effect index with new position if (m_effectMetaInfo.trackMode) { - emit changeEffectPosition(NULL, m_trackindex, currentIndex, newIndex); + emit changeEffectPosition(NULL, m_trackindex, currentIndexes, newIndex); } else { - emit changeEffectPosition(m_clipref, -1, currentIndex, newIndex); + emit changeEffectPosition(m_clipref, -1, currentIndexes, newIndex); } } @@ -775,16 +879,130 @@ void EffectStackView2::slotUnGroup(CollapsibleGroup* group) void EffectStackView2::slotRenameGroup(CollapsibleGroup *group) { QList effects = group->effects(); - for (int i = 0; i < effects.count(); i++) { - QDomElement origin = effects.at(i)->effect(); - QDomElement changed = origin.cloneNode().toElement(); - changed.setAttribute("kdenlive_info", effects.at(i)->infoString()); - if (m_effectMetaInfo.trackMode) { - emit updateEffect(NULL, m_trackindex, origin, changed, effects.at(i)->effectIndex(),false); - } else { - emit updateEffect(m_clipref, -1, origin, changed, effects.at(i)->effectIndex(),false); - } + for (int i = 0; i < effects.count(); ++i) { + QDomElement origin = effects.at(i)->effect(); + QDomElement changed = origin.cloneNode().toElement(); + changed.setAttribute("kdenlive_info", effects.at(i)->infoString()); + if (m_effectMetaInfo.trackMode) { + emit updateEffect(NULL, m_trackindex, origin, changed, effects.at(i)->effectIndex(),false); + } else { + emit updateEffect(m_clipref, -1, origin, changed, effects.at(i)->effectIndex(),false); + } + } +} + +void EffectStackView2::dragEnterEvent(QDragEnterEvent *event) +{ + if (event->mimeData()->hasFormat("kdenlive/effectslist")) { + event->acceptProposedAction(); + } +} + +void EffectStackView2::processDroppedEffect(QDomElement e, QDropEvent *event) +{ + int ix = e.attribute("kdenlive_ix").toInt(); + if (e.tagName() == "effectgroup") { + // We are dropping a group, all effects in group should be moved + QDomNodeList effects = e.elementsByTagName("effect"); + if (effects.count() == 0) { + event->ignore(); + return; + } + EffectInfo info; + info.fromString(effects.at(0).toElement().attribute("kdenlive_info")); + if (info.groupIndex < 0) { + kDebug()<<"// ADDING EFFECT!!!"; + // Adding a new group effect to the stack + event->setDropAction(Qt::CopyAction); + event->accept(); + slotAddEffect(e); + return; + } + // Moving group: delete all effects and re-add them + QList indexes; + for (int i = 0; i < effects.count(); ++i) { + QDomElement effect = effects.at(i).cloneNode().toElement(); + indexes << effect.attribute("kdenlive_ix").toInt(); + } + kDebug()<<"// Moving: "<setDropAction(Qt::CopyAction); + event->accept(); + slotAddEffect(e); + return; + } + else { + // User is moving an effect + slotMoveEffect(QList () << ix, m_currentEffectList.count() + 1, -1); + } + event->setDropAction(Qt::MoveAction); + event->accept(); +} + +void EffectStackView2::dropEvent(QDropEvent *event) +{ + const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist")); + //event->acceptProposedAction(); + QDomDocument doc; + doc.setContent(effects, true); + processDroppedEffect(doc.documentElement(), event); +} + +void EffectStackView2::setKeyframes(const QString &data, int maximum) +{ + for (int i = 0; i < m_effects.count(); ++i) { + if (m_effects.at(i)->isActive()) { + m_effects.at(i)->setKeyframes(data, maximum); + break; + } } } +//static +const QString EffectStackView2::getStyleSheet() +{ + KColorScheme scheme(QApplication::palette().currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor selected_bg = scheme.decoration(KColorScheme::FocusColor).color(); + QColor hgh = KColorUtils::mix(QApplication::palette().window().color(), selected_bg, 0.2); + QColor hover_bg = scheme.decoration(KColorScheme::HoverColor).color(); + QColor light_bg = scheme.shade(KColorScheme::LightShade); + QColor alt_bg = scheme.background(KColorScheme::NormalBackground).color(); + + QString stylesheet; + + // effect background + stylesheet.append(QString("QFrame#decoframe {border-top-left-radius:5px;border-top-right-radius:5px;border-bottom:2px solid palette(mid);border-top:1px solid palette(light);} QFrame#decoframe[active=\"true\"] {background: %1;}").arg(hgh.name())); + + // effect in group background + stylesheet.append(QString("QFrame#decoframesub {border-top:1px solid palette(light);} QFrame#decoframesub[active=\"true\"] {background: %1;}").arg(hgh.name())); + + // group background + stylesheet.append(QString("QFrame#decoframegroup {border-top-left-radius:5px;border-top-right-radius:5px;border:2px solid palette(dark);margin:0px;margin-top:2px;} ")); + + // effect title bar + stylesheet.append(QString("QFrame#frame {margin-bottom:2px;border-top-left-radius:5px;border-top-right-radius:5px;} QFrame#frame[target=\"true\"] {background: palette(highlight);}")); + + // group effect title bar + stylesheet.append(QString("QFrame#framegroup {border-top-left-radius:2px;border-top-right-radius:2px;background: palette(dark);} QFrame#framegroup[target=\"true\"] {background: palette(highlight);} ")); + + // draggable effect bar content + stylesheet.append(QString("QProgressBar::chunk:horizontal {background: palette(button);border-top-left-radius: 4px;border-bottom-left-radius: 4px;} QProgressBar::chunk:horizontal#dragOnly {background: %1;border-top-left-radius: 4px;border-bottom-left-radius: 4px;} QProgressBar::chunk:horizontal:hover {background: %2;}").arg(alt_bg.name()).arg(selected_bg.name())); + + // draggable effect bar + stylesheet.append(QString("QProgressBar:horizontal {border: 1px solid palette(dark);border-top-left-radius: 4px;border-bottom-left-radius: 4px;border-right:0px;background:%3;padding: 0px;text-align:left center} QProgressBar:horizontal:disabled {border: 1px solid palette(button)} QProgressBar:horizontal#dragOnly {background: %3} QProgressBar:horizontal[inTimeline=\"true\"] { border: 1px solid %1;border-right: 0px;background: %2;padding: 0px;text-align:left center } QProgressBar::chunk:horizontal[inTimeline=\"true\"] {background: %1;}").arg(hover_bg.name()).arg(light_bg.name()).arg(alt_bg.name())); + + // spin box for draggable widget + stylesheet.append(QString("QAbstractSpinBox#dragBox {border: 1px solid palette(dark);border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QAbstractSpinBox::down-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox:disabled#dragBox {border: 1px solid palette(button);} QAbstractSpinBox::up-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %1;} QAbstractSpinBox:hover#dragBox {border: 1px solid %2;} ").arg(hover_bg.name()).arg(selected_bg.name())); + + // group editable labels + stylesheet.append(QString("MyEditableLabel { background-color: transparent; color: palette(bright-text); border-radius: 2px;border: 1px solid transparent;} MyEditableLabel:hover {border: 1px solid palette(highlight);} ")); + + return stylesheet; +} + #include "effectstackview2.moc" +