Make Mlt error message more visible (they don't close automatically)

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

diff --git a/src/definitions.h b/src/definitions.h
index a82b894d52ba08d122a4f38b448bbabd6b62f9d5..eff9b24e99f0f7c5b1bff59236089fde7aa638cf 100644 (file)
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -25,8 +25,6 @@
 
 #include <KLocale>
 
-#include <QEvent>
-
 const int FRAME_SIZE = 90;
 const int MAXCLIPDURATION = 15000;
 
@@ -49,7 +47,8 @@ enum MessageType {
     DefaultMessage,
     OperationCompletedMessage,
     InformationMessage,
-    ErrorMessage
+    ErrorMessage,
+    MltError
 };
 
 enum TRACKTYPE { AUDIOTRACK = 0, VIDEOTRACK = 1 };
@@ -182,18 +181,5 @@ private:
 
 };
 
-class MltErrorEvent : public QEvent
-{
-public:
-    MltErrorEvent(QString message) : QEvent(QEvent::User), m_message(message) {}
-    QString message() const {
-        return m_message;
-    }
-
-private:
-    QString m_message;
-};
-
-
 
 #endif

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1e1a66398911c75911125c4ee15b7ef02dac09a3..8f940fffa1e936ba0ec456ad5ae432f78f27a75f 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -790,7 +790,6 @@ void MainWindow::setupActions()
     statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS);
     statusBar()->addPermanentWidget(m_timecodeFormat);
     statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
-    m_messageLabel->hide();
 
     collection->addAction("select_tool", m_buttonSelectTool);
     collection->addAction("razor_tool", m_buttonRazorTool);
@@ -2317,9 +2316,8 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip)
 
 void MainWindow::customEvent(QEvent* e)
 {
-    kDebug() << "// GOT ERROR";
     if (e->type() == QEvent::User) {
-        m_messageLabel->setMessage(static_cast <MltErrorEvent *>(e)->message(), ErrorMessage);
+        m_messageLabel->setMessage(static_cast <MltErrorEvent *>(e)->message(), MltError);
     }
 }
 void MainWindow::slotActivateEffectStackView()

diff --git a/src/renderer.h b/src/renderer.h
index 04d632220cd99023c9ea4dc2c842dfb11bf07caf..7038eec5c26d06d5d95f5beb05a7bdd29f3ed3a2 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -18,15 +18,17 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
+#include "gentime.h"
+#include "definitions.h"
+
+#include <kurl.h>
+
 #include <qdom.h>
 #include <qstring.h>
 #include <qmap.h>
 #include <QList>
+#include <QEvent>
 
