Browse Source

Revert "Only change project name when saving to project files."

This reverts commit b97920e5b155caaab6a8b3bb167853a00ae4b604.
Ghostkeeper 3 years ago
parent
commit
9e2b556ce8

+ 7 - 9
cura/UI/PrintInformation.py

@@ -13,8 +13,7 @@ from UM.Qt.Duration import Duration
 from UM.Scene.SceneNode import SceneNode
 from UM.i18n import i18nCatalog
 from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError
-from UM.OutputDevice.OutputDevice import OutputDevice
-from UM.OutputDevice.ProjectOutputDevice import ProjectOutputDevice
+from UM.OutputDevice import OutputDevice
 
 if TYPE_CHECKING:
     from cura.CuraApplication import CuraApplication
@@ -446,10 +445,9 @@ class PrintInformation(QObject):
     def _onOutputStart(self, output_device: OutputDevice) -> None:
         """If this is the sort of output 'device' (like local or online file storage, rather than a printer),
            the user could have altered the file-name, and thus the project name should be altered as well."""
-        if isinstance(output_device, ProjectOutputDevice):
-            new_name = output_device.getLastOutputName()
-            if new_name is not None:
-                if len(os.path.dirname(new_name)) > 0:
-                    self.setProjectName(new_name)
-                else:
-                    self.setJobName(new_name)
+        new_name = output_device.getLastOutputName()
+        if new_name is not None:
+            if len(os.path.dirname(new_name)) > 0:
+                self.setProjectName(new_name)
+            else:
+                self.setJobName(new_name)

+ 1 - 1
plugins/DigitalLibrary/src/DigitalFactoryController.py

@@ -604,7 +604,7 @@ class DigitalFactoryController(QObject):
 
     def _saveFileToSelectedProjectHelper(self, filename: str, formats: List[str]) -> None:
         # Indicate we have started sending a job (and propagate any user file name changes back to the open project)
-        self.uploadStarted.emit(filename if "3mf" in formats else None)
+        self.uploadStarted.emit(filename)
 
         library_project_id = self._project_model.items[self._selected_project_idx]["libraryProjectId"]
         library_project_name = self._project_model.items[self._selected_project_idx]["displayName"]