From 2d4880921421baed7dccd1e6fd297631420c0920 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 21 Mar 2017 10:57:34 +0100
Subject: [PATCH] Also asks when opening a recent project file

CURA-3495
---
 resources/qml/Menus/RecentFilesMenu.qml | 41 +++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/resources/qml/Menus/RecentFilesMenu.qml b/resources/qml/Menus/RecentFilesMenu.qml
index 866b06ccbb..8c685f6987 100644
--- a/resources/qml/Menus/RecentFilesMenu.qml
+++ b/resources/qml/Menus/RecentFilesMenu.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 
-import UM 1.2 as UM
+import UM 1.3 as UM
 import Cura 1.0 as Cura
 
 Menu
@@ -25,8 +25,38 @@ Menu
                 var path = modelData.toString()
                 return (index + 1) + ". " + path.slice(path.lastIndexOf("/") + 1);
             }
-            onTriggered: {
-                Printer.readLocalFile(modelData);
+            onTriggered:
+            {
+                var toShowDialog = false;
+                var toOpenAsProject = false;
+                var toOpenAsModel = false;
+
+                if (CuraApplication.checkIsValidProjectFile(modelData)) {
+                    // check preference
+                    var choice = UM.Preferences.getValue("cura/choice_on_open_project");
+
+                    if (choice == "open_as_project")
+                        toOpenAsProject = true;
+                    else if (choice == "open_as_model")
+                        toOpenAsModel = true;
+                    else
+                        toShowDialog = true;
+                }
+                else {
+                    toOpenAsModel = true;
+                }
+
+                if (toShowDialog) {
+                    askOpenAsProjectOrModelsDialog.fileUrl = modelData;
+                    askOpenAsProjectOrModelsDialog.show();
+                    return;
+                }
+
+                // open file in the prefered way
+                if (toOpenAsProject)
+                    UM.WorkspaceFileHandler.readLocalFile(modelData);
+                else if (toOpenAsModel)
+                    Printer.readLocalFile(modelData);
                 var meshName = backgroundItem.getMeshName(modelData.toString())
                 backgroundItem.hasMesh(decodeURIComponent(meshName))
             }
@@ -34,4 +64,9 @@ Menu
         onObjectAdded: menu.insertItem(index, object)
         onObjectRemoved: menu.removeItem(object)
     }
+
+    Cura.AskOpenAsProjectOrModelsDialog
+    {
+        id: askOpenAsProjectOrModelsDialog
+    }
 }