X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fheadertrack.cpp;h=cef0b2e08de12340bb01b38ba96af280e4beabdf;hb=4ae3260592acc87712db77b7d3fe0cc2be7d76bc;hp=7447c433b7d74bcb47f39a3acac0f5490af8b290;hpb=d5b4fe2e78d8b2645cdc2ac007c1006a151875c0;p=kdenlive diff --git a/src/headertrack.cpp b/src/headertrack.cpp index 7447c433..cef0b2e0 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -20,21 +20,20 @@ #include "headertrack.h" #include "effectslist.h" +#include "kdenlivesettings.h" #include #include #include -#include #include #include #include #include #include -#include #include -HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent) : +HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, const QList &actions, QWidget *parent) : QWidget(parent), m_index(index), m_type(info.type), @@ -42,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); @@ -59,11 +56,6 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent) 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); @@ -96,27 +88,16 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent) //horizontalSpacer; } - setContextMenuPolicy(Qt::DefaultContextMenu); //Qt::ActionsContextMenu); - QAction *insertAction = new QAction(i18n("Insert Track"), this); - m_menu.addAction(insertAction); - connect(insertAction, SIGNAL(triggered()), this, SLOT(slotAddTrack())); - - QAction *removeAction = new QAction(KIcon("edit-delete"), i18n("Delete Track"), this); - m_menu.addAction(removeAction); - connect(removeAction, SIGNAL(triggered()), this, SLOT(slotDeleteTrack())); - - QAction *configAction = new QAction(KIcon("configure"), i18n("Configure Track"), this); - m_menu.addAction(configAction); - connect(configAction, SIGNAL(triggered()), this, SLOT(slotConfigTrack())); + setContextMenuPolicy(Qt::ActionsContextMenu); + addActions(actions); } /*HeaderTrack::~HeaderTrack() { }*/ -void HeaderTrack::updateEffectLabel(QStringList effects) +void HeaderTrack::updateEffectLabel(const QStringList &effects) { - QColor col = track_number->palette().color(QPalette::Base); if (!effects.isEmpty()) { effect_label->setHidden(false); effect_label->setToolTip(effects.join("/")); @@ -138,35 +119,35 @@ void HeaderTrack::mousePressEvent(QMouseEvent * event) QWidget::mousePressEvent(event); } -// virtual -void HeaderTrack::contextMenuEvent(QContextMenuEvent * event) -{ - if (track_number->hasFocus()) { - track_number->clearFocus(); - return; - } - m_menu.popup(event->globalPos()); -} - void HeaderTrack::mouseDoubleClickEvent(QMouseEvent* event) { if (track_number->hasFocus()) { track_number->clearFocus(); return; } - slotConfigTrack(); + emit configTrack(m_index); QWidget::mouseDoubleClickEvent(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(); + QDomElement e = doc.documentElement(); + if (e.tagName() == "effectgroup") { + // dropped an effect group + QDomNodeList effectlist = e.elementsByTagName("effect"); + for (int i = 0; i < effectlist.count(); ++i) { + effectlist.at(i).toElement().removeAttribute("kdenlive_ix"); + } + } else { + // single effect dropped + e.removeAttribute("kdenlive_ix"); + } emit selectTrack(m_index); - emit addTrackInfo(e, m_index); + emit addTrackEffect(e, m_index); /*if (scene() && !scene()->views().isEmpty()) { event->accept(); CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; @@ -177,8 +158,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) @@ -247,25 +238,11 @@ void HeaderTrack::slotDeleteTrack() QTimer::singleShot(500, this, SLOT(deleteTrack())); } -void HeaderTrack::deleteTrack() -{ - emit deleteTrack(m_index); -} - -void HeaderTrack::slotAddTrack() -{ - emit insertTrack(m_index); -} - void HeaderTrack::slotRenameTrack() { if (m_name != track_number->text()) emit renameTrack(m_index, track_number->text()); } -void HeaderTrack::slotConfigTrack() -{ - emit configTrack(m_index); -} #include "headertrack.moc"