Cleanup + fix another QDomDocument usage

[kdenlive] / src / projectlistview.cpp

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index 79459753a9ba034365d7f60cd65a6f182aadbf4f..1fcd11ca6d3ff69ffe0a7f3fd45ccfed6e753259 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -17,18 +17,18 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QApplication>
-#include <QHeaderView>
-#include <QAction>
+
+#include "projectlistview.h"
+#include "projectitem.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KMenu>
 #include <KLocale>
 
-#include "projectitem.h"
-#include "projectlistview.h"
-#include "kdenlivesettings.h"
-
+#include <QApplication>
+#include <QHeaderView>
+#include <QAction>
 
 ProjectListView::ProjectListView(QWidget *parent)
         : QTreeWidget(parent), m_dragStarted(false) {
@@ -55,7 +55,6 @@ ProjectListView::ProjectListView(QWidget *parent)
     if (!KdenliveSettings::showdescriptioncolumn()) hideColumn(2);
     if (!KdenliveSettings::showratingcolumn()) hideColumn(3);
 
-    setIconSize(QSize(60, 40));
     setSortingEnabled(true);
 }
 
@@ -69,11 +68,10 @@ void ProjectListView::configureColumns(const QPoint& pos) {
 
     QHeaderView* headerView = header();
     for (int i = 2; i < headerView->count(); ++i) {
-        const int logicalIndex = headerView->logicalIndex(i);
         const QString text = model()->headerData(i, Qt::Horizontal).toString();
         QAction* action = popup.addAction(text);
         action->setCheckable(true);
-        action->setChecked(!headerView->isSectionHidden(logicalIndex));
+        action->setChecked(!headerView->isSectionHidden(i));
         action->setData(i);
     }
 
@@ -113,8 +111,12 @@ void ProjectListView::mouseDoubleClickEvent(QMouseEvent * event) {
     ProjectItem *item = static_cast <ProjectItem *>(itemAt(event->pos()));
     if (!item) emit addClip();
     else if (item->isGroup()) {
-        if ((columnAt(event->pos().x()) == 1) || columnAt(event->pos().x()) == 2) QTreeWidget::mouseDoubleClickEvent(event);
-    } else emit showProperties(item->referencedClip());
+        if ((columnAt(event->pos().x()) == 1)) QTreeWidget::mouseDoubleClickEvent(event);
+    } else {
+        if ((columnAt(event->pos().x()) == 1) && (item->clipType() == SLIDESHOW || item->clipType() == TEXT || item->clipType() == COLOR)) QTreeWidget::mouseDoubleClickEvent(event);
+        else if ((columnAt(event->pos().x()) == 2)) QTreeWidget::mouseDoubleClickEvent(event);
+        else emit showProperties(item->referencedClip());
+    }
 }
 
 // virtual
@@ -136,10 +138,7 @@ void ProjectListView::dropEvent(QDropEvent *event) {
             else if (item->parent() && ((ProjectItem *) item->parent())->isGroup())
                 groupName = item->parent()->text(1);
         }
-        const QList <QUrl> list = event->mimeData()->urls();
-        foreach(const QUrl &url, list) {
-            emit addClip(url, groupName);
-        }
+        emit addClip(event->mimeData()->urls(), groupName);
 
     } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
         ProjectItem *item = static_cast <ProjectItem *>(itemAt(event->pos()));
@@ -176,8 +175,12 @@ void ProjectListView::dropEvent(QDropEvent *event) {
                 QTreeWidgetItem *parent = it->parent();
                 if (parent/* && ((ProjectItem *) it)->clipId() < 10000*/)  {
                     kDebug() << "++ item parent: " << parent->text(1);
-                    clone = (ProjectItem*) parent->takeChild(parent->indexOfChild(it));
-                    if (clone) addTopLevelItem(clone);
+                    clone = static_cast <ProjectItem*>(parent->takeChild(parent->indexOfChild(it)));
+                    if (clone) {
+                        addTopLevelItem(clone);
+                        clone->clearProperty("groupname");
+                        clone->clearProperty("groupid");
+                    }
                 }
             }
         }
@@ -188,7 +191,7 @@ void ProjectListView::dropEvent(QDropEvent *event) {
 // virtual
 void ProjectListView::mousePressEvent(QMouseEvent *event) {
     if (event->button() == Qt::LeftButton) {
-        this->m_DragStartPosition = event->pos();
+        m_DragStartPosition = event->pos();
         m_dragStarted = true;
         QTreeWidgetItem *underMouse = itemAt(event->pos());
         if (underMouse && underMouse->isSelected()) emit focusMonitor();
@@ -199,7 +202,7 @@ void ProjectListView::mousePressEvent(QMouseEvent *event) {
 
 // virtual
 void ProjectListView::mouseMoveEvent(QMouseEvent *event) {
-    kDebug() << "// DRAG STARTED, MOUSE MOVED: ";
+    //kDebug() << "// DRAG STARTED, MOUSE MOVED: ";
     if (!m_dragStarted) return;
 
     if ((event->pos() - m_DragStartPosition).manhattanLength()
@@ -211,28 +214,28 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) {
         if (clickItem) {
             QDrag *drag = new QDrag(this);
             QMimeData *mimeData = new QMimeData;
-            QDomDocument doc;
             const QList <QTreeWidgetItem *> list = selectedItems();
             QStringList ids;
             foreach(const QTreeWidgetItem *item, list) {
-                // TODO allow dragging of folders
-                ids.append(((ProjectItem *) item)->clipId());
+                const ProjectItem *clip = static_cast <const ProjectItem *>(item);
+                if (!clip->isGroup()) ids.append(clip->clipId());
+                else {
+                    const int children = item->childCount();
+                    for (int i = 0; i < children; i++) {
+                        ids.append(static_cast <ProjectItem *>(item->child(i))->clipId());
+                    }
+                }
             }
+            if (ids.isEmpty()) return;
             QByteArray data;
             data.append(ids.join(";").toUtf8()); //doc.toString().toUtf8());
             mimeData->setData("kdenlive/producerslist", data);
             //mimeData->setText(ids.join(";")); //doc.toString());
             //mimeData->setImageData(image);
             drag->setMimeData(mimeData);
-            drag->setPixmap(clickItem->icon(0).pixmap((int)(50 *16 / 9.0), 50));
+            drag->setPixmap(clickItem->icon(0).pixmap(iconSize()));
             drag->setHotSpot(QPoint(0, 50));
-            drag->start(Qt::MoveAction);
-
-            //Qt::DropAction dropAction;
-            //dropAction = drag->start(Qt::CopyAction | Qt::MoveAction);
-
-            //Qt::DropAction dropAction = drag->exec();
-
+            drag->exec(Qt::MoveAction);
         }
         //event->accept();
     }
@@ -240,14 +243,13 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) {
 
 // virtual
 void ProjectListView::dragMoveEvent(QDragMoveEvent * event) {
-    QTreeWidgetItem * item = itemAt(event->pos());
     event->setDropAction(Qt::IgnoreAction);
-    //if (item) {
     event->setDropAction(Qt::MoveAction);
     if (event->mimeData()->hasText()) {
         event->acceptProposedAction();
     }
-    //}
+    // stop playing because we get a crash otherwise when fetching the thumbnails
+    emit pauseMonitor();
 }
 
 QStringList ProjectListView::mimeTypes() const {