X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=10c0d315194287cb2761a9bdfc9a8a75111f212e;hb=c74f57735de000dd0ea8be15791db2aac674d98a;hp=94f840957be39afcc8f6ee8602233daca4ed8bf6;hpb=db7cce03362cb505c93ead2086e1f5653059bc65;p=kdenlive

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 94f84095..10c0d315 100644
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -22,103 +22,236 @@
 #include "effectslist.h"
 #include "mainwindow.h"
 
-#include "KDebug"
+#include <KDebug>
+#include <KStandardDirs>
 
-#include "QApplication"
-#include "QMouseEvent"
+#include <QApplication>
+#include <QMouseEvent>
 #include <QMenu>
 
 
 static const int EFFECT_VIDEO = 1;
 static const int EFFECT_AUDIO = 2;
 static const int EFFECT_CUSTOM = 3;
+static const int EFFECT_FOLDER = 4;
 
 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);
-    setAlternatingRowColors(true);
-    setSortingEnabled(true);
+
+EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) :
+        QTreeWidget(parent),
+        m_menu(menu)
+{
+    setColumnCount(1);
     setDragEnabled(true);
-    setAcceptDrops(true);
+    setAcceptDrops(false);
+    setHeaderHidden(true);
+    setFrameShape(QFrame::NoFrame);
+    setAutoFillBackground(false);
+    setRootIsDecorated(false);
+    //setSelectionMode(QAbstractItemView::ExtendedSelection);
+    setDragDropMode(QAbstractItemView::DragOnly);
+    QPalette p = palette();
+    p.setBrush(QPalette::Base, Qt::NoBrush);
+    setPalette(p);
     initList();
+    connect(this, SIGNAL(activated(const QModelIndex &)), this, SLOT(slotExpandItem(const QModelIndex &)));
 }
 
-EffectsListWidget::~EffectsListWidget() {
+EffectsListWidget::~EffectsListWidget()
+{
 }
 
-void EffectsListWidget::initList() {
-    clear();
-    QListWidgetItem *item;
-    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);
+void EffectsListWidget::slotExpandItem(const QModelIndex & index)
+{
+    setExpanded(index, !isExpanded(index));
+}
+
+void EffectsListWidget::initList()
+{
+    QString current;
+    QString currentFolder;
+    QTreeWidgetItem *item = NULL;
+    bool found = false;
+
+    if (currentItem()) {
+        current = currentItem()->text(0);
+        if (currentItem()->parent())
+            currentFolder = currentItem()->parent()->text(0);
+        else if (currentItem()->data(0, TypeRole) ==  EFFECT_FOLDER)
+            currentFolder = currentItem()->text(0);
+    }
+
+    KIcon folderIcon("folder");
+
+    QString effectCategory = KStandardDirs::locate("config", "kdenliveeffectscategory.rc");
+    QDomDocument doc;
+    QFile file(effectCategory);
+    doc.setContent(&file, false);
+    file.close();
+    QList <QTreeWidgetItem *> folders;
+    QStringList folderNames;
+    QDomNodeList groups = doc.documentElement().elementsByTagName("group");
+    for (int i = 0; i < groups.count(); i++) {
+        folderNames << groups.at(i).firstChild().firstChild().nodeValue();
+    }
+    for (int i = 0; i < topLevelItemCount(); i++) {
+        topLevelItem(i)->takeChildren();
+        QString currentName = topLevelItem(i)->text(0);
+        if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) {
+            takeTopLevelItem(i);
+            i--;
         }
     }
 
-    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);
+    for (int i = 0; i < groups.count(); i++) {
+        item = findFolder(folderNames.at(i));
+        if (item) {
+            item->setData(0, IdRole, groups.at(i).toElement().attribute("list"));
+        } else {
+            item = new QTreeWidgetItem((QTreeWidget*)0, QStringList(folderNames.at(i)));
+            item->setIcon(0, folderIcon);
+            item->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+            item->setData(0, IdRole, groups.at(i).toElement().attribute("list"));
+            item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+            insertTopLevelItem(0, item);
+        }
+        folders.append(item);
+    }
+
+    QTreeWidgetItem *misc = findFolder(i18n("Misc"));
+    if (misc == NULL) {
+        misc = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Misc")));
+        misc->setIcon(0, folderIcon);
+        misc->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+        misc->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+        insertTopLevelItem(0, misc);
+    }
+
+    QTreeWidgetItem *audio = findFolder(i18n("Audio"));
+    if (audio == NULL) {
+        audio = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Audio")));
+        audio->setIcon(0, folderIcon);
+        audio->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+        audio->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+        insertTopLevelItem(0, audio);
+    }
+
+    QTreeWidgetItem *custom = findFolder(i18nc("Folder Name", "Custom"));
+    if (custom == NULL) {
+        custom = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18nc("Folder Name", "Custom")));
+        custom->setIcon(0, folderIcon);
+        custom->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+        custom->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+        insertTopLevelItem(0, custom);
+    }
+
+    //insertTopLevelItems(0, folders);
+
+    loadEffects(&MainWindow::videoEffects, KIcon("kdenlive-show-video"), misc, &folders, QString::number((int) EFFECT_VIDEO), current, &found);
+    loadEffects(&MainWindow::audioEffects, KIcon("kdenlive-show-audio"), audio, &folders, QString::number((int) EFFECT_AUDIO), current, &found);
+    loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, static_cast<QList<QTreeWidgetItem *> *>(0), QString::number((int) EFFECT_CUSTOM), current, &found);
+
+    if (!found && !currentFolder.isEmpty()) {
+        // previously selected effect was removed, focus on its parent folder
+        for (int i = 0; i < topLevelItemCount(); i++) {
+            if (topLevelItem(i)->text(0) == currentFolder) {
+                setCurrentItem(topLevelItem(i));
+                break;
+            }
         }
+
     }
