From d77e9db1ae8262d817cde7b13c01dfd557669717 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 1 Jul 2018 15:40:08 +0100
Subject: [PATCH] added #96

---
 README.md             |  2 +-
 olive.pro.user        |  2 +-
 panels/project.cpp    | 72 +++++++++++++++++++++++--------------------
 panels/project.h      |  2 +-
 panels/project.ui     |  2 +-
 ui/sourcetable.cpp    | 39 ++++++++++++++++++++---
 ui/sourcetable.h      |  4 ++-
 ui/timelinewidget.cpp |  2 +-
 8 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 23eb29d38..59c1e2593 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-#Olive Video Editor
+# Olive Video Editor
 
 Olive is a non-linear video editor for Windows, macOS, and Linux. Binaries are not available as of yet, but will be very soon. If you're building from source, you'll need Qt and FFmpeg (recommended versions are Qt 5.5 and FFmpeg 3.4.2).
\ No newline at end of file
diff --git a/olive.pro.user b/olive.pro.user
index a1ff0c084..012579420 100644
--- a/olive.pro.user
+++ b/olive.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.6.2, 2018-07-01T04:07:52. -->
+<!-- Written by QtCreator 4.6.2, 2018-07-01T04:18:56. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/panels/project.cpp b/panels/project.cpp
index f78203aae..b262a0bab 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -18,6 +18,8 @@
 #include <QDebug>
 #include <QCharRef>
 #include <QMessageBox>
+#include <QDropEvent>
+#include <QMimeData>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
@@ -33,7 +35,7 @@ Project::Project(QWidget *parent) :
 	QDockWidget(parent),
 	ui(new Ui::Project)
 {
-	ui->setupUi(this);
+    ui->setupUi(this);
 }
 
 Project::~Project()
@@ -166,44 +168,48 @@ Media* Project::import_file(QString file) {
     return m;
 }
 
