Make rendering "progressive" checkbox semi-checked for automatic MLT detection, then...

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

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index e1c6ddad83a2fab84ed6ef423c06fe90cbb6eb4a..abc03066e988c00f2ba196b8855a9b6ad9f1c16d 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -365,8 +365,8 @@ 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));
-    if (m_view.force_progressive->isChecked()) renderArgs.append(" progressive=1");
-    else renderArgs.append(" progressive=0");
+    if (m_view.force_progressive->checkState() == Qt::Checked) renderArgs.append(" progressive=1");
+    else if (m_view.force_progressive->checkState() == Qt::Unchecked) 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);
 }
 
@@ -375,7 +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);
+    m_view.force_progressive->setCheckState(Qt::PartiallyChecked);
     refreshView();
 }
 

diff --git a/src/widgets/renderwidget_ui.ui b/src/widgets/renderwidget_ui.ui
index 5fb862a098ab6f1ec8a87c59cd134a1b8710d9bb..1e9191336109f152d431ad820c23083f600b3d27 100644 (file)
--- a/src/widgets/renderwidget_ui.ui
+++ b/src/widgets/renderwidget_ui.ui
@@ -143,6 +143,9 @@
          <property name="text" >
           <string>Progressive</string>
          </property>
+         <property name="tristate" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -218,11 +221,6 @@
        </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="7" column="0" colspan="3" >