Improve startup Wizard:

* Do not abort if avformat module not present
* Inform user about state of important MLT modules
* Show list of available audio/video codecs using MLT's new info command (acodec-list...)

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47516e016429858da56bf32b60a8cac2c92968e5..c6af541039e8b471882dba76c695129b7dfbcd86 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,6 +62,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/wizardstandard_ui.ui
   widgets/wizardextra_ui.ui
   widgets/wizardcheck_ui.ui
+  widgets/wizardmltcheck_ui.ui
   widgets/spacerdialog_ui.ui
   widgets/addtrack_ui.ui
 )

diff --git a/src/widgets/wizardmltcheck_ui.ui b/src/widgets/wizardmltcheck_ui.ui
new file mode 100644 (file)
index 0000000..d57e5e2
--- /dev/null
+++ b/src/widgets/wizardmltcheck_ui.ui
@@ -0,0 +1,73 @@
+<ui version="4.0" >
+ <class>WizardMltCheck_UI</class>
+ <widget class="QWidget" name="WizardMltCheck_UI" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>451</width>
+    <height>284</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <attribute name="title" >
+       <string>Installed modules</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QTreeWidget" name="programList" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <column>
+          <property name="text" >
+           <string>1</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <attribute name="title" >
+       <string>Available Codecs (avformat)</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Audio Codecs</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Video Codecs</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QListWidget" name="acodecs_list" />
+       </item>
+       <item row="1" column="1" >
+        <widget class="QListWidget" name="vcodecs_list" />
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/wizard.cpp b/src/wizard.cpp
index a11303a6dd713f06db5c058d7de95afdc75a2149..a9b6e1cb5ff8d6bb47ccae97a72f10365fef9281 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -44,6 +44,14 @@ Wizard::Wizard(QWidget *parent): QWizard(parent) {
     page1->setLayout(m_startLayout);
     addPage(page1);
 
+    QWizardPage *page4 = new QWizardPage;
+    page4->setTitle(i18n("Checking MLT engine"));
+    m_mltCheck.setupUi(page4);
+    addPage(page4);
+
+    WizardDelegate *listViewDelegate = new WizardDelegate(m_mltCheck.programList);
+    m_mltCheck.programList->setItemDelegate(listViewDelegate);
+
     QWizardPage *page2 = new QWizardPage;
     page2->setTitle(i18n("Video Standard"));
     m_standard.setupUi(page2);
@@ -84,18 +92,119 @@ Wizard::Wizard(QWidget *parent): QWizard(parent) {
     addPage(page3);
 
 
-    QWizardPage *page4 = new QWizardPage;
-    page4->setTitle(i18n("Checking system"));
-    m_check.setupUi(page4);
+    QWizardPage *page5 = new QWizardPage;
+    page5->setTitle(i18n("Checking system"));
+    m_check.setupUi(page5);
     slotCheckPrograms();
-    addPage(page4);
+    addPage(page5);
 
-    WizardDelegate *listViewDelegate = new WizardDelegate(m_check.programList);
+    listViewDelegate = new WizardDelegate(m_check.programList);
     m_check.programList->setItemDelegate(listViewDelegate);
 
     QTimer::singleShot(500, this, SLOT(slotCheckMlt()));
 }
 
+
+void Wizard::checkMltComponents() {
+    m_mltCheck.programList->setColumnCount(2);
+    m_mltCheck.programList->setRootIsDecorated(false);
+    m_mltCheck.programList->setHeaderHidden(true);
+    QSize itemSize(20, this->fontMetrics().height() * 2.5);
+    KIcon okIcon("dialog-ok");
+    KIcon missingIcon("dialog-close");
+    m_mltCheck.programList->setColumnWidth(0, 30);
+    m_mltCheck.programList->setIconSize(QSize(24, 24));
+
+
+    QTreeWidgetItem *item = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Inigo") + " (" + KdenliveSettings::rendererpath() + ')');
+    item->setData(1, Qt::UserRole, i18n("Required for rendering (part of MLT package)"));
+    item->setSizeHint(0, itemSize);
+    item->setIcon(0, okIcon);
+
+    // Check MLT's installed producers
+    QProcess checkProcess;
+    checkProcess.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "producer");
+    if (!checkProcess.waitForStarted()) {
+        item->setIcon(0, missingIcon);
+        item->setData(1, Qt::UserRole, i18n("Error starting MLT's command line player (inigo)"));
+        button(QWizard::NextButton)->setEnabled(false);
+    } else {
+        checkProcess.waitForFinished();
+        QByteArray result = checkProcess.readAllStandardError();
+
+        // Check MLT avformat module
+        QTreeWidgetItem *avformatItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Avformat module (FFmpeg)"));
+        avformatItem->setData(1, Qt::UserRole, i18n("Required to work with various video formats (hdv, mpeg, flash, ...)"));
+        avformatItem->setSizeHint(0, itemSize);
+        if (!result.contains("- avformat")) {
+            avformatItem->setIcon(0, missingIcon);
+            m_mltCheck.tabWidget->setTabEnabled(1, false);
+        } else {
+            avformatItem->setIcon(0, okIcon);
+            // Check installed codecs
+            QProcess checkProcess2;
+            checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-producer" << "avformat:acodec-list");
+            if (!checkProcess2.waitForStarted()) {
+                m_mltCheck.tabWidget->setTabEnabled(1, false);
+                kDebug() << "// Error parsing MLT's avformat codecs";
+            } else {
+                checkProcess2.waitForFinished();
+                QByteArray codecList = checkProcess2.readAllStandardError();
+                QString acodecList(codecList);
+                acodecList = acodecList.section("...", 0, 0);
+                QStringList alist = acodecList.split("\n", QString::SkipEmptyParts);
+                for (int i = 0; i < alist.count(); i++) {
+                    if (alist.at(i).contains("- ")) m_audioCodecs.append(alist.at(i).section("- ", 1).simplified());
+                }
+                m_mltCheck.acodecs_list->addItems(m_audioCodecs);
+                //kDebug()<<"// FOUND LIST:\n\n"<<m_audioCodecs<<"\n\n++++++++++++++++++++";
+            }
+            checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-producer" << "avformat:vcodec-list");
+            if (!checkProcess2.waitForStarted()) {
+                kDebug() << "// Error parsing MLT's avformat codecs";
+            } else {
+                checkProcess2.waitForFinished();
+                QByteArray codecList = checkProcess2.readAllStandardError();
+                QString vcodecList(codecList);
+                vcodecList = vcodecList.section("...", 0, 0);
+                QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts);
+                for (int i = 0; i < vlist.count(); i++) {
+                    if (vlist.at(i).contains("- ")) m_videoCodecs.append(vlist.at(i).section("- ", 1).simplified());
+                }
+                m_mltCheck.vcodecs_list->addItems(m_videoCodecs);
+                //kDebug()<<"// FOUND LIST:\n\n"<<m_videoCodecs<<"\n\n++++++++++++++++++++";
+            }
+
+
+        }
+
+        // Check MLT dv module
+        QTreeWidgetItem *dvItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("DV module (libdv)"));
+        dvItem->setData(1, Qt::UserRole, i18n("Required to work with dv files if avformat module is not installed"));
+        dvItem->setSizeHint(0, itemSize);
+        if (!result.contains("- libdv")) {
+            dvItem->setIcon(0, missingIcon);
+        } else {
+            dvItem->setIcon(0, okIcon);
+        }
+
+        // Check MLT image format module
+        QTreeWidgetItem *imageItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("QImage module"));
+        imageItem->setData(1, Qt::UserRole, i18n("Required to work with images"));
+        imageItem->setSizeHint(0, itemSize);
+        if (!result.contains("- qimage")) {
+            imageItem->setIcon(0, missingIcon);
+            imageItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Pixbuf module"));
+            imageItem->setData(1, Qt::UserRole, i18n("Required to work with images"));
+            imageItem->setSizeHint(0, itemSize);
+            if (!result.contains("- pixbuf")) imageItem->setIcon(0, missingIcon);
+            else imageItem->setIcon(0, okIcon);
+        } else {
+            imageItem->setIcon(0, okIcon);
+        }
+    }
+}
+
 void Wizard::slotCheckPrograms() {
     m_check.programList->setColumnCount(2);
     m_check.programList->setRootIsDecorated(false);
@@ -105,6 +214,7 @@ void Wizard::slotCheckPrograms() {
     KIcon missingIcon("dialog-close");
     m_check.programList->setColumnWidth(0, 30);
     m_check.programList->setIconSize(QSize(24, 24));
+
     QTreeWidgetItem *item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("FFmpeg & ffplay"));
     item->setData(1, Qt::UserRole, i18n("Required for webcam capture"));
     item->setSizeHint(0, itemSize);
@@ -125,11 +235,6 @@ void Wizard::slotCheckPrograms() {
     if (KStandardDirs::findExe("dvgrab").isEmpty()) item->setIcon(0, missingIcon);
     else item->setIcon(0, okIcon);
 
-    item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("Inigo"));
-    item->setData(1, Qt::UserRole, i18n("Required for rendering (part of MLT package)"));
-    item->setSizeHint(0, itemSize);
-    if (KStandardDirs::findExe("inigo").isEmpty()) item->setIcon(0, missingIcon);
-    else item->setIcon(0, okIcon);
 }
 
 void Wizard::installExtraMimes(QString baseName, QStringList globs) {
@@ -267,7 +372,7 @@ void Wizard::slotCheckMlt() {
     if (KdenliveSettings::rendererpath().isEmpty()) {
         errorMessage.append(i18n("your MLT installation cannot be found. Install MLT and restart Kdenlive.\n"));
     }
-    QProcess checkProcess;
+    /*QProcess checkProcess;
     checkProcess.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "producer");
     if (!checkProcess.waitForStarted())
         errorMessage.append(i18n("Error starting MLT's command line player (inigo)") + ".\n");
@@ -275,7 +380,7 @@ void Wizard::slotCheckMlt() {
     checkProcess.waitForFinished();
 
     QByteArray result = checkProcess.readAllStandardError();
-    if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");
+    if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");*/
 
     QProcess checkProcess2;
     checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "consumer");
@@ -284,7 +389,7 @@ void Wizard::slotCheckMlt() {
 
     checkProcess2.waitForFinished();
 
-    result = checkProcess2.readAllStandardError();
+    QByteArray result = checkProcess2.readAllStandardError();
     if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + "\n");
 
     if (!errorMessage.isEmpty()) {
@@ -299,6 +404,8 @@ void Wizard::slotCheckMlt() {
         m_systemCheckIsOk = false;
         button(QWizard::NextButton)->setEnabled(false);
     } else m_systemCheckIsOk = true;
+
+    if (m_systemCheckIsOk) checkMltComponents();
 }
 
 bool Wizard::isOk() const {

diff --git a/src/wizard.h b/src/wizard.h
index c76b9b9a6fdfd768dcdd268ec1a635a8750cccea..97a42e015a03a4a19e3ad0cefa97a0dea4cf58c7 100644 (file)
--- a/src/wizard.h
+++ b/src/wizard.h
@@ -31,7 +31,7 @@
 #include "ui_wizardstandard_ui.h"
 #include "ui_wizardextra_ui.h"
 #include "ui_wizardcheck_ui.h"
-
+#include "ui_wizardmltcheck_ui.h"
 
 class WizardDelegate: public QItemDelegate {
 public:
@@ -81,6 +81,7 @@ public:
 private:
     Ui::WizardStandard_UI m_standard;
     Ui::WizardExtra_UI m_extra;
+    Ui::WizardMltCheck_UI m_mltCheck;
     Ui::WizardCheck_UI m_check;
     QVBoxLayout *m_startLayout;
     bool m_systemCheckIsOk;
@@ -89,6 +90,9 @@ private:
     QStringList m_otherProfiles;
     QMap <QString, QString> m_profilesInfo;
     void slotCheckPrograms();
+    void checkMltComponents();
+    QStringList m_audioCodecs;
+    QStringList m_videoCodecs;
 
 private slots:
     void slotCheckThumbs();