-#include <kurl.h>
-
-#include "gentime.h"
-#include "definitions.h"
 
 /**Render encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the Render object as the
@@ -54,6 +56,18 @@ class Service;
 };
 
 
+class MltErrorEvent : public QEvent
+{
+public:
+    MltErrorEvent(QString message) : QEvent(QEvent::User), m_message(message) {}
+    QString message() const {
+        return m_message;
+    }
+
+private:
+    QString m_message;
+};
+
 
 class Render: public QObject
 {

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 19e921c0ca68afd539cfd966512a5cab4aad2fac..3fcf28fc84d676a8b753cf0e3b4a49c0c5188860 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -38,7 +38,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
         QWidget(parent),
         m_type(DefaultMessage),
         m_state(Default),
-        m_illumination(0),
+        m_illumination(-64),
         m_minTextHeight(-1),
         m_timer(0),
         m_closeButton(0)
@@ -50,13 +50,11 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     setPalette(palette);
 
     m_timer = new QTimer(this);
-    connect(m_timer, SIGNAL(timeout()),
-            this, SLOT(timerDone()));
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(timerDone()));
 
     m_closeButton = new QPushButton(i18nc("@action:button", "Close"), this);
     m_closeButton->hide();
-    connect(m_closeButton, SIGNAL(clicked()),
-            this, SLOT(closeErrorMessage()));
+    connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeErrorMessage()));
 }
 
 StatusBarMessageLabel::~StatusBarMessageLabel()
@@ -83,9 +81,9 @@ void StatusBarMessageLabel::setMessage(const QString& text,
     m_text = text;
     m_type = type;
 
-    m_timer->stop();
-    m_illumination = 0;
+    m_illumination = -64;
     m_state = Default;
+    m_timer->stop();
 
     const char* iconName = 0;
     QPixmap pixmap;
@@ -105,9 +103,15 @@ void StatusBarMessageLabel::setMessage(const QString& text,
         iconName = "dialog-warning";
         m_timer->start(100);
         m_state = Illuminate;
+        m_closeButton->hide();
+        break;
 
-        //updateCloseButtonPosition();
-        //m_closeButton->show();
+    case MltError:
+        iconName = "dialog-close";
+        m_timer->start(100);
+        m_state = Illuminate;
+        updateCloseButtonPosition();
+        m_closeButton->show();
         break;
 
     case DefaultMessage:
@@ -117,8 +121,8 @@ void StatusBarMessageLabel::setMessage(const QString& text,
     }
 
     m_pixmap = (iconName == 0) ? QPixmap() : SmallIcon(iconName);
-    //QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));
-    show(); //update();
+    QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));
+    update();
 }
 
 void StatusBarMessageLabel::setMinimumTextHeight(int min)
@@ -126,36 +130,27 @@ void StatusBarMessageLabel::setMinimumTextHeight(int min)
     if (min != m_minTextHeight) {
         m_minTextHeight = min;
         setMinimumHeight(min);
-        /*if (m_closeButton->height() > min) {
+        if (m_closeButton->height() > min) {
             m_closeButton->setFixedHeight(min);
-        }*/
+        }
     }
 }
 
-int StatusBarMessageLabel::widthGap() const
-{
-    QFontMetrics fontMetrics(font());
-    const int defaultGap = 10;
-    return fontMetrics.width(m_text) - availableTextWidth() + defaultGap;
-}
-
 void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
 {
     QPainter painter(this);
 
     // draw background
-    QColor backgroundColor = palette().window().color();
-    if (m_illumination > 0) {
-        // at this point, a: we are a second label being drawn over the already
-        // painted status area, so we can be translucent, and b: our palette's
-        // window color (bg only) seems to be wrong (always black)
+    QColor backgroundColor;
+    if (m_state == Default || m_illumination < 0) backgroundColor = palette().window().color();
+    else {
         KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
         backgroundColor = scheme.background(KColorScheme::NegativeBackground).color();
-        backgroundColor.setAlpha(qMin(255, m_illumination*2));
     }
-    painter.setBrush(backgroundColor);
-    painter.setPen(Qt::NoPen);
-    painter.drawRect(0, 0, width(), height());
+    if (m_state == Desaturate && m_illumination > 0) {
+        backgroundColor.setAlpha(m_illumination * 2);
+    }
+    painter.fillRect(0, 0, width(), height(), backgroundColor);
 
     // draw pixmap
     int x = BorderGap;
@@ -169,9 +164,9 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     // draw text
     painter.setPen(palette().windowText().color());
     int flags = Qt::AlignVCenter;
-    /*if (height() > m_minTextHeight) {
+    if (height() > m_minTextHeight) {
         flags = flags | Qt::TextWordWrap;
-    }*/
+    }
     painter.drawText(QRect(x, 0, availableTextWidth(), height()), flags, m_text);
     painter.end();
 }
@@ -179,8 +174,8 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
 void StatusBarMessageLabel::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
-    //updateCloseButtonPosition();
-    //QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));
+    updateCloseButtonPosition();
+    QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));
 }
 
 void StatusBarMessageLabel::timerDone()
