Merge branch '3.1'

cura/PrintInformation.py

@@ -67,11 +67,9 @@ class PrintInformation(QObject):
         self._base_name = ""
         self._abbr_machine = ""
         self._job_name = ""
-        self._project_name = ""
 
         Application.getInstance().globalContainerStackChanged.connect(self._updateJobName)
         Application.getInstance().fileLoaded.connect(self.setBaseName)
-        Application.getInstance().workspaceLoaded.connect(self.setProjectName)
         Preferences.getInstance().preferenceChanged.connect(self._onPreferencesChanged)
 
         self._active_material_container = None
@@ -253,26 +251,13 @@ class PrintInformation(QObject):
         self._job_name = name
         self.jobNameChanged.emit()
 
-    @pyqtSlot(str)
-    def setProjectName(self, name):
-        self._project_name = name
-        self.setJobName(name)
-
     jobNameChanged = pyqtSignal()
 
     @pyqtProperty(str, notify = jobNameChanged)
     def jobName(self):
         return self._job_name
 
-    def _updateJobName(self, is_project_name_empty = False):
-        # if the project name is set, we use the project name as the job name, so the job name should not get updated
-        # if a model file is loaded after that.
-        if self._project_name != "":
-            if is_project_name_empty:
-                self._project_name = ""
-            else:
-                return
-
+    def _updateJobName(self):
         if self._base_name == "":
             self._job_name = ""
             self.jobNameChanged.emit()
@@ -313,7 +298,7 @@ class PrintInformation(QObject):
             if name.endswith(".curaproject"):
                 name = name[:name.rfind(".curaproject")]
             self._base_name = name
-            self._updateJobName(is_project_name_empty = is_empty)
+            self._updateJobName()
 
     ##  Created an acronymn-like abbreviated machine name from the currently active machine name
     #   Called each time the global stack is switched

cura/Settings/CuraContainerRegistry.py

@@ -449,6 +449,12 @@ class CuraContainerRegistry(ContainerRegistry):
             extruder_stack.setVariantById(variant_id)
             extruder_stack.setMaterialById("default")
             extruder_stack.setQualityById("default")
+            quality_changes_id = "default"
+            if machine.qualityChanges.getId() != "empty_quality_changes":
+                extruder_quality_changes_container = self.findInstanceContainers(name = machine.qualityChanges.getName(), extruder = extruder_id)
+                if extruder_quality_changes_container:
+                    quality_changes_id = extruder_quality_changes_container[0].getId()
+            extruder_stack.setQualityChangesById(quality_changes_id)
 
             self.addContainer(extruder_stack)
 

cura/Settings/MachineManager.py

@@ -620,11 +620,9 @@ class MachineManager(QObject):
     @pyqtProperty(str, notify=activeQualityChanged)
     def activeQualityId(self) -> str:
         if self._active_container_stack:
-            quality = self._active_container_stack.qualityChanges
-            if quality and not isinstance(quality, type(self._empty_quality_changes_container)):
-                return quality.getId()
             quality = self._active_container_stack.quality
-            if quality:
+            quality_changes = self._active_container_stack.qualityChanges
+            if quality and quality_changes and isinstance(quality_changes, type(self._empty_quality_changes_container)) and not isinstance(quality, type(self._empty_quality_container)):
                 return quality.getId()
         return ""
 
@@ -690,9 +688,9 @@ class MachineManager(QObject):
     @pyqtProperty(str, notify = activeQualityChanged)
     def activeQualityChangesId(self) -> str:
         if self._active_container_stack:
-            changes = self._active_container_stack.qualityChanges
-            if changes and changes.getId() != "empty":
-                return changes.getId()
+            quality_changes = self._active_container_stack.qualityChanges
+            if quality_changes and not isinstance(quality_changes, type(self._empty_quality_changes_container)):
+                return quality_changes.getId()
         return ""
 
     ## Check if a container is read_only

plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py

@@ -114,8 +114,10 @@ class VersionUpgrade30to31(VersionUpgrade):
         # Copy global quality changes to extruder quality changes for single extrusion machines
         if parser["metadata"]["type"] == "quality_changes":
             all_quality_changes = self._getSingleExtrusionMachineQualityChanges(parser)
-            if len(all_quality_changes) == 1 and not all_quality_changes[0].has_option("metadata", "extruder"):
-                self._createExtruderQualityChangesForSingleExtrusionMachine(filename, all_quality_changes[0])
+            # Note that DO NOT!!! use the quality_changes returned from _getSingleExtrusionMachineQualityChanges().
+            # Those are loaded from the hard drive which are original files that haven't been upgraded yet.
+            if len(all_quality_changes) == 1 and not parser.has_option("metadata", "extruder"):
+                self._createExtruderQualityChangesForSingleExtrusionMachine(filename, parser)
 
         # Update version numbers
         parser["general"]["version"] = "2"

resources/i18n/ko_KR/fdmextruder.def.json.po

@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.0\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
+"Project-Id-Version: Cura 3.1\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2017-11-21 16:58+0000\n"
 "PO-Revision-Date: 2017-09-20 14:31+0900\n"
 "Last-Translator: Brule\n"