Disable (until fixed) show frame on mouse move with razor tool. Fixes crash on clip...

[kdenlive] / src / transitionsettings.cpp

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index 5d6af62ff7178e44ffab30dcd9cbdaab6680869d..7c2ee74fb088421de24fe8a192df766db0c4d624 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -15,46 +15,77 @@
  *                                                                         *
  ***************************************************************************/
 
+
+#include <KDebug>
+
 #include "transitionsettings.h"
 #include "transition.h"
-#include <KDebug>
 #include "effectslist.h"
 #include "effectstackedit.h"
+#include "mainwindow.h"
 
-TransitionSettings::TransitionSettings(EffectsList *transitions, QWidget* parent): QWidget(parent) {
+TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent) {
     ui.setupUi(this);
     effectEdit = new EffectStackEdit(ui.frame, this);
     setEnabled(false);
-    m_transitions = transitions;
-    ui.listWidget->addItems(transitions->effectNames());
-    kDebug() << transitions->effectNames().size() << " -" << transitions->size();
+    ui.listWidget->addItems(MainWindow::transitions.effectNames());
+    kDebug() << MainWindow::transitions.effectNames().size();
+    ui.listWidget->setCurrentRow(0);
     connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
     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&)));
+    ui.splitter->setStretchFactor(0, 1);
+    ui.splitter->setStretchFactor(1, 10);
 }
 
 
-void TransitionSettings::slotTransitionChanged() {
-    QDomElement e = m_usedTransition->toXML();
-
-    //set old values from e in <ktransition> to desc (like reverse and so )
-    QDomElement desc = m_transitions->getEffectByName(ui.listWidget->currentItem()->text());
-    if (m_usedTransition) {
-        m_usedTransition->setTransitionParameters(desc);
-        m_usedTransition->update();
+void TransitionSettings::slotTransitionChanged(bool reinit) {
+    QDomElement e = m_usedTransition->toXML().cloneNode().toElement();
+    if (reinit) {
+        QDomElement newTransition = MainWindow::transitions.getEffectByName(ui.listWidget->currentItem()->text());
+        slotUpdateEffectParams(e, newTransition);
+        emit transferParamDesc(newTransition, 0, 0);
+    } else {
+        //slotUpdateEffectParams(e, e);
+        emit transferParamDesc(e, 0, 0);
     }
-    emit transitionUpdated(e, m_usedTransition->toXML());
-    emit transferParamDesc(desc, 0, 0);
-
 }
 
 void TransitionSettings::slotTransitionItemSelected(Transition* t) {
     setEnabled(t != NULL);
+    if (t == m_usedTransition) {
+        return;
+    }
     m_usedTransition = t;
+    if (m_usedTransition) {
+        QList<QListWidgetItem*> list = ui.listWidget->findItems(m_usedTransition->transitionName(), Qt::MatchExactly);
+        if (list.size() > 0) {
+            ui.listWidget->blockSignals(true);
+            ui.listWidget->setCurrentItem(list[0]);
+            slotTransitionChanged(false);
+            ui.listWidget->blockSignals(false);
+        }
+    }
 
 }
 
 void TransitionSettings::slotUpdateEffectParams(const QDomElement& oldparam, const QDomElement& param) {
+    if (m_usedTransition) {
+        m_usedTransition->setTransitionParameters(param);
+        m_usedTransition->update();
+    }
+    /*QString test;
+    QTextStream str(&test);
+    oldparam.save(str, 2);
+    m_usedTransition->toXML().save(str, 2);*/
+    //kDebug() << test;
+    //oldparam must be also first given to Transition and then return the toXML()
+    emit transitionUpdated(m_usedTransition, oldparam);
+}
+
+void TransitionSettings::raiseWindow(QWidget* dock) {
+    if (dock && m_usedTransition)
+        dock->raise();
 
-    emit transitionUpdated(oldparam, param);
 }
+