From 7bf12a82afcb449a25f61167c3d0e73febd23f1d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Fri, 5 Oct 2012 08:50:54 +0200 Subject: [PATCH] Allow user to bypass available codec detection --- src/kdenlivesettings.kcfg | 5 ++ src/renderwidget.cpp | 15 ++-- src/widgets/configmisc_ui.ui | 133 ++++++++++++++++++----------------- 3 files changed, 85 insertions(+), 68 deletions(-) diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg index 516d42a8..96a4f57f 100644 --- a/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -60,6 +60,11 @@ false + + + false + + 00:00:05:00 diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 53848345..35e40814 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -1241,9 +1241,14 @@ void RenderWidget::refreshView() KIcon brokenIcon("dialog-close"); KIcon warningIcon("dialog-warning"); - const QStringList formatsList = KdenliveSettings::supportedformats(); - const QStringList vcodecsList = KdenliveSettings::videocodecs(); - const QStringList acodecsList = KdenliveSettings::audiocodecs(); + QStringList formatsList; + QStringList vcodecsList; + QStringList acodecsList; + if (!KdenliveSettings::bypasscodeccheck()) { + formatsList= KdenliveSettings::supportedformats(); + vcodecsList = KdenliveSettings::videocodecs(); + acodecsList = KdenliveSettings::audiocodecs(); + } KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color(); @@ -1894,7 +1899,7 @@ void RenderWidget::parseScriptFiles() QTextStream stream(&file); while (!stream.atEnd()) { QString line = stream.readLine(); - kDebug()<<"# :"<setIcon(0, KIcon("dialog-cancel")); diff --git a/src/widgets/configmisc_ui.ui b/src/widgets/configmisc_ui.ui index 8f151efd..a4dbf7b8 100644 --- a/src/widgets/configmisc_ui.ui +++ b/src/widgets/configmisc_ui.ui @@ -7,7 +7,7 @@ 0 0 380 - 345 + 395 @@ -17,6 +17,27 @@ 0 + + + + Use on-monitor effects + + + + + + + Disable parameters when the effect is disabled + + + + + + + Check if first added clip matches project profile + + + @@ -24,7 +45,48 @@ - + + + + Automatically import all streams in multi stream clips + + + + + + + Automatically import image sequences + + + + + + + Transparent background for imported images + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Use KDE job tracking for render jobs + + + + Default Durations @@ -92,47 +154,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Automatically import image sequences - - - - - - - Check if first added clip matches project profile - - - - - - - Use on-monitor effects - - - - - - - Transparent background for imported images - - - @@ -140,20 +161,6 @@ - - - - Crash recovery (automatic backup) - - - - - - - Use KDE job tracking for render jobs - - - @@ -161,17 +168,17 @@ - - + + - Disable parameters when the effect is disabled + Crash recovery (automatic backup) - - + + - Automatically import all streams in multi stream clips + Bypass codec verification -- 2.39.2