-void Project::import_dialog() {
-	QStringList files = QFileDialog::getOpenFileNames(this, "Import media...", "", "All Files (*.*)");
-	for (int i=0;i<files.count();i++) {
-		QString file(files.at(i));
+void Project::process_file_list(QStringList& files) {
+    for (int i=0;i<files.count();i++) {
+        QString file(files.at(i));
 
-		// heuristic to determine whether file is part of an image sequence
-		int lastcharindex = file.lastIndexOf(".")-1;
-		if (file[lastcharindex].isDigit()) {
-			bool is_img_sequence = false;
-			QString sequence_test(file);
-			char lastchar = sequence_test.at(lastcharindex).toLatin1();
+        // heuristic to determine whether file is part of an image sequence
+        int lastcharindex = file.lastIndexOf(".")-1;
+        if (file[lastcharindex].isDigit()) {
+            bool is_img_sequence = false;
+            QString sequence_test(file);
+            char lastchar = sequence_test.at(lastcharindex).toLatin1();
 
-			sequence_test[lastcharindex] = lastchar + 1;
-			if (QFileInfo::exists(sequence_test)) is_img_sequence = true;
+            sequence_test[lastcharindex] = lastchar + 1;
+            if (QFileInfo::exists(sequence_test)) is_img_sequence = true;
 
-			sequence_test[lastcharindex] = lastchar - 1;
-			if (QFileInfo::exists(sequence_test)) is_img_sequence = true;
+            sequence_test[lastcharindex] = lastchar - 1;
+            if (QFileInfo::exists(sequence_test)) is_img_sequence = true;
 
-			if (is_img_sequence &&
-					QMessageBox::question(this, "Image sequence detected", "The file '" + file + "' appears to be part of an image sequence. Would you like to import it as such?", QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
-				// change url to an image sequence instead
-				int digit_count = 0;
-				QString ext = file.mid(lastcharindex+1);
-				while (file[lastcharindex].isDigit()) {
-					digit_count++;
-					lastcharindex--;
-				}
-				QString new_filename = file.left(lastcharindex+1) + "%";
-				if (digit_count < 10) {
-					new_filename += "0";
-				}
-				new_filename += QString::number(digit_count) + "d" + ext;
-				file = new_filename;
-			}
-		}
+            if (is_img_sequence &&
+                    QMessageBox::question(this, "Image sequence detected", "The file '" + file + "' appears to be part of an image sequence. Would you like to import it as such?", QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
+                // change url to an image sequence instead
+                int digit_count = 0;
+                QString ext = file.mid(lastcharindex+1);
+                while (file[lastcharindex].isDigit()) {
+                    digit_count++;
+                    lastcharindex--;
+                }
+                QString new_filename = file.left(lastcharindex+1) + "%";
+                if (digit_count < 10) {
+                    new_filename += "0";
+                }
+                new_filename += QString::number(digit_count) + "d" + ext;
+                file = new_filename;
+            }
+        }
 
         import_file(file);
-	}
+    }
+}
+
+void Project::import_dialog() {
+	QStringList files = QFileDialog::getOpenFileNames(this, "Import media...", "", "All Files (*.*)");
+    process_file_list(files);
 }
 
 Media* Project::get_media_from_tree(QTreeWidgetItem* item) {
diff --git a/panels/project.h b/panels/project.h
index a8e837a27..6efd39f5a 100644
--- a/panels/project.h
+++ b/panels/project.h
@@ -31,6 +31,7 @@ public:
 	void new_sequence(Sequence* s);
 	QString get_next_sequence_name();
     void remove_item(int i);
+    void process_file_list(QStringList& files);
 
     void new_project();
     void load_project();
@@ -40,7 +41,6 @@ public:
     void set_media_of_tree(QTreeWidgetItem* item, Media* media);
 
 	SourceTable* source_table;
-
 private:
 	Ui::Project *ui;
 };
diff --git a/panels/project.ui b/panels/project.ui
index 080ed310f..f8fb1db10 100644
--- a/panels/project.ui
+++ b/panels/project.ui
@@ -42,7 +42,7 @@
        <bool>false</bool>
       </property>
       <property name="dragDropMode">
-       <enum>QAbstractItemView::DragOnly</enum>
+       <enum>QAbstractItemView::DragDrop</enum>
       </property>
       <property name="selectionMode">
        <enum>QAbstractItemView::ExtendedSelection</enum>
diff --git a/ui/sourcetable.cpp b/ui/sourcetable.cpp
index afb58ce0e..6082d1066 100644
--- a/ui/sourcetable.cpp
+++ b/ui/sourcetable.cpp
@@ -8,9 +8,11 @@
 #include "playback/playback.h"
 
 #include <QDragEnterEvent>
+#include <QMimeData>
 
 SourceTable::SourceTable(QWidget* parent) : QTreeWidget(parent) {
-	this->sortByColumn(0, Qt::AscendingOrder);
+    sortByColumn(0, Qt::AscendingOrder);
+    setAcceptDrops(true);
 }
 
 void SourceTable::mouseDoubleClickEvent(QMouseEvent* )
@@ -25,6 +27,35 @@ void SourceTable::mouseDoubleClickEvent(QMouseEvent* )
 	}
 }
 
-//void SourceTable::dragEnterEvent(QDragEnterEvent *event) {
-//	event->accept();
-//}
+void SourceTable::dragEnterEvent(QDragEnterEvent *event) {
+    if (event->mimeData()->hasUrls()) {
+        event->acceptProposedAction();
+    } else {
+        QTreeWidget::dragEnterEvent(event);
+    }
+}
+
+void SourceTable::dragMoveEvent(QDragMoveEvent *event) {
+    if (event->mimeData()->hasUrls()) {
+        event->acceptProposedAction();
+    } else {
+        QTreeWidget::dragMoveEvent(event);
+    }
+}
+
+void SourceTable::dropEvent(QDropEvent* event) {
+    const QMimeData* mimeData = event->mimeData();
+
+    if (mimeData->hasUrls()) {
+        QList<QUrl> urls = mimeData->urls();
+        if (!urls.isEmpty()) {
+            QStringList paths;
+            for (int i=0;i<urls.size();i++) {
+                paths.append(urls.at(i).toLocalFile());
+            }
+            panel_project->process_file_list(paths);
+        }
+        event->acceptProposedAction();
+    }
+    QTreeWidget::dropEvent(event);
+}
diff --git a/ui/sourcetable.h b/ui/sourcetable.h
index 0fa3ff24f..b088e9671 100644
--- a/ui/sourcetable.h
+++ b/ui/sourcetable.h
@@ -11,7 +11,9 @@ public:
 	SourceTable(QWidget* parent = 0);
 protected:
     void mouseDoubleClickEvent(QMouseEvent *event);
-//	void dragEnterEvent(QDragEnterEvent *event) override;
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
 private:
 };
 
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index 175ac9b15..c181ce671 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -1033,7 +1033,7 @@ void TimelineWidget::paintEvent(QPaintEvent*) {
 }
 
 bool TimelineWidget::is_track_visible(int track) {
-	return ((bottom_align && track < 0) || (!bottom_align && track >= 0));
+    return (bottom_align == (track < 0));
 }
 
 // **************************************