X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcomplexparameter.cpp;h=02298a937e40cff8f68a576da0d9945ee8c8fa1c;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=a50d01bb8aecb885f079fb75dbf8f3f267595184;hpb=b3bee700d4fdfd373b3897e0b03db9a0466cc10c;p=kdenlive

diff --git a/src/complexparameter.cpp b/src/complexparameter.cpp
index a50d01bb..02298a93 100644
--- a/src/complexparameter.cpp
+++ b/src/complexparameter.cpp
@@ -15,103 +15,128 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "complexparameter.h"
+
 #include <KDebug>
 #include <KLocale>
 
-#include "complexparameter.h"
-#include "effectslist.h"
-#include "clipitem.h"
+
 #include <QHeaderView>
 #include <QMenu>
 
-ComplexParameter::ComplexParameter(QWidget *parent)
-: QWidget(parent)
+ComplexParameter::ComplexParameter(QWidget *parent) :
+        QWidget(parent)
 {
-	ui.setupUi(this);
-	//ui.effectlist->horizontalHeader()->setVisible(false);
-	//ui.effectlist->verticalHeader()->setVisible(false);
-	activeRow=-1;
-	clipref=NULL;
-
-	
-	ui.buttonLeftRight->setIcon(KIcon("go-next"));//better icons needed
-	ui.buttonLeftRight->setToolTip(i18n("Allow horizontal moves"));
-	ui.buttonUpDown->setIcon(KIcon("go-up"));
-	ui.buttonUpDown->setToolTip(i18n("Allow vertical moves"));
-	ui.buttonShowInTimeline->setIcon(KIcon("kmplayer"));
-	ui.buttonShowInTimeline->setToolTip(i18n("Show keyframes in timeline"));
-	ui.buttonHelp->setIcon(KIcon("help-about"));
-	ui.buttonHelp->setToolTip(i18n("Parameter info"));
-	ui.buttonNewPoints->setIcon(KIcon("xedit"));
-	ui.buttonNewPoints->setToolTip(i18n("Add keyframe"));
-	
-	connect (ui.buttonLeftRight, SIGNAL (clicked()), this , SLOT ( slotSetMoveX() ) );
-	connect (ui.buttonUpDown, SIGNAL (clicked()), this , SLOT ( slotSetMoveY() ) );
-	connect (ui.buttonShowInTimeline, SIGNAL (clicked()), this , SLOT ( slotShowInTimeline() ) );
-	connect (ui.buttonNewPoints, SIGNAL (clicked()), this , SLOT ( slotSetNew() ) );
-	connect (ui.buttonHelp, SIGNAL (clicked()), this , SLOT ( slotSetHelp() ) );
-	connect (ui.parameterList, SIGNAL (currentIndexChanged ( const QString &  ) ), this, SLOT( slotParameterChanged(const QString&) ) );
-	//connect (ui.effectlist, SIGNAL (itemSelectionChanged() ) , this, SLOT ( itemSelectionChanged()));
-	connect( this,SIGNAL (transferParamDesc(const QDomElement&,int ,int) ), ui.kplotwidget, SLOT(setPointLists(const QDomElement&,int ,int) ));
-	connect(ui.kplotwidget, SIGNAL (parameterChanged(QDomElement ) ), this , SLOT (slotUpdateEffectParams(QDomElement)));
-	/*ÜeffectLists["audio"]=audioEffectList;
-	effectLists["video"]=videoEffectList;
-	effectLists["custom"]=customEffectList;*/
-	
-	ui.infoBox->hide();	
-	updateButtonStatus();
-	
+    m_ui.setupUi(this);
+    //m_ui.effectlist->horizontalHeader()->setVisible(false);
+    //m_ui.effectlist->verticalHeader()->setVisible(false);
+
+
+    m_ui.buttonLeftRight->setIcon(KIcon("go-next"));//better icons needed
+    m_ui.buttonLeftRight->setToolTip(i18n("Allow horizontal moves"));
+    m_ui.buttonUpDown->setIcon(KIcon("go-up"));
+    m_ui.buttonUpDown->setToolTip(i18n("Allow vertical moves"));
+    m_ui.buttonShowInTimeline->setIcon(KIcon("kmplayer"));
+    m_ui.buttonShowInTimeline->setToolTip(i18n("Show keyframes in timeline"));
+    m_ui.buttonHelp->setIcon(KIcon("help-about"));
+    m_ui.buttonHelp->setToolTip(i18n("Parameter info"));
+    m_ui.buttonNewPoints->setIcon(KIcon("document-new"));
+    m_ui.buttonNewPoints->setToolTip(i18n("Add keyframe"));
+
+    connect(m_ui.buttonLeftRight, SIGNAL(clicked()), this , SLOT(slotSetMoveX()));
+    connect(m_ui.buttonUpDown, SIGNAL(clicked()), this , SLOT(slotSetMoveY()));
+    connect(m_ui.buttonShowInTimeline, SIGNAL(clicked()), this , SLOT(slotShowInTimeline()));
+    connect(m_ui.buttonNewPoints, SIGNAL(clicked()), this , SLOT(slotSetNew()));
+    connect(m_ui.buttonHelp, SIGNAL(clicked()), this , SLOT(slotSetHelp()));
+    connect(m_ui.parameterList, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotParameterChanged(QString)));
+    connect(m_ui.kplotwidget, SIGNAL(parameterChanged(QDomElement)), this , SLOT(slotUpdateEffectParams(QDomElement)));
+    connect(m_ui.kplotwidget, SIGNAL(parameterList(QStringList)), this , SLOT(slotUpdateParameterList(QStringList)));
+    /*ÜeffectLists["audio"]=audioEffectList;
+    effectLists["video"]=videoEffectList;
+    effectLists["custom"]=customEffectList;*/
+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+    m_ui.infoBox->hide();
+    updateButtonStatus();
 }
 
