New file "blacklisted_effects.txt" to hide some effects to users, add xml file for...

svn path=/branches/KDE4/; revision=2529

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 963b7c5228d9eac0c5a2c2a24ec76b81146a714e..656b7e78b0e9b9a2db022c85bd159091175f9df7 100644 (file)
--- 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 (file)
index 0000000..2270c39
--- /dev/null
+++ b/data/blacklisted_effects.txt
@@ -0,0 +1 @@
+frei0r.squareblur

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 4afd65f34569576e5ab541df6e598d63f24e364a..66db88c4d707f0c5d58919ab8855b7a92cd7a24b 100644 (file)
--- 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 (file)
index 0000000..86334ed
--- /dev/null
+++ b/effects/frei0r_squareblur.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.squareblur" id="frei0r.squareblur">
+       <name>Square Blur</name>
+       <description>Variable-size square blur (frei0r.squareblur)</description>
+       <author>Drone</author>
+       <parameter type="constant" name="Kernel size" max="500" min="0" default="50" factor="1000">
+               <name>Kernel size</name>
+       </parameter>
+</effect>

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 52e80ccd01bc9fe2dd3a38133a1d0593bba00866..5321b0dcb1cfbbb9019cb7215a15cff93b129259 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -1031,7 +1031,7 @@ QHash <QString, QString> 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 <QString, QString> 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 85192626b084b86c1e8681a27bacf635727ffb04..d48687a757af4a1ffb882b34b13f1c91a741b8f0 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -38,7 +38,6 @@ QMap<QString, QImage> 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 1e7dcf3d203b4da371b4d4db13f6d21984533397..0ad355487438d30ab74cb4a57628857176effa15 100644 (file)
--- 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 347537c27b6c83949ee85aa931fe6ad603532c75..1fec379f6840e447b539f81632734c55e02c7049 100644 (file)
--- 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: "<<itemName<<endl;
         }
     }
+
+    foreach(const QString &effect, blackListed) {
+        if (filtersList.contains(effect)) filtersList.removeAll(effect);
+    }
+
     foreach(const QString &filtername, filtersList) {
         QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername);
         if (!doc.isNull())

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4488872f6c4aad33012704a6c9a8d7881e3ebded..f427dd69045bd14cafa7885cf0da38be7e9fcdcc 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -853,13 +853,12 @@ void MainWindow::newFile(bool showProjectSettings) {
     KUrl projectFolder;
     QPoint projectTracks(3, 2);
     if (!showProjectSettings && m_timelineArea->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();