Fix merge conflicts from 3.4

cura/CuraApplication.py

@@ -199,7 +199,6 @@ class CuraApplication(QtApplication):
         self._platform_activity = False
         self._scene_bounding_box = AxisAlignedBox.Null
 
-        self._job_name = None
         self._center_after_select = False
         self._camera_animation = None
         self._cura_actions = None

cura/PrintInformation.py

@@ -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()
 

cura/Settings/CuraContainerRegistry.py

@@ -475,7 +475,7 @@ class CuraContainerRegistry(ContainerRegistry):
         extruder_definition = extruder_definitions[0]
         unique_name = self.uniqueName(machine.getName() + " " + new_extruder_id) if create_new_ids else machine.getName() + " " + new_extruder_id
 
-        extruder_stack = ExtruderStack.ExtruderStack(unique_name, parent = machine)
+        extruder_stack = ExtruderStack.ExtruderStack(unique_name)
         extruder_stack.setName(extruder_definition.getName())
         extruder_stack.setDefinition(extruder_definition)
         extruder_stack.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position"))

cura/Settings/MachineManager.py

@@ -654,6 +654,15 @@ class MachineManager(QObject):
 
         return ""
 
+    @pyqtProperty(str, notify = activeVariantChanged)
+    def activeVariantId(self) -> str:
+        if self._active_container_stack:
+            variant = self._active_container_stack.variant
+            if variant:
+                return variant.getId()
+
+        return ""
+
     @pyqtProperty(str, notify = activeVariantChanged)
     def activeVariantBuildplateName(self) -> str:
         if self._global_container_stack: