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 daa92360ff3ff5638230d7846be1d8da5aac6e28..7c2ee74fb088421de24fe8a192df766db0c4d624 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -34,36 +34,36 @@ TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent) {
     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();
-     }
-     emit transitionUpdated(e, m_usedTransition->toXML());*/
-    if (m_usedTransition && m_usedTransition->transitionName() == ui.listWidget->currentItem()->text() && !e.attribute("tag").isNull()) {
-        slotUpdateEffectParams(e, e);
-    } else
-        slotUpdateEffectParams(e, MainWindow::transitions.getEffectByName(ui.listWidget->currentItem()->text()));
-    emit transferParamDesc(m_usedTransition->toXML(), 0, 0);
+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);
+    }
 }
 
 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) {
-            disconnect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
+            ui.listWidget->blockSignals(true);
             ui.listWidget->setCurrentItem(list[0]);
-            connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
+            slotTransitionChanged(false);
+            ui.listWidget->blockSignals(false);
         }
     }
 
@@ -74,11 +74,11 @@ void TransitionSettings::slotUpdateEffectParams(const QDomElement& oldparam, con
         m_usedTransition->setTransitionParameters(param);
         m_usedTransition->update();
     }
-    QString test;
+    /*QString test;
     QTextStream str(&test);
     oldparam.save(str, 2);
-    m_usedTransition->toXML().save(str, 2);
-    kDebug() << test;
+    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);
 }