Fix detection of missing codecs in render dialog, use kmessagewidget to inform user

svn path=/trunk/kdenlive/; revision=6009

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 6250d230e5df4c3674a9859a72e6af5e2ce274c6..39cc878a84708d3332bd70c2fe682b130e4a5571 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -223,6 +223,19 @@ RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidg
 
     focusFirstVisibleItem();
     adjustSize();
+
+#if KDE_IS_VERSION(4,7,0)
+    m_infoMessage = new KMessageWidget;
+    QGridLayout *s =  static_cast <QGridLayout*> (m_view.tab->layout());
+    s->addWidget(m_infoMessage, 12, 0, 1, -1);
+    m_infoMessage->hide();
+#endif
+}
+
+QSize RenderWidget::sizeHint() const
+{
+    // Make sure the widget has minimum size on opening
+    return QSize(200, 200);
 }
 
 RenderWidget::~RenderWidget()
@@ -2030,12 +2043,23 @@ void RenderWidget::missingClips(bool hasMissing)
 void RenderWidget::errorMessage(const QString &message)
 {
     if (!message.isEmpty()) {
+#if KDE_IS_VERSION(4,7,0)
+        m_infoMessage->setMessageType(KMessageWidget::Warning);
+        m_infoMessage->setText(message);
+        m_infoMessage->animatedShow();
+#else
         m_view.errorLabel->setText(message);
         m_view.errorBox->setHidden(false);
+#endif
     }
     else {
+#if KDE_IS_VERSION(4,7,0)
+        m_infoMessage->animatedHide();
+#else
         m_view.errorBox->setHidden(true);
         m_view.errorLabel->setText(QString());
+#endif
+
     }
 }
 

diff --git a/src/renderwidget.h b/src/renderwidget.h
index 6dd8ac4cad11b263945d1bf1eb73ba6f21ae25ce..b6137b181d88f17c53db5786249b9e591134b372 100644 (file)
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -21,6 +21,11 @@
 #ifndef RENDERWIDGET_H
 #define RENDERWIDGET_H
 
+#include <kdeversion.h>
+#if KDE_IS_VERSION(4,7,0)
+#include <KMessageWidget>
+#endif
+
 #include <QPushButton>
 #include <QPainter>
 #include <QStyledItemDelegate>
@@ -132,6 +137,9 @@ public:
     /** @brief Should we render using proxy clips. */
     bool proxyRendering();
 
+protected:
+    virtual QSize sizeHint() const;
+
 public slots:
     void slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString &playlistPath, const QString &scriptPath, bool exportAudio);
 
@@ -179,6 +187,11 @@ private:
     RenderViewDelegate *m_jobsDelegate;
     bool m_blockProcessing;
     QString m_renderer;
+
+#if KDE_IS_VERSION(4,7,0)
+    KMessageWidget *m_infoMessage;
+#endif
+
     void parseProfiles(QString meta = QString(), QString group = QString(), QString profile = QString());
     void parseFile(QString exportFile, bool editable);
     void updateButtons();

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 99556526dbd7734a4dde33ee3738a314670cb9cc..28d7aa98e38fe682d7707290e277b0c027d769fb 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -336,16 +336,19 @@ void Wizard::checkMltComponents()
             for (int i = 0; i < vcodecs.count(); i++)
                 result << QString(vcodecs.get(i));
             m_mltCheck.vcodecs_list->addItems(result);
+            KdenliveSettings::setVideocodecs(result);
             result.clear();
             Mlt::Properties acodecs((mlt_properties) consumer->get_data("acodec"));
             for (int i = 0; i < acodecs.count(); i++)
                 result << QString(acodecs.get(i));
             m_mltCheck.acodecs_list->addItems(result);
+            KdenliveSettings::setAudiocodecs(result);
             result.clear();
             Mlt::Properties formats((mlt_properties) consumer->get_data("f"));
             for (int i = 0; i < formats.count(); i++)
                 result << QString(formats.get(i));
             m_mltCheck.formats_list->addItems(result);
+            KdenliveSettings::setSupportedformats(result);
             delete consumer;
         }