@@ -197,27 +192,30 @@ void StatusBarMessageLabel::timerDone()
             update();
         } else {
             m_state = Illuminated;
-            m_timer->start(5000);
+            m_timer->start(1500);
         }
         break;
     }
 
     case Illuminated: {
         // start desaturation
-        m_state = Desaturate;
-        m_timer->start(100);
+        if (m_type != MltError) {
+            m_state = Desaturate;
+            m_timer->start(80);
+        }
         break;
     }
 
     case Desaturate: {
         // desaturate
-        if (m_illumination > 0) {
-            m_illumination -= 5;
-            update();
-        } else {
+        if (m_illumination < -128) {
+            m_illumination = 0;
             m_state = Default;
             m_timer->stop();
-            reset();
+            setMessage(QString(), DefaultMessage);
+        } else {
+            m_illumination -= 5;
+            update();
         }
         break;
     }
@@ -271,7 +269,7 @@ void StatusBarMessageLabel::assureVisibleText()
         updateGeometry();
     }
 
-    //updateCloseButtonPosition();
+    updateCloseButtonPosition();
 }
 
 int StatusBarMessageLabel::availableTextWidth() const
@@ -291,27 +289,18 @@ void StatusBarMessageLabel::updateCloseButtonPosition()
 void StatusBarMessageLabel::closeErrorMessage()
 {
     if (!showPendingMessage()) {
-        reset();
-        setMessage(m_defaultText, DefaultMessage);
+        setMessage(QString(), DefaultMessage);
     }
 }
 
 bool StatusBarMessageLabel::showPendingMessage()
 {
     if (!m_pendingMessages.isEmpty()) {
-        reset();
         setMessage(m_pendingMessages.takeFirst(), ErrorMessage);
         return true;
     }
     return false;
 }
 
-void StatusBarMessageLabel::reset()
-{
-    m_text.clear();
-    m_pixmap = QPixmap();
-    m_type = DefaultMessage;
-    update();
-}
 
 #include "statusbarmessagelabel.moc"

diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index 594b5551bc34bb7e28418a3093844502249086c3..ce4b3fe1e7cb7260df0ad7e9e11a63ca2a393d3f 100644 (file)
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -55,20 +55,10 @@ public:
 
     const QString& text() const;
 
-    void setDefaultText(const QString& text);
-    const QString& defaultText() const;
-
     // TODO: maybe a better approach is possible with the size hint
     void setMinimumTextHeight(int min);
     int minimumTextHeight() const;
 
-    /**
-     * Returns the gap of the width of the current set text to the
-     * width of the message label. A gap <= 0 means that the text
-     * fits into the available width.
-     */
-    int widthGap() const;
-
 protected:
     /** @see QWidget::paintEvent() */
     virtual void paintEvent(QPaintEvent* event);
@@ -136,7 +126,6 @@ private:
     int m_minTextHeight;
     QTimer* m_timer;
     QString m_text;
-    QString m_defaultText;
     QList<QString> m_pendingMessages;
     QPixmap m_pixmap;
     QPushButton* m_closeButton;
@@ -152,16 +141,6 @@ inline const QString& StatusBarMessageLabel::text() const
     return m_text;
 }
 
-inline void StatusBarMessageLabel::setDefaultText(const QString& text)
-{
-    m_defaultText = text;
-}
-
-inline const QString& StatusBarMessageLabel::defaultText() const
-{
-    return m_defaultText;
-}
-
 inline int StatusBarMessageLabel::minimumTextHeight() const
 {
     return m_minTextHeight;

diff --git a/src/wizard.cpp b/src/wizard.cpp
index d7ce009c28a5aff3a93c7ff84d741676337e3d27..32dc1d16a6d58a49f8376891cb50bbdfa2ec4def 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -35,7 +35,7 @@
 #include <QXmlStreamWriter>
 #include <QTimer>
 
-const double recommendedMltVersion = 40;
+const double recommendedMltVersion = 44;
 static const char version[] = VERSION;
 
 Wizard::Wizard(bool upgrade, QWidget *parent) :