* Cleanup folder creation

[kdenlive] / src / effectslistwidget.cpp

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 7eb9f4f8805b6422d3605395cefbe81b5fe8bebd..f4453f6bcaba3380aa34fe703528b2698be6577d 100644 (file)
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -19,18 +19,23 @@
 
 #include "QApplication"
 #include "QMouseEvent"
+#include <QMenu>
 
 #include "KDebug"
 
 #include "effectslistwidget.h"
 #include "effectslist.h"
+#include "mainwindow.h"
 
-#define EFFECT_VIDEO 1
-#define EFFECT_AUDIO 2
-#define EFFECT_CUSTOM 3
+static const int EFFECT_VIDEO = 1;
+static const int EFFECT_AUDIO = 2;
+static const int EFFECT_CUSTOM = 3;
 
-EffectsListWidget::EffectsListWidget(EffectsList *audioEffectList, EffectsList *videoEffectList, EffectsList *customEffectList, QWidget *parent)
-        : KListWidget(parent), m_audioList(audioEffectList), m_videoList(videoEffectList), m_customList(customEffectList) {
+const int TypeRole = Qt::UserRole;
+const int IdRole = TypeRole + 1;
+
+EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent)
+        : KListWidget(parent), m_menu(menu) {
     //setSelectionMode(QAbstractItemView::ExtendedSelection);
     //setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(true);
@@ -46,23 +51,39 @@ EffectsListWidget::~EffectsListWidget() {
 
 void EffectsListWidget::initList() {
     clear();
-    QStringList names = m_videoList->effectNames();
     QListWidgetItem *item;
-    foreach(QString str, names) {
-        item = new QListWidgetItem(str, this);
-        item->setData(Qt::UserRole, QString::number((int) EFFECT_VIDEO));
+    QString effectName;
+    QStringList effectInfo;
+    KIcon videoIcon("kdenlive-show-video");
+    KIcon audioIcon("kdenlive-show-audio");
+    int ct = MainWindow::videoEffects.count();
+    for (int ix = 0; ix < ct; ix ++) {
+        effectInfo = MainWindow::videoEffects.effectIdInfo(ix);
+        if (!effectInfo.isEmpty()) {
+            item = new QListWidgetItem(videoIcon, effectInfo.takeFirst(), this);
+            item->setData(TypeRole, QString::number((int) EFFECT_VIDEO));
+            item->setData(IdRole, effectInfo);
+        }
     }
 
-    names = m_audioList->effectNames();
-    foreach(QString str, names) {
-        item = new QListWidgetItem(str, this);
-        item->setData(Qt::UserRole, QString::number((int) EFFECT_AUDIO));
+    ct = MainWindow::audioEffects.count();
+    for (int ix = 0; ix < ct; ix ++) {
+        effectInfo = MainWindow::audioEffects.effectIdInfo(ix);
+        if (!effectInfo.isEmpty()) {
+            item = new QListWidgetItem(audioIcon, effectInfo.takeFirst(), this);
+            item->setData(TypeRole, QString::number((int) EFFECT_AUDIO));
+            item->setData(IdRole, effectInfo);
+        }
     }
 
-    names = m_customList->effectNames();
-    foreach(QString str, names) {
-        item = new QListWidgetItem(str, this);
-        item->setData(Qt::UserRole, QString::number((int) EFFECT_CUSTOM));
+    ct = MainWindow::customEffects.count();
+    for (int ix = 0; ix < ct; ix ++) {
+        effectInfo = MainWindow::customEffects.effectIdInfo(ix);
+        if (!effectInfo.isEmpty()) {
+            item = new QListWidgetItem(effectInfo.takeFirst(), this);
+            item->setData(TypeRole, QString::number((int) EFFECT_CUSTOM));
+            item->setData(IdRole, effectInfo);
+        }
     }
 }
 
@@ -73,15 +94,17 @@ QDomElement EffectsListWidget::currentEffect() {
 QDomElement EffectsListWidget::itemEffect(QListWidgetItem *item) {
     QDomElement effect;
     if (!item) return effect;
-    switch (item->data(Qt::UserRole).toInt()) {
+    QStringList effectInfo = item->data(IdRole).toStringList();
+    kDebug() << "// EFFECT SELECTED: " << effectInfo;
+    switch (item->data(TypeRole).toInt()) {
     case 1:
-        effect = m_videoList->getEffectByName(item->text());
+        effect =  MainWindow::videoEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1));
         break;
     case 2:
-        effect = m_audioList->getEffectByName(item->text());
+        effect = MainWindow::audioEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1));
         break;
     default:
-        effect = m_customList->getEffectByName(item->text());
+        effect = MainWindow::customEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1));
         break;
     }
     return effect;
@@ -92,15 +115,16 @@ QString EffectsListWidget::currentInfo() {
     QListWidgetItem *item = currentItem();
     if (!item) return QString();
     QString info;
-    switch (item->data(Qt::UserRole).toInt()) {
+    QStringList effectInfo = item->data(IdRole).toStringList();
+    switch (item->data(TypeRole).toInt()) {
     case 1:
-        info = m_videoList->getInfo(item->text());
+        info = MainWindow::videoEffects.getInfo(effectInfo.at(0), effectInfo.at(1));
         break;
     case 2:
-        info = m_audioList->getInfo(item->text());
+        info = MainWindow::audioEffects.getInfo(effectInfo.at(0), effectInfo.at(1));
         break;
     default:
-        info = m_customList->getInfo(item->text());
+        info = MainWindow::customEffects.getInfo(effectInfo.at(0), effectInfo.at(1));
         break;
     }
     return info;
@@ -127,11 +151,11 @@ void EffectsListWidget::mouseMoveEvent(QMouseEvent *event) {
         if (clickItem) {
             QDrag *drag = new QDrag(this);
             QMimeData *mimeData = new QMimeData;
-            QList <QListWidgetItem *> list;
-            list = selectedItems();
+            const QList <QListWidgetItem *>list = selectedItems();
             QDomDocument doc;
             foreach(QListWidgetItem *item, list) {
-                doc.appendChild(doc.importNode(itemEffect(item), true));
+                QDomElement e = itemEffect(item);
+                if (!e.isNull()) doc.appendChild(doc.importNode(e, true));
             }
             QByteArray data;
             data.append(doc.toString().toUtf8());
@@ -156,6 +180,10 @@ void EffectsListWidget::dragMoveEvent(QDragMoveEvent * event) {
     //}
 }
 
-
+//virtual
+void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event) {
+    QListWidgetItem *item = itemAt(event->pos());
+    if (item && item->data(TypeRole).toInt() == EFFECT_CUSTOM) m_menu->popup(event->globalPos());
+}
 
 #include "effectslistwidget.moc"