X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackview.cpp;h=11f09cca007e0fcf5e4b20efcc7a4e1f3f6d65dd;hb=a547bb7949a7b7939fbb4ab4b7168f8966282964;hp=257a54682c66dc9e88672f1353354b8a786bb927;hpb=42af581eaabb00ee75768352d0baa01e4c98df58;p=kdenlive diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp index 257a5468..11f09cca 100644 --- a/src/effectstackview.cpp +++ b/src/effectstackview.cpp @@ -23,6 +23,7 @@ #include "docclipbase.h" #include "projectlist.h" #include "kthumb.h" +#include "monitoreditwidget.h" #include "monitorscene.h" #include "kdenlivesettings.h" @@ -48,11 +49,14 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) : m_ui.setupUi(this); QVBoxLayout *vbox1 = new QVBoxLayout(m_ui.frame); m_effectedit = new EffectStackEdit(monitor, m_ui.frame); - vbox1->setContentsMargins(0, 0, 0, 0); + m_ui.frame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + vbox1->setContentsMargins(2, 0, 2, 0); vbox1->setSpacing(0); vbox1->addWidget(m_effectedit); - m_ui.frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions()); + m_ui.splitter->setStretchFactor(0, 1); + m_ui.splitter->setStretchFactor(1, 20); + + //m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions()); //m_ui.effectlist->horizontalHeader()->setVisible(false); //m_ui.effectlist->verticalHeader()->setVisible(false); @@ -69,12 +73,15 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) : m_ui.buttonReset->setIcon(KIcon("view-refresh")); m_ui.buttonReset->setToolTip(i18n("Reset effect")); 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")); m_ui.effectlist->setDragDropMode(QAbstractItemView::NoDragDrop); //use internal if drop is recognised right - connect(m_ui.region_url, SIGNAL(urlSelected(const KUrl &)), this , SLOT(slotRegionChanged())); - connect(m_ui.region_url, SIGNAL(returnPressed()), this , SLOT(slotRegionChanged())); + m_ui.labelComment->setHidden(true); + + //connect(m_ui.region_url, SIGNAL(urlSelected(const KUrl &)), this , SLOT(slotRegionChanged())); + //connect(m_ui.region_url, SIGNAL(returnPressed()), this , SLOT(slotRegionChanged())); connect(m_ui.effectlist, SIGNAL(itemSelectionChanged()), this , SLOT(slotItemSelectionChanged())); connect(m_ui.effectlist, SIGNAL(itemChanged(QListWidgetItem *)), this , SLOT(slotItemChanged(QListWidgetItem *))); connect(m_ui.buttonUp, SIGNAL(clicked()), this, SLOT(slotItemUp())); @@ -83,16 +90,16 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) : connect(m_ui.buttonSave, SIGNAL(clicked()), this, SLOT(slotSaveEffect())); connect(m_ui.buttonReset, SIGNAL(clicked()), this, SLOT(slotResetEffect())); connect(m_ui.checkAll, SIGNAL(stateChanged(int)), this, SLOT(slotCheckAll(int))); - connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement, const QDomElement)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement))); + connect(m_ui.buttonShowComments, SIGNAL(clicked()), this, SLOT(slotShowComments())); + connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement &, const QDomElement &)), this , SLOT(slotUpdateEffectParams(const QDomElement &, const QDomElement &))); connect(m_effectedit, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int))); connect(m_effectedit, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int))); connect(m_effectedit, SIGNAL(checkMonitorPosition(int)), this, SLOT(slotCheckMonitorPosition(int))); connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); + connect(this, SIGNAL(showComments(bool)), m_effectedit, SIGNAL(showComments(bool))); m_effectLists["audio"] = &MainWindow::audioEffects; m_effectLists["video"] = &MainWindow::videoEffects; m_effectLists["custom"] = &MainWindow::customEffects; - m_ui.splitter->setStretchFactor(1, 10); - m_ui.splitter->setStretchFactor(0, 1); setEnabled(false); } @@ -123,7 +130,7 @@ void EffectStackView::slotSaveEffect() if (name.isEmpty()) return; QString path = KStandardDirs::locateLocal("appdata", "effects/", true); path = path + name + ".xml"; - if (QFile::exists(path)) if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return; + if (QFile::exists(path)) if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", path)) == KMessageBox::No) return; int i = m_ui.effectlist->currentRow(); QDomDocument doc; @@ -152,7 +159,7 @@ void EffectStackView::slotSaveEffect() emit reloadEffects(); } -void EffectStackView::slotUpdateEffectParams(const QDomElement old, const QDomElement e) +void EffectStackView::slotUpdateEffectParams(const QDomElement &old, const QDomElement &e) { if (m_trackMode) emit updateEffect(NULL, m_trackindex, old, e, m_ui.effectlist->currentRow()); @@ -169,21 +176,34 @@ void EffectStackView::slotClipItemSelected(ClipItem* c, int ix) } else { m_clipref = c; if (c) { - m_ui.checkAll->setText(i18n("Effects for %1").arg(m_clipref->clipName())); + QString cname = m_clipref->clipName(); + if (cname.length() > 30) { + m_ui.checkAll->setToolTip(i18n("Effects for %1").arg(cname)); + cname.truncate(27); + m_ui.checkAll->setText(i18n("Effects for %1").arg(cname) + "..."); + } else { + m_ui.checkAll->setToolTip(QString()); + m_ui.checkAll->setText(i18n("Effects for %1").arg(cname)); + } ix = c->selectedEffectIndex(); QString size = c->baseClip()->getProperty("frame_size"); double factor = c->baseClip()->getProperty("aspect_ratio").toDouble(); QPoint p((int)(size.section('x', 0, 0).toInt() * factor + 0.5), size.section('x', 1, 1).toInt()); m_effectedit->setFrameSize(p); - m_effectedit->setFrameSize(p); - } else ix = 0; + } else { + ix = 0; + } } if (m_clipref == NULL) { m_ui.effectlist->blockSignals(true); m_ui.effectlist->clear(); - m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0); - m_ui.region_url->clear(); + ItemInfo info; + m_effectedit->transferParamDesc(QDomElement(), info); + //m_ui.region_url->clear(); m_ui.effectlist->blockSignals(false); + m_ui.checkAll->setToolTip(QString()); + m_ui.checkAll->setText(QString()); + m_ui.labelComment->setText(QString()); setEnabled(false); return; } @@ -198,8 +218,10 @@ void EffectStackView::slotTrackItemSelected(int ix, const TrackInfo info) m_clipref = NULL; m_trackMode = true; m_currentEffectList = info.effectsList; + m_trackInfo = info; kDebug() << "// TRACK; " << ix << ", EFFECTS: " << m_currentEffectList.count(); 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_trackindex = ix; setupListView(0); @@ -209,13 +231,14 @@ void EffectStackView::slotItemChanged(QListWidgetItem *item) { bool disable = true; if (item->checkState() == Qt::Checked) disable = false; - m_ui.frame_layout->setEnabled(!disable); - m_ui.buttonReset->setEnabled(!disable); + m_ui.buttonReset->setEnabled(!disable || !KdenliveSettings::disable_effect_parameters()); int activeRow = m_ui.effectlist->currentRow(); if (activeRow >= 0) { m_effectedit->updateParameter("disable", QString::number((int) disable)); - if (m_trackMode) emit changeEffectState(NULL, m_trackindex, activeRow, disable); - else emit changeEffectState(m_clipref, -1, activeRow, disable); + if (m_trackMode) + emit changeEffectState(NULL, m_trackindex, activeRow, disable); + else + emit changeEffectState(m_clipref, -1, activeRow, disable); } slotUpdateCheckAllButton(); } @@ -243,21 +266,23 @@ void EffectStackView::setupListView(int ix) doc.appendChild(doc.importNode(d, true)); kDebug() << "IMPORTED STK: " << doc.toString();*/ - QDomNode namenode = d.elementsByTagName("name").item(0); + QDomElement namenode = d.firstChildElement("name"); if (!namenode.isNull()) { // Issue 238: Add icons for effect type in effectstack. // Logic more or less copied from initeffects.cpp QString type = d.attribute("type", QString()); if ("audio" == type) { - item = new QListWidgetItem(audioIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist); + item = new QListWidgetItem(audioIcon, i18n(namenode.text().toUtf8().data()), m_ui.effectlist); } else if ("custom" == type) { - item = new QListWidgetItem(customIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist); + item = new QListWidgetItem(customIcon, i18n(namenode.text().toUtf8().data()), m_ui.effectlist); } else { - item = new QListWidgetItem(videoIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist); + item = new QListWidgetItem(videoIcon, i18n(namenode.text().toUtf8().data()), m_ui.effectlist); } item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); - if (d.attribute("disable") == "1") item->setCheckState(Qt::Unchecked); - else item->setCheckState(Qt::Checked); + if (d.attribute("disable") == "1") + item->setCheckState(Qt::Unchecked); + else + item->setCheckState(Qt::Checked); } } if (m_ui.effectlist->count() == 0) { @@ -267,16 +292,18 @@ void EffectStackView::setupListView(int ix) m_ui.buttonUp->setEnabled(false); m_ui.buttonDown->setEnabled(false); m_ui.checkAll->setEnabled(false); + m_ui.buttonShowComments->setEnabled(false); + m_ui.labelComment->setHidden(true); } else { - if (ix < 0) ix = 0; - if (ix > m_ui.effectlist->count() - 1) ix = m_ui.effectlist->count() - 1; + ix = qBound(0, ix, m_ui.effectlist->count() - 1); m_ui.effectlist->setCurrentRow(ix); m_ui.checkAll->setEnabled(true); } m_ui.effectlist->blockSignals(false); if (m_ui.effectlist->count() == 0) { - m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0); - m_ui.region_url->clear(); + ItemInfo info; + m_effectedit->transferParamDesc(QDomElement(), info); + //m_ui.region_url->clear(); } else slotItemSelectionChanged(false); slotUpdateCheckAllButton(); } @@ -287,24 +314,34 @@ void EffectStackView::slotItemSelectionChanged(bool update) int activeRow = m_ui.effectlist->currentRow(); bool isChecked = false; if (hasItem && m_ui.effectlist->currentItem()->checkState() == Qt::Checked) isChecked = true; + QDomElement eff; if (hasItem && m_ui.effectlist->currentItem()->isSelected()) { - QDomElement eff = m_currentEffectList.at(activeRow); + eff = m_currentEffectList.at(activeRow); if (m_trackMode) { // showing track effects - m_effectedit->transferParamDesc(eff, 0, 0, -1); - } else m_effectedit->transferParamDesc(eff, - 0, - m_clipref->cropStart().frames(KdenliveSettings::project_fps()), - (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps())); //minx max frame - m_ui.region_url->setUrl(KUrl(eff.attribute("region"))); + ItemInfo info; + 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; + m_effectedit->transferParamDesc(eff, info); + } else { + m_effectedit->transferParamDesc(eff, m_clipref->info()); + } + //m_ui.region_url->setUrl(KUrl(eff.attribute("region"))); + m_ui.labelComment->setText(i18n(eff.firstChildElement("description").firstChildElement("full").text().toUtf8().data())); } if (!m_trackMode && m_clipref && update) m_clipref->setSelectedEffect(activeRow); m_ui.buttonDel->setEnabled(hasItem); m_ui.buttonSave->setEnabled(hasItem); - m_ui.buttonReset->setEnabled(hasItem && isChecked); + m_ui.buttonReset->setEnabled(hasItem && (isChecked || !KdenliveSettings::disable_effect_parameters())); m_ui.buttonUp->setEnabled(activeRow > 0); m_ui.buttonDown->setEnabled((activeRow < m_ui.effectlist->count() - 1) && hasItem); - m_ui.frame_layout->setEnabled(isChecked); + m_ui.buttonShowComments->setEnabled(hasItem); + + emit showComments(m_ui.buttonShowComments->isChecked()); + m_ui.labelComment->setVisible(hasItem && m_ui.labelComment->text().count() && (m_ui.buttonShowComments->isChecked() || !eff.elementsByTagName("parameter").count())); } void EffectStackView::slotItemUp() @@ -327,8 +364,10 @@ void EffectStackView::slotItemDel() { int activeRow = m_ui.effectlist->currentRow(); if (activeRow >= 0) { - if (m_trackMode) emit removeEffect(NULL, m_trackindex, m_currentEffectList.at(activeRow).cloneNode().toElement()); - else emit removeEffect(m_clipref, -1, m_clipref->effectAt(activeRow)); + if (m_trackMode) + emit removeEffect(NULL, m_trackindex, m_currentEffectList.at(activeRow).cloneNode().toElement()); + else + emit removeEffect(m_clipref, -1, m_clipref->effectAt(activeRow)); slotUpdateCheckAllButton(); } } @@ -351,16 +390,25 @@ void EffectStackView::slotResetEffect() dom.setAttribute("kdenlive_ix", old.attribute("kdenlive_ix")); if (m_trackMode) { EffectsList::setParameter(dom, "in", QString::number(0)); - EffectsList::setParameter(dom, "out", QString::number(0)); - m_effectedit->transferParamDesc(dom, 0, 0, 0);//minx max frame + EffectsList::setParameter(dom, "out", QString::number(m_trackInfo.duration)); + ItemInfo info; + 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; + m_effectedit->transferParamDesc(dom, info); emit updateEffect(NULL, m_trackindex, old, dom, activeRow); } else { m_clipref->initEffect(dom); - m_effectedit->transferParamDesc(dom, 0, m_clipref->cropStart().frames(KdenliveSettings::project_fps()), (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps()));//minx max frame - m_ui.region_url->setUrl(KUrl(dom.attribute("region"))); + m_effectedit->transferParamDesc(dom, m_clipref->info()); + //m_ui.region_url->setUrl(KUrl(dom.attribute("region"))); emit updateEffect(m_clipref, -1, old, dom, activeRow); } } + + emit showComments(m_ui.buttonShowComments->isChecked()); + m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || !m_ui.labelComment->text().count()); } @@ -380,16 +428,23 @@ void EffectStackView::clear() m_ui.buttonUp->setEnabled(false); m_ui.buttonDown->setEnabled(false); m_ui.checkAll->setEnabled(false); - m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0); - m_ui.region_url->clear(); + ItemInfo info; + m_effectedit->transferParamDesc(QDomElement(), info); + //m_ui.region_url->clear(); + m_clipref = NULL; + m_ui.buttonShowComments->setEnabled(false); + m_ui.labelComment->setText(QString()); m_ui.effectlist->blockSignals(false); } void EffectStackView::slotSeekTimeline(int pos) { - if (!m_trackMode && m_clipref) + if (m_trackMode) { + emit seekTimeline(pos); + } else if (m_clipref) { emit seekTimeline(m_clipref->startPos().frames(KdenliveSettings::project_fps()) + pos); + } } void EffectStackView::slotUpdateCheckAllButton() @@ -422,20 +477,28 @@ void EffectStackView::slotCheckAll(int state) m_ui.checkAll->blockSignals(false); } - for (int i = 0; i < m_ui.effectlist->count(); ++i) - m_ui.effectlist->item(i)->setCheckState((Qt::CheckState)state); + bool disabled = (state != 2); + m_effectedit->updateParameter("disable", QString::number((int) disabled)); + for (int i = 0; i < m_ui.effectlist->count(); ++i) { + if (m_ui.effectlist->item(i)->checkState() != (Qt::CheckState)state) { + m_ui.effectlist->item(i)->setCheckState((Qt::CheckState)state); + if (m_trackMode) + emit changeEffectState(NULL, m_trackindex, i, disabled); + else + emit changeEffectState(m_clipref, -1, i, disabled); + } + } } -void EffectStackView::slotRegionChanged() +/*void EffectStackView::slotRegionChanged() { if (!m_trackMode) emit updateClipRegion(m_clipref, m_ui.effectlist->currentRow(), m_ui.region_url->text()); -} +}*/ void EffectStackView::slotCheckMonitorPosition(int renderPos) { - if (m_trackMode) return; - if (renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps())) { - if (!m_monitor->getEffectScene()->views().at(0)->isVisible()) + if (m_trackMode || (m_clipref && renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) { + if (!m_monitor->getEffectEdit()->getScene()->views().at(0)->isVisible()) m_monitor->slotEffectScene(true); } else { m_monitor->slotEffectScene(false); @@ -444,8 +507,25 @@ void EffectStackView::slotCheckMonitorPosition(int renderPos) void EffectStackView::slotRenderPos(int pos) { - if (m_clipref && m_effectedit) - m_effectedit->slotSyncEffectsPos(pos - m_clipref->startPos().frames(KdenliveSettings::project_fps())); + if (m_effectedit) { + if (m_trackMode) { + m_effectedit->slotSyncEffectsPos(pos); + } else if (m_clipref) { + m_effectedit->slotSyncEffectsPos(pos - m_clipref->startPos().frames(KdenliveSettings::project_fps())); + } + } +} + +int EffectStackView::isTrackMode(bool *ok) const +{ + *ok = m_trackMode; + return m_trackindex; +} + +void EffectStackView::slotShowComments() +{ + m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || !m_ui.labelComment->text().count()); + emit showComments(m_ui.buttonShowComments->isChecked()); } #include "effectstackview.moc"