From: <j-...@us...> - 2008-11-10 20:42:51
|
Revision: 2660 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2660&view=rev Author: j-b-m Date: 2008-11-10 20:42:46 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Make rendering "progressive" checkbox semi-checked for automatic MLT detection, then users can force it by checking or unchecking it Modified Paths: -------------- branches/KDE4/src/renderwidget.cpp branches/KDE4/src/widgets/renderwidget_ui.ui Modified: branches/KDE4/src/renderwidget.cpp =================================================================== --- branches/KDE4/src/renderwidget.cpp 2008-11-10 20:41:35 UTC (rev 2659) +++ branches/KDE4/src/renderwidget.cpp 2008-11-10 20:42:46 UTC (rev 2660) @@ -365,8 +365,8 @@ 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 @@ //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(); } Modified: branches/KDE4/src/widgets/renderwidget_ui.ui =================================================================== --- branches/KDE4/src/widgets/renderwidget_ui.ui 2008-11-10 20:41:35 UTC (rev 2659) +++ branches/KDE4/src/widgets/renderwidget_ui.ui 2008-11-10 20:42:46 UTC (rev 2660) @@ -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" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |