minor fixes

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

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 8b6c6a314c76de0ad9a44c084ee8b2f36383432c..b19b0da094c041ff4b61eca61509afb309a62a5a 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -48,6 +48,8 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     m_view.clip_path->setText(url.path());
     m_view.clip_description->setText(m_clip->description());
     QMap <QString, QString> props = m_clip->properties();
+    // disable advanced properties until implemented
+    m_view.tabWidget->widget(ADVANCEDTAB)->setEnabled(false);
 
     if (props.contains("audiocodec"))
         m_view.clip_acodec->setText(props.value("audiocodec"));

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 1975dd833a7a2c579a1b9b2da5680f4db20068d0..57aaf4a84a2ef1cf4b8c1590a45077bc290fe92c 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -324,6 +324,7 @@ QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int h
         p.fill(Qt::red);
         return p;
     }
+
     mlt_image_format format = mlt_image_yuv422;
     int frame_width = 0;
     int frame_height = 0;
@@ -337,7 +338,7 @@ QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int h
     QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
 
     if (!image.isNull()) {
-        pix = pix.fromImage(image.rgbSwapped());
+        pix = QPixmap::fromImage(image.rgbSwapped());
     } else
         pix.fill(Qt::red);
 

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index ffe030e5bb6dd8c7e595d245bcd17bb475132932..e2daf636b2f4e39a8e5899c97033bc41d290ed71 100644 (file)
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -211,16 +211,15 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con
     if ((m_clipType == AV || m_clipType == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->slotRequestAudioThumbs();
 
     m_clip->setProperties(attributes);
-    /*
-         m_metadata = metadata;
-
-         if (m_metadata.contains("description")) {
-             setDescription (m_metadata["description"]);
-         }
-         else if (m_metadata.contains("comment")) {
-             setDescription (m_metadata["comment"]);
-         }
-    */
 
+    if (m_clip->description().isEmpty()) {
+        if (metadata.contains("description")) {
+            m_clip->setProperty("description", metadata["description"]);
+            setText(2, m_clip->description());
+        } else if (metadata.contains("comment")) {
+            m_clip->setProperty("description", metadata["comment"]);
+            setText(2, m_clip->description());
+        }
+    }
 }
 

diff --git a/src/renderer.cpp b/src/renderer.cpp
index a4321942b0d116b2e121856c156363f2cdaa92a3..3fac236b2723c75e0ac8c419ddb8f0994321a3a7 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -561,7 +561,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
             QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
 
             if (!image.isNull()) {
-                pix = pix.fromImage(image.rgbSwapped());
+                pix = QPixmap::fromImage(image.rgbSwapped());
             } else
                 pix.fill(Qt::black);
 

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 08eb90c3d12346a0a3e5e6d2dec597a0a8469244..74c6c98b145826dc4dd428bafbc7b3de5ec1462e 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -216,8 +216,9 @@ void Wizard::slotCheckMlt() {
     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()) {
+        errorMessage.prepend(QString("<b>%1</b><br>").arg(i18n("Fatal Error")));
         QLabel *pix = new QLabel();
-        pix->setPixmap(KIcon("process-stop").pixmap(30));
+        pix->setPixmap(KIcon("dialog-error").pixmap(30));
         QLabel *label = new QLabel(errorMessage);
         label->setWordWrap(true);
         m_startLayout->addSpacing(40);