X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=60277c0d4783eb2b8b3a588b0c20900a00822dec;hb=6a33521fe12af44ab9abe8e09c6e007f4093b2da;hp=919926068497326c85c738480971a3794a362a88;hpb=e9f56d1d2124e60ca64ce64d254da39fceac7bf4;p=kdenlive

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 91992606..60277c0d 100644
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -43,17 +43,15 @@ EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) :
         QTreeWidget(parent),
         m_menu(menu)
 {
-    //setSelectionMode(QAbstractItemView::ExtendedSelection);
-    //setDragDropMode(QAbstractItemView::DragDrop);
     setColumnCount(1);
-    setDropIndicatorShown(true);
-    //setAlternatingRowColors(true);
     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);
@@ -74,13 +72,14 @@ void EffectsListWidget::initList()
 {
     QString current;
     QString currentFolder;
-    QTreeWidgetItem *item;
+    QTreeWidgetItem *item = NULL;
     QTreeWidgetItem *parentItem;
     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);
     }
 
     QString effectName;
@@ -103,38 +102,56 @@ void EffectsListWidget::initList()
     }
     for (int i = 0; i < topLevelItemCount(); i++) {
         topLevelItem(i)->takeChildren();
-        if (!folderNames.contains(topLevelItem(i)->text(0))) {
+        QString currentName = topLevelItem(i)->text(0);
+        if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) {
             takeTopLevelItem(i);
             i--;
         }
     }
 
     for (int i = 0; i < groups.count(); i++) {
-        QList<QTreeWidgetItem *> result = findItems(folderNames.at(i), Qt::MatchExactly);
-        if (!result.isEmpty()) item = result.at(0);
-        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 = 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 = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Misc")));
-    misc->setIcon(0, folderIcon);
-    misc->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+    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 = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Audio")));
-    audio->setIcon(0, folderIcon);
-    audio->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+    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 = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Custom")));
-    custom->setIcon(0, folderIcon);
-    custom->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER));
+    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);
+    }
 
-    insertTopLevelItem(0, custom);
-    insertTopLevelItem(0, misc);
-    insertTopLevelItem(0, audio);
-    insertTopLevelItems(0, folders);
+    //insertTopLevelItems(0, folders);
 
 
     int ct = MainWindow::videoEffects.count();
@@ -205,7 +222,6 @@ void EffectsListWidget::initList()
         for (int i = 0; i < topLevelItemCount(); i++) {
             if (topLevelItem(i)->text(0) == currentFolder) {
                 setCurrentItem(topLevelItem(i));
-                topLevelItem(i)->setExpanded(true);
                 break;
             }
         }
@@ -215,6 +231,21 @@ void EffectsListWidget::initList()
     sortByColumn(0, Qt::AscendingOrder);
 }
 
+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());
@@ -261,57 +292,34 @@ QString EffectsListWidget::currentInfo()
     return info;
 }
 
-// virtual
-void EffectsListWidget::mousePressEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton) {
-        m_DragStartPosition = event->pos();
-        m_dragStarted = true;
-    }
-    QTreeWidget::mousePressEvent(event);
-}
-
-// virtual
-void EffectsListWidget::mouseMoveEvent(QMouseEvent *event)
+//virtual
+QMimeData * EffectsListWidget::mimeData(const QList<QTreeWidgetItem *> list) const
 {
-    if (!m_dragStarted) return;
-    if ((event->pos() - m_DragStartPosition).manhattanLength()
-            < QApplication::startDragDistance())
-        return;
-
-    {
-        QTreeWidgetItem *clickItem = itemAt(event->pos());
-        if (clickItem && clickItem->data(0, TypeRole).toInt() != (int)EFFECT_FOLDER) {
-            QDrag *drag = new QDrag(this);
-            QMimeData *mimeData = new QMimeData;
-            const QList <QTreeWidgetItem *>list = selectedItems();
-            QDomDocument doc;
-            foreach(QTreeWidgetItem *item, list) {
-                const 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::CopyAction);
+    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)
+//virtual
+void EffectsListWidget::dragMoveEvent(QDragMoveEvent *event)
 {
-    event->setDropAction(Qt::CopyAction);
-    if (event->mimeData()->hasText()) {
+    if (event->mimeData()->hasFormat("kdenlive/effectslist")) {
         event->acceptProposedAction();
+    } else {
+        event->ignore();
     }
-    //}
 }
 
+
 //virtual
 void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event)
 {