From: Jean-Baptiste Mardelle Date: Wed, 22 Oct 2008 17:53:39 +0000 (+0000) Subject: New file "blacklisted_effects.txt" to hide some effects to users, add xml file for... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=833cf1051c3e0ace17ec9994cb929d6784bfe815;p=kdenlive New file "blacklisted_effects.txt" to hide some effects to users, add xml file for frei0r squareblur effect to limit parameter to positive values, fix bug in some effects svn path=/branches/KDE4/; revision=2529 --- diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 963b7c52..656b7e78 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1 +1 @@ -install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png transition.png metadata.properties DESTINATION ${DATA_INSTALL_DIR}/kdenlive ) +install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png transition.png metadata.properties blacklisted_effects.txt DESTINATION ${DATA_INSTALL_DIR}/kdenlive ) diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt new file mode 100644 index 00000000..2270c39f --- /dev/null +++ b/data/blacklisted_effects.txt @@ -0,0 +1 @@ +frei0r.squareblur diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 4afd65f3..66db88c4 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -36,5 +36,6 @@ volume.xml wave.xml fadein.xml fadeout.xml +frei0r_squareblur.xml DESTINATION ${DATA_INSTALL_DIR}/kdenlive/effects) diff --git a/effects/frei0r_squareblur.xml b/effects/frei0r_squareblur.xml new file mode 100644 index 00000000..86334ed4 --- /dev/null +++ b/effects/frei0r_squareblur.xml @@ -0,0 +1,9 @@ + + + Square Blur + Variable-size square blur (frei0r.squareblur) + Drone + + Kernel size + + diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 52e80ccd..5321b0dc 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -1031,7 +1031,7 @@ QHash ClipItem::addEffect(QDomElement effect, bool animate) { bool needRepaint = false; /*QDomDocument doc; doc.appendChild(doc.importNode(effect, true)); - kDebug() << "/////// CLIP ADD EFFECT: "<< doc.toString();*/ + kDebug() << "/////// CLIP ADD EFFECT: " << doc.toString();*/ m_effectList.append(effect); effectParams["tag"] = effect.attribute("tag"); QString effectId = effect.attribute("id"); @@ -1069,7 +1069,7 @@ QHash ClipItem::addEffect(QDomElement effect, bool animate) { else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); } } else { - effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / f); + effectParams[e.attribute("name")] = QString::number(e.attribute("value").toDouble() / f); } } } diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index 85192626..d48687a7 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -38,7 +38,6 @@ QMap EffectStackEdit::iconCache; EffectStackEdit::EffectStackEdit(QWidget *parent): QWidget(parent), m_in(0), m_out(0) { setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); - setBackgroundRole(QPalette::Dark); QVBoxLayout *vbox1 = new QVBoxLayout(parent); vbox1->setContentsMargins(0, 0, 0, 0); vbox1->setSpacing(0); diff --git a/src/headertrack.cpp b/src/headertrack.cpp index 1e7dcf3d..0ad35548 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -42,7 +42,7 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) view.frame->setBackgroundRole(QPalette::AlternateBase); view.frame->setAutoFillBackground(true); if (!info.isBlind) view.buttonVideo->setIcon(KIcon("kdenlive-show-video")); - else view.buttonVideo->setIcon(KIcon("kdenlive-hide-video")); + else view.buttonVideo->setIcon(KIcon("kdenlive-hide-video")); } else { view.buttonVideo->setHidden(true); } @@ -65,20 +65,18 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) void HeaderTrack::switchVideo() { if (view.buttonVideo->isChecked()) { - view.buttonVideo->setIcon(KIcon("kdenlive-show-video")); - } - else { - view.buttonVideo->setIcon(KIcon("kdenlive-hide-video")); + view.buttonVideo->setIcon(KIcon("kdenlive-show-video")); + } else { + view.buttonVideo->setIcon(KIcon("kdenlive-hide-video")); } emit switchTrackVideo(m_index); } void HeaderTrack::switchAudio() { if (view.buttonAudio->isChecked()) { - view.buttonAudio->setIcon(KIcon("kdenlive-show-audio")); - } - else { - view.buttonAudio->setIcon(KIcon("kdenlive-hide-audio")); + view.buttonAudio->setIcon(KIcon("kdenlive-show-audio")); + } else { + view.buttonAudio->setIcon(KIcon("kdenlive-hide-audio")); } emit switchTrackAudio(m_index); } diff --git a/src/initeffects.cpp b/src/initeffects.cpp index 347537c2..1fec379f 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -83,6 +83,20 @@ Mlt::Repository *initEffects::parseEffectFiles() { Mlt::Properties *filters = repository->filters(); QStringList filtersList; + // Check for blacklisted effects + QString blacklist = KStandardDirs::locate("appdata", "blacklisted_effects.txt"); + + QFile file(blacklist); + QStringList blackListed; + + if (file.open(QIODevice::ReadOnly)) { + QTextStream in(&file); + while (!in.atEnd()) { + blackListed.append(in.readLine().simplified()); + } + } + file.close(); + for (int i = 0 ; i < filters->count() ; i++) { filtersList << filters->get_name(i); } @@ -127,6 +141,11 @@ Mlt::Repository *initEffects::parseEffectFiles() { // kDebug()<<"// FOUND EFFECT FILE: "<count() == 0) { - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - profileName = KdenliveSettings::default_profile(); - } - else { + if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); + profileName = KdenliveSettings::default_profile(); + } else { ProjectSettings *w = new ProjectSettings; if (w->exec() != QDialog::Accepted) return; - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); + if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = w->selectedProfile(); projectFolder = w->selectedFolder(); projectTracks = w->tracks();