- Remove ugly fix, which prevented infinite loop in obscure when size (opacity in...

- cleanup spacer dialog

svn path=/trunk/kdenlive/; revision=4519

diff --git a/effects/obscure.xml b/effects/obscure.xml
index b595c0799eb8ee9915cffd314a12e8f8a2416b19..83e61e741c94c98e4da6914a60c8ee7b1d28a4ab 100644 (file)
--- a/effects/obscure.xml
+++ b/effects/obscure.xml
@@ -3,7 +3,7 @@
        <name>Obscure</name>
        <description>Hide a region of the clip</description>
        <author>Charles Yates</author>
-       <parameter type="geometry" name="start" default="40%,40%:20%x20%" fixed="1" opacity="nonzero">
+       <parameter type="geometry" name="start" default="40%,40%:20%x20%" fixed="1">
                <name>Region</name>
        </parameter>
 </effect>

diff --git a/src/geometryval.cpp b/src/geometryval.cpp
index 736214a566c7eb649009f7f62b07f5995c4ffe48..981b537a34b1431e0195441f67eac3519279ccd0 100644 (file)
--- a/src/geometryval.cpp
+++ b/src/geometryval.cpp
@@ -381,8 +381,6 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame)
     if (par.attribute("opacity") == "false") {
         label_opacity->setHidden(true);
         spinTransp->setHidden(true);
-    } else if (par.attribute("opacity") == "nonzero") {
-        spinTransp->setMinimum(1);
     }
     char *tmp = (char *) qstrdup(val.toUtf8().data());
     if (m_geom) m_geom->parse(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);

diff --git a/src/spacerdialog.cpp b/src/spacerdialog.cpp
index 66ddbbb626748b2c1c0b64a2b7344c39a36fff87..3cd4132eb6cddb7fced7579d5081cc6bd88ae5c1 100644 (file)
--- a/src/spacerdialog.cpp
+++ b/src/spacerdialog.cpp
@@ -31,8 +31,8 @@ SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, QList
         m_in(tc)
 {
     setFont(KGlobalSettings::toolBarFont());
-    m_view.setupUi(this);
-    m_view.inputLayout->addWidget(&m_in);
+    setupUi(this);
+    inputLayout->addWidget(&m_in);
     m_in.setValue(duration);
 
     QStringList trackItems;
@@ -43,8 +43,8 @@ SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, QList
         else
             trackItems << QString::number(i);
     }
-    m_view.track_number->addItems(trackItems);
-    m_view.track_number->setCurrentIndex(track);
+    track_number->addItems(trackItems);
+    track_number->setCurrentIndex(track);
 
     adjustSize();
 }
@@ -56,7 +56,7 @@ GenTime SpacerDialog::selectedDuration()
 
 int SpacerDialog::selectedTrack()
 {
-    return m_view.track_number->currentIndex() - 1;
+    return track_number->currentIndex() - 1;
 }
 
 #include "spacerdialog.moc"

diff --git a/src/spacerdialog.h b/src/spacerdialog.h
index 711019bef2052d3e65c79af2b87c4d5cfb75ac97..8c0dcb9c8656fcb39fd45bd5e9d4aec7cd2fe292 100644 (file)
--- a/src/spacerdialog.h
+++ b/src/spacerdialog.h
@@ -27,7 +27,13 @@
 #include "timecodedisplay.h"
 #include "definitions.h"
 
-class SpacerDialog : public QDialog
+/**
+ * @class SpacerDialog
+ * @brief A dialog to specify length and track of inserted space.
+ * @author Jean-Baptiste Mardelle
+ */
+
+class SpacerDialog : public QDialog, public Ui::SpacerDialog_UI
 {
     Q_OBJECT
 
@@ -37,7 +43,6 @@ public:
     int selectedTrack();
 
 private:
-    Ui::SpacerDialog_UI m_view;
     TimecodeDisplay m_in;
 };
 

diff --git a/src/widgets/spacerdialog_ui.ui b/src/widgets/spacerdialog_ui.ui
index b1f1099e9743df59ae79e49d537c9bc1a7d2fd4c..c08b2aaf26a57b87b2cbfc4d7133d31f31bc9448 100644 (file)
--- a/src/widgets/spacerdialog_ui.ui
+++ b/src/widgets/spacerdialog_ui.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>331</width>
-    <height>111</height>
+    <width>180</width>
+    <height>85</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Add space</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0" colspan="4">
+   <item row="3" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -24,39 +24,39 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="0" column="0">
+    <widget class="QLabel" name="clip_filesize_2">
+     <property name="text">
+      <string>Duration</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
     <widget class="QLabel" name="clip_filesize_3">
      <property name="text">
       <string>Track</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="3">
+   <item row="1" column="1">
+    <widget class="KComboBox" name="track_number"/>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="inputLayout"/>
+   </item>
+   <item row="2" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>218</width>
-       <height>2</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="0" column="1">
-    <widget class="QLabel" name="clip_filesize_2">
-     <property name="text">
-      <string>Duration</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2" colspan="2">
-    <widget class="KComboBox" name="track_number"/>
-   </item>
-   <item row="0" column="2" colspan="2">
-    <layout class="QHBoxLayout" name="inputLayout"/>
-   </item>
   </layout>
  </widget>
  <customwidgets>