Add color when dropping file

Author: boutinb

Desktop/components/JASP/Widgets/MainWindow.qml

@@ -87,25 +87,58 @@ Window
 		return (a + n) % n;
 	}
 
-	DropArea
-	{
-		id: drop
-		enabled: true
-		anchors.fill: parent
-		onDropped: (drop) => mainWindow.openURLFile(drop.text)
-	}
-
 	Item
 	{
 		anchors.fill:	parent
 
 		Rectangle
 		{
+			id:				warningRect
 			z:				1
-			visible:		mainWindow.hadFatalError
-			color:			jaspTheme.red
+			color:			mainWindow.hadFatalError ? jaspTheme.red : "transparent"
 			opacity:		0.75
 			anchors.fill:	parent
+
+			DropArea
+			{
+				enabled: true
+				anchors.fill: parent
+				onDropped: (drop) =>
+				{
+				   if (mainWindow.openURLFile(drop.text))
+						drop.accepted = true
+				   parent.state = ""
+				}
+
+				onExited: parent.state = ""
+				onEntered: (drag) =>
+				{
+					if (drag.hasText)
+						parent.state = "active"
+				}
+			}
+
+			states: [
+					State {
+						name: "active"
+						PropertyChanges {
+							warningRect {
+								color: jaspTheme.blueLighter
+							}
+						}
+					}
+				]
+
+			transitions: [
+					Transition {
+						from: ""
+						to: "active"
+						reversible: true
+						ColorAnimation { properties: "color"; duration: 150; easing.type: Easing.InOutQuad }
+					}
+				]
+
+
 		}
 
 		Shortcut { onActivated: mainWindow.showEnginesWindow();					sequences: ["Ctrl+Alt+Shift+E"];								context: Qt.ApplicationShortcut; }

Desktop/mainwindow.cpp

@@ -852,13 +852,13 @@ void MainWindow::showLogFolder() const
 	openFolderExternally(AppDirs::logDir());
 }
 
-void MainWindow::openURLFile(QString fileURLPath)
+bool MainWindow::openURLFile(QString fileURLPath)
 {
 	QUrl fileUrl = fileURLPath.startsWith("file:") ? QUrl(fileURLPath) : QUrl::fromLocalFile(fileURLPath);
 	if (!fileUrl.isLocalFile())
 	{
 		MessageForwarder::showWarning(tr("Open file"), tr("Cannot access file %1").arg(fileURLPath));
-		return;
+        return false;
 	}
 
 	QString filePath = fileUrl.toLocalFile();
@@ -867,15 +867,15 @@ void MainWindow::openURLFile(QString fileURLPath)
 	if (!fileInfo.exists())
 	{
 		MessageForwarder::showWarning(tr("Open file"), tr("File %1 is not found.").arg(filePath));
-		return;
+        return false;
 	}
 
     Utils::FileType fileType = Utils::getTypeFromFileName(fq(filePath));
 
     if (fileType == Utils::FileType::empty || fileType == Utils::FileType::unknown || fileType == Utils::FileType::html ||  fileType == Utils::FileType::pdf)
 	{
 		MessageForwarder::showWarning(tr("Open file"), tr("JASP does not support this file type %1.").arg(filePath));
-		return;
+        return false;
 	}
 
     if (_package->hasDataSet() && fileType != Utils::FileType::jasp)
@@ -886,6 +886,8 @@ void MainWindow::openURLFile(QString fileURLPath)
     }
     else
         open(filePath);
+
+    return true;
 }
 
 void MainWindow::open(const QString & mainFilePath, const QString & inputDataFile, const QString & outputFile, bool keepJASPOpen)

Desktop/mainwindow.h

@@ -171,7 +171,7 @@ public slots:
 	void zoomResetKeyPressed();	
 	void undo();
 	void redo();
-	void openURLFile(QString fileURLPath);
+    bool openURLFile(QString fileURLPath);
 
 	QObject * loadQmlData(QString data, QUrl url);