Merge branch 'master' into buildsystem

[kdenlive] / src / headertrack.cpp

diff --git a/src/headertrack.cpp b/src/headertrack.cpp
index e04df2470e9f1c876de1dbed1fcae203d7aa49ad..b806a01ceb1c20f26d78a9bb77fbb4f52b09bf1e 100644 (file)
--- a/src/headertrack.cpp
+++ b/src/headertrack.cpp
@@ -19,18 +19,18 @@
 
 
 #include "headertrack.h"
+#include "effectslist.h"
+#include "kdenlivesettings.h"
 
 #include <KIcon>
 #include <KLocale>
 #include <KDebug>
-#include <KColorScheme>
 
 #include <QMouseEvent>
 #include <QWidget>
 #include <QPainter>
 #include <QAction>
 #include <QTimer>
-#include <QColor>
 #include <QDomDocument>
 
 HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent) :
@@ -41,8 +41,6 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent)
 {
     setFixedHeight(height);
     setupUi(this);
-    QColor col = track_number->palette().color(QPalette::Base);
-    track_number->setStyleSheet(QString("QLineEdit { background-color: transparent;} QLineEdit:hover{ background-color: rgb(%1, %2, %3);} QLineEdit:focus { background-color: rgb(%1, %2, %3);}").arg(col.red()).arg(col.green()).arg(col.blue()));
 
     m_name = info.trackName.isEmpty() ? QString::number(m_index) : info.trackName;
     track_number->setText(m_name);
@@ -54,14 +52,10 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent)
     buttonAudio->setToolTip(i18n("Mute track"));
     buttonLock->setChecked(info.isLocked);
     buttonLock->setToolTip(i18n("Lock track"));
-
+    effect_label->setPixmap(KIcon("kdenlive-track_has_effect").pixmap(16, 16));
+    updateEffectLabel(info.effectsList.effectNames());
     setAcceptDrops(true);
 
-    QPalette p = palette();
-    KColorScheme scheme(p.currentColorGroup(), KColorScheme::Window);
-    p.setColor(QPalette::Button, scheme.background(KColorScheme::ActiveBackground).color().darker(120));
-    setPalette(p);
-
     if (m_type == VIDEOTRACK) {
         setBackgroundRole(QPalette::AlternateBase);
         setAutoFillBackground(true);
@@ -112,6 +106,17 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent)
 {
 }*/
 
+void HeaderTrack::updateEffectLabel(QStringList effects)
+{
+    if (!effects.isEmpty()) {
+        effect_label->setHidden(false);
+        effect_label->setToolTip(effects.join("/"));
+    } else {
+        effect_label->setHidden(true);
+        effect_label->setToolTip(QString());
+    }
+}
+
 // virtual
 void HeaderTrack::mousePressEvent(QMouseEvent * event)
 {
@@ -147,7 +152,7 @@ void HeaderTrack::mouseDoubleClickEvent(QMouseEvent* event)
 //virtual
 void HeaderTrack::dropEvent(QDropEvent * event)
 {
-    const QString effects = QString(event->mimeData()->data("kdenlive/effectslist"));
+    const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist"));
     QDomDocument doc;
     doc.setContent(effects, true);
     const QDomElement e = doc.documentElement();
@@ -163,8 +168,18 @@ void HeaderTrack::dropEvent(QDropEvent * event)
 //virtual
 void HeaderTrack::dragEnterEvent(QDragEnterEvent *event)
 {
-    if (buttonLock->isChecked()) event->setAccepted(false);
-    else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist"));
+    if (buttonLock->isChecked()) {
+        event->setAccepted(false);
+    } else {
+        if (event->mimeData()->hasFormat("kdenlive/effectslist")) {
+            const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist"));
+            QDomDocument doc;
+            doc.setContent(effects, true);
+            if (doc.documentElement().attribute("id") != "speed") {
+                event->setAccepted(true);
+            }
+        }
+    }
 }
 
 void HeaderTrack::setSelectedIndex(int ix)