Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / clipstabilize.cpp

diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp
index fcae5095833f8c2dccd128d507011b429ea5035b..cc19e28618730b524c329f4c112b2e42bf8c28db 100644 (file)
--- a/src/clipstabilize.cpp
+++ b/src/clipstabilize.cpp
@@ -43,6 +43,7 @@ ClipStabilize::ClipStabilize(const QString &dest, int count, const QString &filt
     setupUi(this);
     setWindowTitle(i18n("Stabilize Clip"));
     auto_add->setText(i18np("Add clip to project", "Add clips to project", count));
+    auto_add->setChecked(KdenliveSettings::add_new_clip());
 
     QPalette p = palette();
     KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
@@ -91,7 +92,7 @@ ClipStabilize::ClipStabilize(const QString &dest, int count, const QString &filt
         ls << "maxangle,type,int,value,-1,min,-1,max,1000,tooltip,max anglen to rotate (in rad)";
         ls << "crop,type,bool,value,0,min,0,max,1,tooltip,0 = keep border  1 = black background";
         ls << "invert,type,bool,value,0,min,0,max,1,tooltip,invert transform";
-        ls << "realtive,type,bool,value,1,min,0,max,1,tooltip,0 = absolute transform  1= relative";
+        ls << "relative,type,bool,value,1,min,0,max,1,tooltip,0 = absolute transform  1= relative";
         ls << "zoom,type,int,value,0,min,-500,max,500,tooltip,additional zoom during transform";
         ls << "optzoom,type,bool,value,1,min,0,max,1,tooltip,use optimal zoom (calulated from transforms)";
         ls << "sharpen,type,double,value,0.8,min,0,max,1,decimals,1,tooltip,sharpen transformed image";
@@ -132,6 +133,7 @@ ClipStabilize::~ClipStabilize()
     /*if (m_stabilizeProcess.state() != QProcess::NotRunning) {
         m_stabilizeProcess.close();
     }*/
+    KdenliveSettings::setAdd_new_clip(auto_add->isChecked());
 }
 
 QStringList ClipStabilize::params()
@@ -147,7 +149,7 @@ QStringList ClipStabilize::params()
     QHashIterator <QString,QHash<QString,QString> > it(m_ui_params);
     while (it.hasNext()){
         it.next();
-        filterparamsList << it.key() + "=" + it.value().value("value");
+        filterparamsList << it.key() + '=' + it.value().value("value");
     }
     params << filterparamsList.join(" ");
     
@@ -164,7 +166,7 @@ QString ClipStabilize::destination() const
     if (m_count == 1)
         return dest_url->url().path();
     else
-        return dest_url->url().directory(KUrl::AppendTrailingSlash);
+        return dest_url->url().path(KUrl::AddTrailingSlash);
 }
 
 QString ClipStabilize::desc() const
@@ -256,7 +258,7 @@ void ClipStabilize::fillParameters(QStringList lst)
     m_ui_params.clear();
     while (!lst.isEmpty()){
         QString vallist=lst.takeFirst();
-        QStringList cont=vallist.split(",");
+        QStringList cont=vallist.split(',');
         QString name=cont.takeFirst();
         while (!cont.isEmpty()){
             QString valname=cont.takeFirst();