raise effect/transition dockwidgets when specific item is selected

[kdenlive] / src / transitionsettings.cpp

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index b24d6485471862b1b1c2916d5e149a08aee374f8..daa92360ff3ff5638230d7846be1d8da5aac6e28 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -22,14 +22,15 @@
 #include "transition.h"
 #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&)));
@@ -41,18 +42,30 @@ 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());
-    emit transferParamDesc(desc, 0, 0);
+    /* 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::slotTransitionItemSelected(Transition* t) {
     setEnabled(t != NULL);
     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->setCurrentItem(list[0]);
+            connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
+        }
+    }
 
 }
 
@@ -61,6 +74,18 @@ void TransitionSettings::slotUpdateEffectParams(const QDomElement& oldparam, con
         m_usedTransition->setTransitionParameters(param);
         m_usedTransition->update();
     }
-//oldparam must be also first given to Transition and then return the toXML()
-    emit transitionUpdated(oldparam, m_usedTransition->toXML());
+    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();
+
+}
+