From aa0a08500e959f29ae02dc31e901646e139407a0 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 8 Jan 2021 13:44:23 +0100 Subject: [PATCH 1/3] Temproray files shouldn't be in recent file list. CURA-7864 --- cura/CuraApplication.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index ee347e7a4d..e1afb8a88f 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1735,7 +1735,7 @@ class CuraApplication(QtApplication): @pyqtSlot(QUrl, str) @pyqtSlot(QUrl) - def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None): + def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None, add_to_recent_files: str = True): """Open a local file :param project_mode: How to handle project files. Either None(default): Follow user preference, "open_as_model" @@ -1760,7 +1760,7 @@ class CuraApplication(QtApplication): if is_project_file and project_mode == "open_as_project": # open as project immediately without presenting a dialog workspace_handler = self.getWorkspaceFileHandler() - workspace_handler.readLocalFile(file) + workspace_handler.readLocalFile(file, add_to_recent_files = add_to_recent_files) return if is_project_file and project_mode == "always_ask": @@ -1801,7 +1801,7 @@ class CuraApplication(QtApplication): if extension in self._non_sliceable_extensions: self.deleteAll(only_selectable = False) - job = ReadMeshJob(f) + job = ReadMeshJob(f, add_to_recent_files = add_to_recent_files) job.finished.connect(self._readMeshFinished) job.start() From 13d45e3a55d72742ac220177248637820b288578 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 8 Jan 2021 13:51:03 +0100 Subject: [PATCH 2/3] Typing typo. CURA-7864 --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e1afb8a88f..98e2e923d0 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1735,7 +1735,7 @@ class CuraApplication(QtApplication): @pyqtSlot(QUrl, str) @pyqtSlot(QUrl) - def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None, add_to_recent_files: str = True): + def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None, add_to_recent_files: bool = True): """Open a local file :param project_mode: How to handle project files. Either None(default): Follow user preference, "open_as_model" From 3282ad7a4169cd76f160a84781d30603ed9c1d7e Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 11 Jan 2021 12:52:23 +0100 Subject: [PATCH 3/3] Don't add temporary files in the recent files list if F5 is pressed CURA-7864 --- cura/CuraApplication.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 98e2e923d0..76d48f9682 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -3,6 +3,7 @@ import os import sys +import tempfile import time from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any, Dict @@ -1477,7 +1478,8 @@ class CuraApplication(QtApplication): for file_name, nodes in objects_in_filename.items(): for node in nodes: - job = ReadMeshJob(file_name) + file_path = os.path.normpath(os.path.dirname(file_name)) + job = ReadMeshJob(file_name, add_to_recent_files = file_path != tempfile.gettempdir()) # Don't add temp files to the recent files list job._node = node # type: ignore job.finished.connect(self._reloadMeshFinished) if has_merged_nodes: