X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackview.cpp;h=dccceb75eeedac082f8db5418083c7e05d2317fa;hb=16968707d51d1b04a6a4f34ec69e02ef81e0b656;hp=1812e6f44761d31052daa92762f55bab768c8e8e;hpb=9b0d40696d1298285d9f55b0ff68f6aa9fb1bae4;p=kdenlive

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 1812e6f4..dccceb75 100644
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -15,79 +15,104 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QHeaderView>
-#include <QMenu>
-#include <QInputDialog>
-#include <QTextStream>
-#include <QFile>
+
+#include "effectstackview.h"
+#include "effectslist.h"
+#include "clipitem.h"
+#include "mainwindow.h"
+#include "docclipbase.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KLocale>
 #include <KMessageBox>
 #include <KStandardDirs>
 
-#include "effectstackview.h"
-#include "effectslist.h"
-#include "clipitem.h"
-#include "mainwindow.h"
+#include <QMenu>
+#include <QTextStream>
+#include <QFile>
+#include <QInputDialog>
 
 
-EffectStackView::EffectStackView(QWidget *parent)
-        : QWidget(parent) {
-    ui.setupUi(this);
-    effectedit = new EffectStackEdit(ui.frame, this);
-    //ui.effectlist->horizontalHeader()->setVisible(false);
-    //ui.effectlist->verticalHeader()->setVisible(false);
-    clipref = NULL;
-
-    ui.buttonNew->setIcon(KIcon("document-new"));
-    ui.buttonNew->setToolTip(i18n("Add new effect"));
-    ui.buttonUp->setIcon(KIcon("go-up"));
-    ui.buttonUp->setToolTip(i18n("Move effect up"));
-    ui.buttonDown->setIcon(KIcon("go-down"));
-    ui.buttonDown->setToolTip(i18n("Move effect down"));
-    ui.buttonDel->setIcon(KIcon("trash-empty"));
-    ui.buttonDel->setToolTip(i18n("Delete effect"));
-    ui.buttonSave->setIcon(KIcon("document-save"));
-    ui.buttonSave->setToolTip(i18n("Save effect"));
-    ui.buttonReset->setIcon(KIcon("view-refresh"));
-    ui.buttonReset->setToolTip(i18n("Reset effect"));
-
-
-    ui.effectlist->setDragDropMode(QAbstractItemView::NoDragDrop);//use internal if drop is recognised right
-
-    connect(ui.effectlist, SIGNAL(itemSelectionChanged()), this , SLOT(slotItemSelectionChanged()));
-    connect(ui.effectlist, SIGNAL(itemChanged(QListWidgetItem *)), this , SLOT(slotItemChanged(QListWidgetItem *)));
-    connect(ui.buttonNew, SIGNAL(clicked()), this, SLOT(slotNewEffect()));
-    connect(ui.buttonUp, SIGNAL(clicked()), this, SLOT(slotItemUp()));
-    connect(ui.buttonDown, SIGNAL(clicked()), this, SLOT(slotItemDown()));
-    connect(ui.buttonDel, SIGNAL(clicked()), this, SLOT(slotItemDel()));
-    connect(ui.buttonSave, SIGNAL(clicked()), this, SLOT(slotSaveEffect()));
-    connect(ui.buttonReset, SIGNAL(clicked()), this, SLOT(slotResetEffect()));
-    connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), effectedit , SLOT(transferParamDesc(const QDomElement&, int , int)));
-    connect(effectedit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&)));
-    effectLists["audio"] = &MainWindow::audioEffects;
-    effectLists["video"] = &MainWindow::videoEffects;
-    effectLists["custom"] = &MainWindow::customEffects;
-
-    ui.infoBox->hide();
+EffectStackView::EffectStackView(QWidget *parent) :
+        QWidget(parent)
+{
+    m_ui.setupUi(this);
+    QVBoxLayout *vbox1 = new QVBoxLayout(m_ui.frame);
+    m_effectedit = new EffectStackEdit(m_ui.frame);
+    vbox1->setContentsMargins(0, 0, 0, 0);
+    vbox1->setSpacing(0);
+    vbox1->addWidget(m_effectedit);
+    m_ui.frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+    //m_ui.effectlist->horizontalHeader()->setVisible(false);
+    //m_ui.effectlist->verticalHeader()->setVisible(false);
+    m_clipref = NULL;
+
+    m_ui.buttonNew->setIcon(KIcon("document-new"));
+    m_ui.buttonNew->setToolTip(i18n("Add new effect"));
+    m_ui.buttonUp->setIcon(KIcon("go-up"));
+    m_ui.buttonUp->setToolTip(i18n("Move effect up"));
+    m_ui.buttonDown->setIcon(KIcon("go-down"));
+    m_ui.buttonDown->setToolTip(i18n("Move effect down"));
+    m_ui.buttonDel->setIcon(KIcon("edit-delete"));
+    m_ui.buttonDel->setToolTip(i18n("Delete effect"));
+    m_ui.buttonSave->setIcon(KIcon("document-save"));
+    m_ui.buttonSave->setToolTip(i18n("Save effect"));
+    m_ui.buttonReset->setIcon(KIcon("view-refresh"));
+    m_ui.buttonReset->setToolTip(i18n("Reset effect"));
+
+
+    m_ui.effectlist->setDragDropMode(QAbstractItemView::NoDragDrop);//use internal if drop is recognised right
+
+    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()));
+    connect(m_ui.buttonDown, SIGNAL(clicked()), this, SLOT(slotItemDown()));
+    connect(m_ui.buttonDel, SIGNAL(clicked()), this, SLOT(slotItemDel()));
+    connect(m_ui.buttonSave, SIGNAL(clicked()), this, SLOT(slotSaveEffect()));
+    connect(m_ui.buttonReset, SIGNAL(clicked()), this, SLOT(slotResetEffect()));
+    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)));
+    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);
 }
 