+    setSortingEnabled(true);
+    sortByColumn(0, Qt::AscendingOrder);
+}
+
+void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList<QTreeWidgetItem *> *folders, const QString type, const QString current, bool *found)
+{
+    QStringList effectInfo, l;
+    QTreeWidgetItem *parentItem;
+    QTreeWidgetItem *item;
+    int ct = effectlist->count();
 
-    ct = MainWindow::customEffects.count();
     for (int ix = 0; ix < ct; ix ++) {
-        effectInfo = MainWindow::customEffects.effectIdInfo(ix);
+        effectInfo = effectlist->effectIdInfo(ix);
+        parentItem = NULL;
+
+        if (folders) {
+            for (int i = 0; i < folders->count(); i++) {
+                l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
+                if (l.contains(effectInfo.at(2))) {
+                    parentItem = folders->at(i);
+                    break;
+                }
+            }
+        }
+        if (parentItem == NULL)
+            parentItem = defaultFolder;
+
         if (!effectInfo.isEmpty()) {
-            item = new QListWidgetItem(effectInfo.takeFirst(), this);
-            item->setData(TypeRole, QString::number((int) EFFECT_CUSTOM));
-            item->setData(IdRole, effectInfo);
+            item = new QTreeWidgetItem(parentItem, QStringList(effectInfo.takeFirst()));
+            item->setIcon(0, icon);
+            item->setData(0, TypeRole, type);
+            item->setData(0, IdRole, effectInfo);
+            item->setToolTip(0, effectlist->getInfo(effectInfo.at(0), effectInfo.at(1)));
+            if (item->text(0) == current) {
+                setCurrentItem(item);
+                *found = true;
+            }
         }
     }
 }
 
-QDomElement EffectsListWidget::currentEffect() {
+QTreeWidgetItem *EffectsListWidget::findFolder(const QString name)
+{
+    QTreeWidgetItem *item = NULL;
+    QList<QTreeWidgetItem *> result = findItems(name, Qt::MatchExactly);
+    if (!result.isEmpty()) {
+        for (int j = 0; j < result.count(); j++) {
+            if (result.at(j)->data(0, TypeRole) ==  EFFECT_FOLDER) {
+                item = result.at(j);
+                break;
+            }
+        }
+    }
+    return item;
+}
+
+const QDomElement EffectsListWidget::currentEffect() const
+{
     return itemEffect(currentItem());
 }
 
-QDomElement EffectsListWidget::itemEffect(QListWidgetItem *item) {
+const QDomElement EffectsListWidget::itemEffect(QTreeWidgetItem *item) const
+{
     QDomElement effect;
-    if (!item) return effect;
-    QStringList effectInfo = item->data(IdRole).toStringList();
+    if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return effect;
+    QStringList effectInfo = item->data(0, IdRole).toStringList();
     kDebug() << "// EFFECT SELECTED: " << effectInfo;
-    switch (item->data(TypeRole).toInt()) {
+    switch (item->data(0, TypeRole).toInt()) {
     case 1:
-        effect =  MainWindow::videoEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1));
+        effect =  MainWindow::videoEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1)).cloneNode().toElement();
         break;
     case 2:
-        effect = MainWindow::audioEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1));
+        effect = MainWindow::audioEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1)).cloneNode().toElement();
         break;
     default:
-        effect = MainWindow::customEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1));
+        effect = MainWindow::customEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1)).cloneNode().toElement();
         break;
     }
     return effect;
 }
 
 
-QString EffectsListWidget::currentInfo() {
-    QListWidgetItem *item = currentItem();
-    if (!item) return QString();
+QString EffectsListWidget::currentInfo()
+{
+    QTreeWidgetItem *item = currentItem();
+    if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return QString();
     QString info;
-    QStringList effectInfo = item->data(IdRole).toStringList();
-    switch (item->data(TypeRole).toInt()) {
+    QStringList effectInfo = item->data(0, IdRole).toStringList();
+    switch (item->data(0, TypeRole).toInt()) {
     case 1:
         info = MainWindow::videoEffects.getInfo(effectInfo.at(0), effectInfo.at(1));
         break;
@@ -132,60 +265,39 @@ QString EffectsListWidget::currentInfo() {
     return info;
 }
 
-// virtual
-void EffectsListWidget::mousePressEvent(QMouseEvent *event) {
-    if (event->button() == Qt::LeftButton) {
-        m_DragStartPosition = event->pos();
-        m_dragStarted = true;
-    }
-    KListWidget::mousePressEvent(event);
-}
-
-// virtual
-void EffectsListWidget::mouseMoveEvent(QMouseEvent *event) {
-    if (!m_dragStarted) return;
-    if ((event->pos() - m_DragStartPosition).manhattanLength()
-            < QApplication::startDragDistance())
-        return;
-
-    {
-        QListWidgetItem *clickItem = itemAt(event->pos());
-        if (clickItem) {
-            QDrag *drag = new QDrag(this);
-            QMimeData *mimeData = new QMimeData;
-            const QList <QListWidgetItem *>list = selectedItems();
-            QDomDocument doc;
-            foreach(QListWidgetItem *item, list) {
-                QDomElement e = itemEffect(item);
-                if (!e.isNull()) doc.appendChild(doc.importNode(e, true));
-            }
-            QByteArray data;
-            data.append(doc.toString().toUtf8());
-            mimeData->setData("kdenlive/effectslist", data);
-            drag->setMimeData(mimeData);
-            //QPixmap pix = qVariantValue<QPixmap>(clickItem->data(Qt::DecorationRole));
-            //drag->setPixmap(pix);
-            //drag->setHotSpot(QPoint(0, 50));
-            drag->start(Qt::MoveAction);
+//virtual
+QMimeData * EffectsListWidget::mimeData(const QList<QTreeWidgetItem *> list) const
+{
+    QDomDocument doc;
+    foreach(QTreeWidgetItem *item, list) {
+        if (item->flags() & Qt::ItemIsDragEnabled) {
+            const QDomElement e = itemEffect(item);
+            if (!e.isNull()) doc.appendChild(doc.importNode(e, true));
         }
-        //event->accept();
     }
+    QMimeData *mime = new QMimeData;
+    QByteArray data;
+    data.append(doc.toString().toUtf8());
+    mime->setData("kdenlive/effectslist", data);
+    return mime;
 }
 
-void EffectsListWidget::dragMoveEvent(QDragMoveEvent * event) {
-    event->setDropAction(Qt::IgnoreAction);
-    //if (item) {
-    event->setDropAction(Qt::MoveAction);
-    if (event->mimeData()->hasText()) {
+//virtual
+void EffectsListWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+    if (event->mimeData()->hasFormat("kdenlive/effectslist")) {
         event->acceptProposedAction();
+    } else {
+        event->ignore();
     }
-    //}
 }
 
+
 //virtual
-void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event) {
-    QListWidgetItem *item = itemAt(event->pos());
-    if (item && item->data(TypeRole).toInt() == EFFECT_CUSTOM) m_menu->popup(event->globalPos());
+void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event)
+{
+    QTreeWidgetItem *item = itemAt(event->pos());
+    if (item && item->data(0, TypeRole).toInt() == EFFECT_CUSTOM) m_menu->popup(event->globalPos());
 }
 
 #include "effectslistwidget.moc"