* Add "Progressive" checkbox to allow users enabling or disabling progressive renderi...

http://www.kdenlive.org/mantis/view.php?id=323

svn path=/branches/KDE4/; revision=2658

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 2c4f1f2c18ac3204dee048082bad39149c640dbc..e1c6ddad83a2fab84ed6ef423c06fe90cbb6eb4a 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -365,7 +365,9 @@ void RenderWidget::slotExport() {
     renderArgs.replace("%width", QString::number(m_profile.width));
     renderArgs.replace("%height", QString::number(m_profile.height));
     renderArgs.replace("%dar", "@" + QString::number(m_profile.display_aspect_num) + "/" + QString::number(m_profile.display_aspect_den));
-    emit doRender(m_view.out_file->url().path(), item->data(RenderRole).toString(), overlayargs, renderArgs.split(' '), m_view.render_zone->isChecked(), m_view.play_after->isChecked(), startPos, endPos);
+    if (m_view.force_progressive->isChecked()) renderArgs.append(" progressive=1");
+    else renderArgs.append(" progressive=0");
+    emit doRender(m_view.out_file->url().path(), item->data(RenderRole).toString(), overlayargs, renderArgs.simplified().split(' '), m_view.render_zone->isChecked(), m_view.play_after->isChecked(), startPos, endPos);
 }
 
 void RenderWidget::setProfile(MltVideoProfile profile) {
@@ -373,6 +375,7 @@ void RenderWidget::setProfile(MltVideoProfile profile) {
     //WARNING: this way to tell the video standard is a bit hackish...
     if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) m_view.format_selection->setCurrentIndex(0);
     else m_view.format_selection->setCurrentIndex(1);
+    m_view.force_progressive->setChecked(m_profile.progressive);
     refreshView();
 }
 

diff --git a/src/widgets/renderwidget_ui.ui b/src/widgets/renderwidget_ui.ui
index d40b3694defdf3b3933b5bdf2029ddab5f62df21..5fb862a098ab6f1ec8a87c59cd134a1b8710d9bb 100644 (file)
--- a/src/widgets/renderwidget_ui.ui
+++ b/src/widgets/renderwidget_ui.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>362</width>
-    <height>382</height>
+    <width>407</width>
+    <height>463</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -40,6 +40,68 @@
        <string>Templates</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>Format</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <spacer name="horizontalSpacer_2" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>165</width>
+           <height>24</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="2" >
+        <widget class="KComboBox" name="format_selection" >
+         <item>
+          <property name="text" >
+           <string>PAL</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>NTSC</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="0" column="3" >
+        <widget class="QToolButton" name="buttonEdit" >
+         <property name="text" >
+          <string>E</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="4" >
+        <widget class="QToolButton" name="buttonInfo" >
+         <property name="text" >
+          <string>I</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="5" >
+        <widget class="QToolButton" name="buttonSave" >
+         <property name="text" >
+          <string>S</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="6" >
+        <widget class="QToolButton" name="buttonDelete" >
+         <property name="text" >
+          <string>D</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="0" colspan="7" >
         <widget class="QSplitter" name="splitter_3" >
          <property name="orientation" >
@@ -76,68 +138,13 @@
          </widget>
         </widget>
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label_3" >
-         <property name="text" >
-          <string>Format</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="5" >
-        <widget class="QToolButton" name="buttonEdit" >
-         <property name="text" >
-          <string>E</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="6" >
-        <widget class="QToolButton" name="buttonDelete" >
-         <property name="text" >
-          <string>D</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1" >
-        <spacer name="horizontalSpacer_2" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>165</width>
-           <height>24</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="0" column="4" >
-        <widget class="QToolButton" name="buttonSave" >
+       <item row="2" column="0" colspan="7" >
+        <widget class="QCheckBox" name="force_progressive" >
          <property name="text" >
-          <string>S</string>
+          <string>Progressive</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="3" >
-        <widget class="QToolButton" name="buttonInfo" >
-         <property name="text" >
-          <string>I</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2" >
-        <widget class="KComboBox" name="format_selection" >
-         <item>
-          <property name="text" >
-           <string>PAL</string>
-          </property>
-         </item>
-         <item>
-          <property name="text" >
-           <string>NTSC</string>
-          </property>
-         </item>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>
@@ -170,7 +177,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="3" >
+   <item row="5" column="0" colspan="3" >
     <widget class="QGroupBox" name="guides_box" >
      <property name="title" >
       <string/>
@@ -211,9 +218,14 @@
        </widget>
       </item>
      </layout>
+     <zorder>label_4</zorder>
+     <zorder>guide_start</zorder>
+     <zorder>label_2</zorder>
+     <zorder>guide_end</zorder>
+     <zorder>ktabwidget</zorder>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
+   <item row="7" column="0" colspan="3" >
     <layout class="QHBoxLayout" name="horizontalLayout_3" >
      <item>
       <widget class="QCheckBox" name="play_after" >
@@ -231,7 +243,7 @@
      </item>
     </layout>
    </item>
-   <item row="6" column="0" >
+   <item row="9" column="0" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -244,14 +256,7 @@
      </property>
     </spacer>
    </item>
-   <item row="7" column="0" >
-    <widget class="KPushButton" name="buttonStart" >
-     <property name="text" >
-      <string>Start Rendering</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1" >
+   <item row="10" column="1" >
     <spacer name="horizontalSpacer" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -264,7 +269,7 @@
      </property>
     </spacer>
    </item>
-   <item row="7" column="2" >
+   <item row="10" column="2" >
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -274,6 +279,13 @@
      </property>
     </widget>
    </item>
+   <item row="10" column="0" >
+    <widget class="KPushButton" name="buttonStart" >
+     <property name="text" >
+      <string>Start Rendering</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>