-void EffectStackView::slotSaveEffect() {
+EffectStackView::~EffectStackView()
+{
+    m_effectLists.clear();
+    delete m_effectedit;
+}
+
+void EffectStackView::setMenu(QMenu *menu)
+{
+    m_ui.buttonNew->setMenu(menu);
+}
+
+void EffectStackView::updateProjectFormat(MltVideoProfile profile, Timecode t)
+{
+    m_effectedit->updateProjectFormat(profile, t);
+}
+
+void EffectStackView::slotSaveEffect()
+{
     QString name = QInputDialog::getText(this, i18n("Save Effect"), i18n("Name for saved effect: "));
     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 already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return;
 
-    int i = ui.effectlist->currentRow();
+    int i = m_ui.effectlist->currentRow();
     QDomDocument doc;
-    QDomElement effect = clipref->effectAt(i).cloneNode().toElement();
+    QDomElement effect = m_clipref->effectAt(i).cloneNode().toElement();
     doc.appendChild(doc.importNode(effect, true));
     effect = doc.firstChild().toElement();
     effect.removeAttribute("kdenlive_ix");
     effect.setAttribute("id", name);
+    effect.setAttribute("type", "custom");
     QDomElement effectname = effect.firstChildElement("name");
     effect.removeChild(effectname);
     effectname = doc.createElement("name");
@@ -108,21 +133,33 @@ void EffectStackView::slotSaveEffect() {
     emit reloadEffects();
 }
 
-void EffectStackView::slotUpdateEffectParams(const QDomElement& old, const QDomElement& e) {
-    if (clipref)
-        emit updateClipEffect(clipref, old, e, ui.effectlist->currentRow());
+void EffectStackView::slotUpdateEffectParams(const QDomElement old, const QDomElement e)
+{
+    if (m_clipref)
+        emit updateClipEffect(m_clipref, old, e, m_ui.effectlist->currentRow());
 }
 
-void EffectStackView::slotClipItemSelected(ClipItem* c) {
-    int ix = 0;
-    if (c && c == clipref) {
-        ix = ui.effectlist->currentRow();
+void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
+{
+    if (c && !c->isEnabled()) return;
+    if (c && c == m_clipref) {
+        if (ix == -1) ix = m_ui.effectlist->currentRow();
     } else {
-        clipref = c;
-        if (c) ix = c->selectedEffectIndex();
+        m_clipref = c;
+        if (c) {
+            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;
     }
-    if (clipref == NULL) {
-        ui.effectlist->clear();
+    if (m_clipref == NULL) {
+        m_ui.effectlist->blockSignals(true);
+        m_ui.effectlist->clear();
+        m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+        m_ui.effectlist->blockSignals(false);
         setEnabled(false);
         return;
     }
@@ -130,171 +167,162 @@ void EffectStackView::slotClipItemSelected(ClipItem* c) {
     setupListView(ix);
 }
 
-void EffectStackView::slotItemChanged(QListWidgetItem *item) {
+void EffectStackView::slotItemChanged(QListWidgetItem *item)
+{
     bool disable = true;
     if (item->checkState() == Qt::Checked) disable = false;
-    ui.buttonReset->setEnabled(!disable);
-    int activeRow = ui.effectlist->currentRow();
+    m_ui.frame->setEnabled(!disable);
+    m_ui.buttonReset->setEnabled(!disable);
+    int activeRow = m_ui.effectlist->currentRow();
     if (activeRow >= 0) {
-        emit changeEffectState(clipref, activeRow, disable);
+        m_effectedit->updateParameter("disable", QString::number((int) disable));
+        emit changeEffectState(m_clipref, activeRow, disable);
     }
 }
 
 
-void EffectStackView::setupListView(int ix) {
-    ui.effectlist->clear();
-    for (int i = 0;i < clipref->effectsCount();i++) {
-        QDomElement d = clipref->effectAt(i);
+void EffectStackView::setupListView(int ix)
+{
+    m_ui.effectlist->blockSignals(true);
+    m_ui.effectlist->clear();
+
+    // Issue 238: Add icons for effect type in effectstack.
+    KIcon videoIcon("kdenlive-show-video");
+    KIcon audioIcon("kdenlive-show-audio");
+    KIcon customIcon("kdenlive-custom-effect");
+    QListWidgetItem* item;
+
+    for (int i = 0; i < m_clipref->effectsCount(); i++) {
+        const QDomElement d = m_clipref->effectAt(i);
+        if (d.isNull()) {
+            kDebug() << " . . . . WARNING, NULL EFFECT IN STACK!!!!!!!!!";
+            continue;
+        }
+
+        /*QDomDocument doc;
+        doc.appendChild(doc.importNode(d, true));
+        kDebug() << "IMPORTED STK: " << doc.toString();*/
+
         QDomNode namenode = d.elementsByTagName("name").item(0);
         if (!namenode.isNull()) {
-            QListWidgetItem* item = new QListWidgetItem(namenode.toElement().text(), ui.effectlist);
+            // 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);
+            } else if ("custom" == type) {
+                item = new QListWidgetItem(customIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
+            } else {
+                item = new QListWidgetItem(videoIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
+            }
             item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-            if (d.attribute("disabled") == "1") item->setCheckState(Qt::Unchecked);
+            if (d.attribute("disable") == "1") item->setCheckState(Qt::Unchecked);
             else item->setCheckState(Qt::Checked);
         }
     }
-    if (clipref->effectsCount() == 0) {
-        emit transferParamDesc(QDomElement(), 0, 100);
-        ui.buttonDel->setEnabled(false);
-        ui.buttonSave->setEnabled(false);
-        ui.buttonReset->setEnabled(false);
-        ui.buttonUp->setEnabled(false);
-        ui.buttonDown->setEnabled(false);
+    if (m_ui.effectlist->count() == 0) {
+        m_ui.buttonDel->setEnabled(false);
+        m_ui.buttonSave->setEnabled(false);
+        m_ui.buttonReset->setEnabled(false);
+        m_ui.buttonUp->setEnabled(false);
+        m_ui.buttonDown->setEnabled(false);
     } else {
         if (ix < 0) ix = 0;
-        if (ix > ui.effectlist->count() - 1) ix = ui.effectlist->count() - 1;
-        ui.effectlist->setCurrentRow(ix);
-        ui.buttonDel->setEnabled(true);
-        ui.buttonSave->setEnabled(true);
-        ui.buttonReset->setEnabled(true);
-        ui.buttonUp->setEnabled(ix > 0);
-        ui.buttonDown->setEnabled(ix < clipref->effectsCount() - 1);
+        if (ix > m_ui.effectlist->count() - 1) ix = m_ui.effectlist->count() - 1;
+        m_ui.effectlist->setCurrentRow(ix);
     }
+    m_ui.effectlist->blockSignals(false);
+    if (m_ui.effectlist->count() == 0) m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+    else slotItemSelectionChanged(false);
 }
 
-void EffectStackView::slotItemSelectionChanged() {
-    bool hasItem = ui.effectlist->currentItem();
-    int activeRow = ui.effectlist->currentRow();
+void EffectStackView::slotItemSelectionChanged(bool update)
+{
+    bool hasItem = m_ui.effectlist->currentItem();
+    int activeRow = m_ui.effectlist->currentRow();
     bool isChecked = false;
-    if (hasItem && ui.effectlist->currentItem()->checkState() == Qt::Checked) isChecked = true;
-    if (hasItem && ui.effectlist->currentItem()->isSelected()) {
-        emit transferParamDesc(clipref->effectAt(activeRow), 0, 100);//minx max frame
+    if (hasItem && m_ui.effectlist->currentItem()->checkState() == Qt::Checked) isChecked = true;
+    if (hasItem && m_ui.effectlist->currentItem()->isSelected()) {
+        m_effectedit->transferParamDesc(m_clipref->effectAt(activeRow), m_clipref->cropStart().frames(KdenliveSettings::project_fps()), m_clipref->cropDuration().frames(KdenliveSettings::project_fps()));//minx max frame
     }
-    if (clipref) clipref->setSelectedEffect(activeRow);
-    ui.buttonDel->setEnabled(hasItem);
-    ui.buttonSave->setEnabled(hasItem);
-    ui.buttonReset->setEnabled(hasItem && isChecked);
-    ui.buttonUp->setEnabled(activeRow > 0);
-    ui.buttonDown->setEnabled((activeRow < ui.effectlist->count() - 1) && hasItem);
+    if (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.buttonUp->setEnabled(activeRow > 0);
+    m_ui.buttonDown->setEnabled((activeRow < m_ui.effectlist->count() - 1) && hasItem);
+    m_ui.frame->setEnabled(isChecked);
 }
 
-void EffectStackView::slotItemUp() {
-    int activeRow = ui.effectlist->currentRow();
-    if (activeRow > 0) {
-        QDomElement act = clipref->effectAt(activeRow).cloneNode().toElement();
-        QDomElement before = clipref->effectAt(activeRow - 1).cloneNode().toElement();
-        clipref->setEffectAt(activeRow - 1, act);
-        clipref->setEffectAt(activeRow, before);
-    }
-    QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
-    ui.effectlist->insertItem(activeRow - 1, item);
-    ui.effectlist->setCurrentItem(item);
-    emit changeEffectPosition(clipref, activeRow + 1, activeRow);
+void EffectStackView::slotItemUp()
+{
+    int activeRow = m_ui.effectlist->currentRow();
+    if (activeRow <= 0) return;
+    emit changeEffectPosition(m_clipref, activeRow + 1, activeRow);
 }
 
-void EffectStackView::slotItemDown() {
-    int activeRow = ui.effectlist->currentRow();
-    if (activeRow < ui.effectlist->count() - 1) {
-        QDomElement act = clipref->effectAt(activeRow).cloneNode().toElement();
-        QDomElement after = clipref->effectAt(activeRow + 1).cloneNode().toElement();
-        clipref->setEffectAt(activeRow + 1, act);
-        clipref->setEffectAt(activeRow, after);
-    }
-    QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
-    ui.effectlist->insertItem(activeRow + 1, item);
-    ui.effectlist->setCurrentItem(item);
-    emit changeEffectPosition(clipref, activeRow + 1, activeRow + 2);
+void EffectStackView::slotItemDown()
+{
+    int activeRow = m_ui.effectlist->currentRow();
+    if (activeRow >= m_ui.effectlist->count() - 1) return;
+    emit changeEffectPosition(m_clipref, activeRow + 1, activeRow + 2);
 }
 
-void EffectStackView::slotItemDel() {
-    int activeRow = ui.effectlist->currentRow();
+void EffectStackView::slotItemDel()
+{
+    int activeRow = m_ui.effectlist->currentRow();
     if (activeRow >= 0) {
-        emit removeEffect(clipref, clipref->effectAt(activeRow));
+        emit removeEffect(m_clipref, m_clipref->effectAt(activeRow));
     }
 }
 
-void EffectStackView::slotResetEffect() {
-    int activeRow = ui.effectlist->currentRow();
+void EffectStackView::slotResetEffect()
+{
+    int activeRow = m_ui.effectlist->currentRow();
     if (activeRow < 0) return;
-    QDomElement old = clipref->effectAt(activeRow).cloneNode().toElement();
+    QDomElement old = m_clipref->effectAt(activeRow).cloneNode().toElement();
     QDomElement dom;
-    QString effectName = ui.effectlist->currentItem()->text();
-    foreach(const QString &type, effectLists.keys()) {
-        EffectsList *list = effectLists[type];
+    QString effectName = m_ui.effectlist->currentItem()->text();
+    foreach(const QString &type, m_effectLists.keys()) {
+        EffectsList *list = m_effectLists[type];
         if (list->effectNames().contains(effectName)) {
-            dom = list->getEffectByName(effectName);
+            dom = list->getEffectByName(effectName).cloneNode().toElement();
             break;
         }
     }
     if (!dom.isNull()) {
         dom.setAttribute("kdenlive_ix", old.attribute("kdenlive_ix"));
-        emit transferParamDesc(dom, 0, 100);//minx max frame
-        emit updateClipEffect(clipref, old, dom, activeRow);
+        m_clipref->initEffect(dom);
+        m_effectedit->transferParamDesc(dom, m_clipref->cropStart().frames(KdenliveSettings::project_fps()), m_clipref->cropDuration().frames(KdenliveSettings::project_fps()));//minx max frame
+        emit updateClipEffect(m_clipref, old, dom, activeRow);
     }
 }
 
-void EffectStackView::slotNewEffect() {
-    int ix = ui.effectlist->currentRow();
-    QMenu *displayMenu = new QMenu(this);
-    displayMenu->setTitle("Filters");
-    foreach(const QString &type, effectLists.keys()) {
-        QAction *a = new QAction(type, displayMenu);
-        EffectsList *list = effectLists[type];
-
-        QMenu *parts = new QMenu(type, displayMenu);
-        parts->setTitle(type);
-        foreach(const QString &name, list->effectNames()) {
-            QAction *entry = new QAction(name, parts);
-            entry->setData(name);
-            entry->setToolTip(list->getInfo(name));
-            entry->setStatusTip(list->getInfo(name));
-            parts->addAction(entry);
-            //QAction
-        }
-        displayMenu->addMenu(parts);
-
-    }
-
-    QAction *result = displayMenu->exec(mapToGlobal(ui.buttonNew->pos() + ui.buttonNew->rect().bottomRight()));
-
-    if (result) {
-        //TODO effects.append(result->data().toString());
-        foreach(const EffectsList *e, effectLists.values()) {
-            QDomElement dom = e->getEffectByName(result->data().toString());
-            if (clipref)
-                clipref->addEffect(dom);
-            slotClipItemSelected(clipref);
-        }
-
-        setupListView(ix);
-        //kDebug()<< result->data();
-    }
-    delete displayMenu;
 
+void EffectStackView::raiseWindow(QWidget* dock)
+{
+    if (m_clipref && dock)
+        dock->raise();
 }
 
-void EffectStackView::raiseWindow(QWidget* dock) {
-    if (clipref && dock)
-        dock->raise();
+void EffectStackView::clear()
+{
+    m_ui.effectlist->blockSignals(true);
+    m_ui.effectlist->clear();
+    m_ui.buttonDel->setEnabled(false);
+    m_ui.buttonSave->setEnabled(false);
+    m_ui.buttonReset->setEnabled(false);
+    m_ui.buttonUp->setEnabled(false);
+    m_ui.buttonDown->setEnabled(false);
+    m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+    m_ui.effectlist->blockSignals(false);
 }
 
-void EffectStackView::clear() {
-    ui.effectlist->clear();
-    ui.buttonDel->setEnabled(false);
-    ui.buttonSave->setEnabled(false);
-    ui.buttonReset->setEnabled(false);
-    ui.buttonUp->setEnabled(false);
-    ui.buttonDown->setEnabled(false);
+
+void EffectStackView::slotSeekTimeline(int pos)
+{
+    if (!m_clipref) return;
+    emit seekTimeline(m_clipref->startPos().frames(KdenliveSettings::project_fps()) + pos);
 }
 
 #include "effectstackview.moc"