3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix merge conflicts from 3.4

Browse source
This commit is contained in:
Lipu Fei 2018-06-05 09:02:52 +02:00
commit 7f7a195627
13 changed files with 187 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/PrintInformation.py
View file

@ -299,7 +299,7 @@ class PrintInformation(QObject):
def _updateJobName(self):
if self._base_name == "":
self._job_name = ""
self._job_name = "unnamed"
self._is_user_specified_job_name = False
self.jobNameChanged.emit()
return
@ -351,18 +351,17 @@ class PrintInformation(QObject):
if is_gcode or is_project_file or (is_empty or (self._base_name == "" and self._base_name != check_name)):
# Only take the file name part, Note : file name might have 'dot' in name as well
data = ''
data = ""
try:
mime_type = MimeTypeDatabase.getMimeTypeForFile(name)
data = mime_type.stripExtension(name)
except:
Logger.log("w", "Unsupported Mime Type Database file extension")
data = 'unnamed'
Logger.log("w", "Unsupported Mime Type Database file extension %s", name)
if data is not None and check_name is not None:
self._base_name = data
else:
self._base_name = 'unnamed'
self._base_name = ""
self._updateJobName()