Fix several warnings, cleanup effect settings layout

[kdenlive] / src / effectstackedit.cpp

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 816bf266d1d1974e680abe3186bcc9613ed971ac..85192626b084b86c1e8681a27bacf635727ffb04 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -15,9 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <KDebug>
-#include <KLocale>
-#include "effectstackedit.h"
 #include <QVBoxLayout>
 #include <QSlider>
 #include <QLabel>
@@ -25,46 +22,40 @@
 #include <QCheckBox>
 #include <QScrollArea>
 
+#include <KDebug>
+#include <KLocale>
+
 #include "ui_constval_ui.h"
 #include "ui_listval_ui.h"
 #include "ui_boolval_ui.h"
 #include "ui_colorval_ui.h"
 #include "ui_wipeval_ui.h"
 #include "complexparameter.h"
-
+#include "effectstackedit.h"
 #include "geometryval.h"
 
 QMap<QString, QImage> EffectStackEdit::iconCache;
 
-EffectStackEdit::EffectStackEdit(QFrame* frame, QWidget *parent): QObject(parent), m_in(0), m_out(0) {
-    QScrollArea *area;
-    QVBoxLayout *vbox1 = new QVBoxLayout(frame);
-    QVBoxLayout *vbox2 = new QVBoxLayout(frame);
-    vbox = new QVBoxLayout(frame);
+EffectStackEdit::EffectStackEdit(QWidget *parent): QWidget(parent), m_in(0), m_out(0) {
+    setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+    setBackgroundRole(QPalette::Dark);
+    QVBoxLayout *vbox1 = new QVBoxLayout(parent);
     vbox1->setContentsMargins(0, 0, 0, 0);
     vbox1->setSpacing(0);
-    vbox2->setContentsMargins(0, 0, 0, 0);
-    vbox2->setSpacing(0);
-    vbox->setContentsMargins(0, 0, 0, 0);
-    vbox->setSpacing(0);
-    frame->setLayout(vbox1);
-    QFont widgetFont = frame->font();
-    widgetFont.setPointSize(widgetFont.pointSize() - 2);
-    frame->setFont(widgetFont);
 
-    area = new QScrollArea(frame);
-    QWidget *wid = new QWidget(area);
+    QScrollArea *area = new QScrollArea;
+    QWidget *wid = new QWidget(parent);
     area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     wid->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-    //area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::MinimumExpanding));
+    area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
 
     vbox1->addWidget(area);
-    wid->setLayout(vbox2);
-    vbox2->addLayout(vbox);
-    vbox2->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding));
     area->setWidget(wid);
     area->setWidgetResizable(true);
+    vbox = new QVBoxLayout(wid);
+    vbox->setContentsMargins(0, 0, 0, 0);
+    vbox->setSpacing(0);
     wid->show();
 
 }
@@ -99,7 +90,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
         QDomElement pa = namenode.item(i).toElement();
         QDomNode na = pa.firstChildElement("name");
         QString type = pa.attribute("type");
-        QString paramName = na.toElement().text();
+        QString paramName = i18n(na.toElement().text().toUtf8().data());
         QWidget * toFillin = new QWidget;
         QString value = pa.attribute("value").isNull() ?
                         pa.attribute("default") : pa.attribute("value");
@@ -142,7 +133,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
                 }
             }
             connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
-            lsval->title->setTitle(na.toElement().text());
+            lsval->title->setTitle(paramName);
             valueItems[paramName] = lsval;
             uiItems.append(lsval);
         } else if (type == "bool") {
@@ -151,7 +142,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
             bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked);
 
             connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters()));
-            bval->checkBox->setText(na.toElement().text());
+            bval->checkBox->setText(paramName);
             valueItems[paramName] = bval;
             uiItems.append(bval);
         } else if (type == "complex") {
@@ -190,7 +181,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
             kDebug() << value.toUInt(&ok, 16);
 
             connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters()));
-            cval->label->setText(na.toElement().text());
+            cval->label->setText(paramName);
             valueItems[paramName] = cval;
             uiItems.append(cval);
         } else if (type == "wipe") {
@@ -259,6 +250,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
             vbox->addWidget(toFillin);
         }
     }
+    vbox->addStretch();
 }
 
 void EffectStackEdit::slotSeekToPos(int pos) {
@@ -339,27 +331,29 @@ void EffectStackEdit::collectAllParameters() {
         QDomNode pa = namenode.item(i);
         QDomNode na = pa.firstChildElement("name");
         QString type = pa.attributes().namedItem("type").nodeValue();
+        QString paramName = i18n(na.toElement().text().toUtf8().data());
+
         QString setValue;
         if (type == "double" || type == "constant") {
-            QSlider* slider = ((Ui::Constval_UI*)valueItems[na.toElement().text()])->horizontalSlider;
+            QSlider* slider = ((Ui::Constval_UI*)valueItems[paramName])->horizontalSlider;
             setValue = QString::number(slider->value());
         } else if (type == "list") {
-            KComboBox *box = ((Ui::Listval_UI*)valueItems[na.toElement().text()])->list;
+            KComboBox *box = ((Ui::Listval_UI*)valueItems[paramName])->list;
             setValue = box->itemData(box->currentIndex()).toString();
         } else if (type == "bool") {
-            QCheckBox *box = ((Ui::Boolval_UI*)valueItems[na.toElement().text()])->checkBox;
+            QCheckBox *box = ((Ui::Boolval_UI*)valueItems[paramName])->checkBox;
             setValue = box->checkState() == Qt::Checked ? "1" : "0" ;
         } else if (type == "color") {
-            KColorButton *color = ((Ui::Colorval_UI*)valueItems[na.toElement().text()])->kcolorbutton;
+            KColorButton *color = ((Ui::Colorval_UI*)valueItems[paramName])->kcolorbutton;
             setValue.sprintf("0x%08x", color->color().rgba());
         } else if (type == "complex") {
-            ComplexParameter *complex = ((ComplexParameter*)valueItems[na.toElement().text()+"complex"]);
+            ComplexParameter *complex = ((ComplexParameter*)valueItems[paramName+"complex"]);
             namenode.item(i) = complex->getParamDesc();
         } else if (type == "geometry") {
-            Geometryval *geom = ((Geometryval*)valueItems[na.toElement().text()+"geometry"]);
+            Geometryval *geom = ((Geometryval*)valueItems[paramName+"geometry"]);
             namenode.item(i) = geom->getParamDesc();
         } else if (type == "wipe") {
-            Ui::Wipeval_UI *wp = (Ui::Wipeval_UI*)valueItems[na.toElement().text()];
+            Ui::Wipeval_UI *wp = (Ui::Wipeval_UI*)valueItems[paramName];
             wipeInfo info;
             if (wp->start_left->isChecked()) info.start = LEFT;
             else if (wp->start_right->isChecked()) info.start = RIGHT;
@@ -414,4 +408,10 @@ void EffectStackEdit::clearAllItems() {
     uiItems.clear();
     items.clear();
     valueItems.clear();
+    QLayoutItem *item = vbox->itemAt(0);
+    while (item) {
+        vbox->removeItem(item);
+        delete item;
+        item = vbox->itemAt(0);
+    }
 }