Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cura/UI
diff options
context:
space:
mode:
authorninovanhooff <ninovanhooff@gmail.com>2019-12-13 13:44:34 +0300
committerGitHub <noreply@github.com>2019-12-13 13:44:34 +0300
commita6946fa3d9f4673ac53788cd0ad17a163a543f98 (patch)
tree637b1fdeda2d6d114cbe18ad3c9d32f478131575 /cura/UI
parent4d8c19ccc87c1f437ff9832588fef6fc62de3d27 (diff)
parent5ea60823f568a18a31fcdd8f653c1cc4235c886c (diff)
Merge branch 'master' into CURA-7011_enterprise_visual_cues
Diffstat (limited to 'cura/UI')
-rw-r--r--cura/UI/PrintInformation.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/cura/UI/PrintInformation.py b/cura/UI/PrintInformation.py
index abf1083836..e33ab13b69 100644
--- a/cura/UI/PrintInformation.py
+++ b/cura/UI/PrintInformation.py
@@ -298,9 +298,7 @@ class PrintInformation(QObject):
# Only update the job name when it's not user-specified.
if not self._is_user_specified_job_name:
- if self._pre_sliced:
- self._job_name = catalog.i18nc("@label", "Pre-sliced file {0}", base_name)
- elif self._application.getInstance().getPreferences().getValue("cura/jobname_prefix"):
+ if self._application.getInstance().getPreferences().getValue("cura/jobname_prefix") and not self._pre_sliced:
# Don't add abbreviation if it already has the exact same abbreviation.
if base_name.startswith(self._abbr_machine + "_"):
self._job_name = base_name