+void ComplexParameter::slotSetMoveX()
+{
+    m_ui.kplotwidget->setMoveX(!m_ui.kplotwidget->isMoveX());
+    updateButtonStatus();
+}
 
+void ComplexParameter::slotSetMoveY()
+{
+    m_ui.kplotwidget->setMoveY(!m_ui.kplotwidget->isMoveY());
+    updateButtonStatus();
+}
 
-void ComplexParameter::slotSetMoveX(){
-	ui.kplotwidget->setMoveX(!ui.kplotwidget->isMoveX());
-	updateButtonStatus();
+void ComplexParameter::slotSetNew()
+{
+    m_ui.kplotwidget->setNewPoints(!m_ui.kplotwidget->isNewPoints());
+    updateButtonStatus();
 }
 
-void ComplexParameter::slotSetMoveY(){
-	ui.kplotwidget->setMoveY(!ui.kplotwidget->isMoveY());
-	updateButtonStatus();
+void ComplexParameter::slotSetHelp()
+{
+    m_ui.infoBox->setVisible(!m_ui.infoBox->isVisible());
+    m_ui.buttonHelp->setDown(m_ui.infoBox->isVisible());
 }
 
-void ComplexParameter::slotSetNew(){
-	ui.kplotwidget->setNewPoints(!ui.kplotwidget->isNewPoints());
-	updateButtonStatus();
+void ComplexParameter::slotShowInTimeline()
+{
+
+    m_ui.kplotwidget->setMoveTimeLine(!m_ui.kplotwidget->isMoveTimeline());
+    updateButtonStatus();
 }
 
-void ComplexParameter::slotSetHelp(){
-	ui.infoBox->setVisible(!ui.infoBox->isVisible());
-	ui.buttonHelp->setDown(ui.infoBox->isVisible());
+void ComplexParameter::updateButtonStatus()
+{
+    m_ui.buttonLeftRight->setDown(m_ui.kplotwidget->isMoveX());
+    m_ui.buttonUpDown->setDown(m_ui.kplotwidget->isMoveY());
+
+    m_ui.buttonShowInTimeline->setEnabled(m_ui.kplotwidget->isMoveX() || m_ui.kplotwidget->isMoveY());
+    m_ui.buttonShowInTimeline->setDown(m_ui.kplotwidget->isMoveTimeline());
+
+    m_ui.buttonNewPoints->setEnabled(m_ui.parameterList->currentText() != "all");
+    m_ui.buttonNewPoints->setDown(m_ui.kplotwidget->isNewPoints());
 }
 
-void ComplexParameter::slotShowInTimeline(){
+void ComplexParameter::slotParameterChanged(const QString& text)
+{
+    //m_ui.buttonNewPoints->setEnabled(text!="all");
+    m_ui.kplotwidget->replot(text);
+    updateButtonStatus();
+}
 
-	ui.kplotwidget->setMoveTimeLine(!ui.kplotwidget->isMoveTimeline());
-	updateButtonStatus();
-	
+void ComplexParameter::setupParam(const QDomElement &d, const QString& paramName, int from, int to)
+{
+    m_param = d;
+    m_ui.kplotwidget->setPointLists(d, paramName, from, to);
 }
 
-void ComplexParameter::updateButtonStatus(){
-	ui.buttonLeftRight->setDown(ui.kplotwidget->isMoveX());
-	ui.buttonUpDown->setDown(ui.kplotwidget->isMoveY());
-	
-	ui.buttonShowInTimeline->setEnabled( ui.kplotwidget->isMoveX() || ui.kplotwidget->isMoveY ()  );
-	ui.buttonShowInTimeline->setDown(ui.kplotwidget->isMoveTimeline());
-	
-	ui.buttonNewPoints->setEnabled(ui.parameterList->currentText()!="all");
-	ui.buttonNewPoints->setDown(ui.kplotwidget->isNewPoints());
+void ComplexParameter::itemSelectionChanged()
+{
+    //kDebug() << "drop";
 }
 
-void ComplexParameter::slotParameterChanged(const QString& text){
-	
-	//ui.buttonNewPoints->setEnabled(text!="all");
-	ui.kplotwidget->replot(text);
-	updateButtonStatus();
+void ComplexParameter::slotUpdateEffectParams(const QDomElement &e)
+{
+    m_param = e;
+    emit parameterChanged();
 }
 
+QDomElement ComplexParameter::getParamDesc() const
+{
+    return m_param;
+}
 
-void ComplexParameter::itemSelectionChanged (){
-	//kDebug() << "drop";
+void ComplexParameter::slotUpdateParameterList(const QStringList &l)
+{
+    kDebug() << l ;
+    m_ui.parameterList->clear();
+    m_ui.parameterList->addItem("all");
+    m_ui.parameterList->addItems(l);
 }
+
 #include "complexparameter.moc"