Merge branch 'refs/heads/v0.8.2'

[kdenlive] / src / headertrack.cpp

diff --git a/src/headertrack.cpp b/src/headertrack.cpp
index 4926b0499e655a8adcfe35230b11f121b8c64f57..b806a01ceb1c20f26d78a9bb77fbb4f52b09bf1e 100644 (file)
--- a/src/headertrack.cpp
+++ b/src/headertrack.cpp
@@ -25,14 +25,12 @@
 #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) :
@@ -44,16 +42,6 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent)
     setFixedHeight(height);
     setupUi(this);
 
-    QPalette p = palette();
-    KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
-    QColor norm = scheme.shade(scheme.background(KColorScheme::ActiveBackground).color(), KColorScheme::MidShade);
-    p.setColor(QPalette::Button, norm);
-    setPalette(p);
-
-    QColor col = scheme.background().color();
-    QColor col2 = scheme.foreground().color();
-    track_number->setStyleSheet(QString("QLineEdit { background-color: transparent;color: rgb(%4, %5, %6);} 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()).arg(col2.red()).arg(col2.green()).arg(col2.blue()));
-
     m_name = info.trackName.isEmpty() ? QString::number(m_index) : info.trackName;
     track_number->setText(m_name);
     connect(track_number, SIGNAL(editingFinished()), this, SLOT(slotRenameTrack()));
@@ -120,7 +108,6 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent)
 
 void HeaderTrack::updateEffectLabel(QStringList effects)
 {
-    QColor col = track_number->palette().color(QPalette::Base);
     if (!effects.isEmpty()) {
         effect_label->setHidden(false);
         effect_label->setToolTip(effects.join("/"));
@@ -165,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();
@@ -181,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)