#include "docclipbase.h"
#include "projectlist.h"
#include "kthumb.h"
+#include "monitoreditwidget.h"
#include "monitorscene.h"
#include "kdenlivesettings.h"
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);
+ vbox1->setContentsMargins(2, 0, 2, 0);
vbox1->setSpacing(0);
vbox1->addWidget(m_effectedit);
+ m_ui.splitter->setStretchFactor(0, 0);
+ m_ui.splitter->setStretchFactor(1, 200);
//m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
//m_ui.effectlist->horizontalHeader()->setVisible(false);
m_clipref = c;
if (c) {
QString cname = m_clipref->clipName();
- if (cname.length() > 20) {
+ if (cname.length() > 30) {
m_ui.checkAll->setToolTip(i18n("Effects for %1").arg(cname));
- cname.truncate(17);
+ cname.truncate(27);
m_ui.checkAll->setText(i18n("Effects for %1").arg(cname) + "...");
} else {
m_ui.checkAll->setToolTip(QString());
if (m_clipref == NULL) {
m_ui.effectlist->blockSignals(true);
m_ui.effectlist->clear();
- m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0);
+ ItemInfo info;
+ m_effectedit->transferParamDesc(QDomElement(), info);
//m_ui.region_url->clear();
m_ui.effectlist->blockSignals(false);
m_ui.checkAll->setToolTip(QString());
{
bool disable = true;
if (item->checkState() == Qt::Checked) disable = false;
- m_ui.frame->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));
m_ui.buttonShowComments->setEnabled(false);
m_ui.labelComment->setHidden(true);
} else {
- qMin(ix, 0);
- qMax(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);
+ ItemInfo info;
+ m_effectedit->transferParamDesc(QDomElement(), info);
//m_ui.region_url->clear();
} else slotItemSelectionChanged(false);
slotUpdateCheckAllButton();
eff = m_currentEffectList.at(activeRow);
if (m_trackMode) {
// showing track effects
- m_effectedit->transferParamDesc(eff, 0, 0, m_trackInfo.duration);
- } else m_effectedit->transferParamDesc(eff,
- 0,
- m_clipref->cropStart().frames(KdenliveSettings::project_fps()),
- (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps()) - 1); //minx max frame
+ 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->setEnabled(isChecked);
m_ui.buttonShowComments->setEnabled(hasItem);
emit showComments(m_ui.buttonShowComments->isChecked());
if (m_trackMode) {
EffectsList::setParameter(dom, "in", QString::number(0));
EffectsList::setParameter(dom, "out", QString::number(m_trackInfo.duration));
- m_effectedit->transferParamDesc(dom, 0, 0, m_trackInfo.duration);//minx max frame
+ 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_effectedit->transferParamDesc(dom, m_clipref->info());
//m_ui.region_url->setUrl(KUrl(dom.attribute("region")));
emit updateEffect(m_clipref, -1, old, dom, activeRow);
}
m_ui.buttonUp->setEnabled(false);
m_ui.buttonDown->setEnabled(false);
m_ui.checkAll->setEnabled(false);
- m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0);
+ ItemInfo info;
+ m_effectedit->transferParamDesc(QDomElement(), info);
//m_ui.region_url->clear();
m_ui.buttonShowComments->setEnabled(false);
m_ui.labelComment->setText(QString());
void EffectStackView::slotCheckMonitorPosition(int renderPos)
{
- if (m_trackMode || (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);