3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
This reverts commit b97920e5b1.
This commit is contained in:
Ghostkeeper 2021-09-10 16:46:39 +02:00
parent daac6faaba
commit 9e2b556ce8
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/UI/PrintInformation.py
View file

@ -13,8 +13,7 @@ from UM.Qt.Duration import Duration
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError
from UM.OutputDevice.OutputDevice import OutputDevice from UM.OutputDevice import OutputDevice
from UM.OutputDevice.ProjectOutputDevice import ProjectOutputDevice
if TYPE_CHECKING: if TYPE_CHECKING:
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
@ -446,7 +445,6 @@ class PrintInformation(QObject):
def _onOutputStart(self, output_device: OutputDevice) -> None: 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), """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.""" 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() new_name = output_device.getLastOutputName()
if new_name is not None: if new_name is not None:
if len(os.path.dirname(new_name)) > 0: if len(os.path.dirname(new_name)) > 0:

2
plugins/DigitalLibrary/src/DigitalFactoryController.py
View file

@ -604,7 +604,7 @@ class DigitalFactoryController(QObject):
def _saveFileToSelectedProjectHelper(self, filename: str, formats: List[str]) -> None: 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) # 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_id = self._project_model.items[self._selected_project_idx]["libraryProjectId"]
library_project_name = self._project_model.items[self._selected_project_idx]["displayName"] library_project_name = self._project_model.items[self._selected_project_idx]["displayName"]