Merge branch 'master' into STAR-322_cloud-connection

resources/qml/Dialogs/WorkspaceSummaryDialog.qml

@@ -11,6 +11,7 @@ import Cura 1.0 as Cura
 
 UM.Dialog
 {
+    id: base
     title: catalog.i18nc("@title:window", "Save Project")
 
     minimumWidth: 500 * screenScaleFactor
@@ -49,7 +50,7 @@ UM.Dialog
         UM.SettingDefinitionsModel
         {
             id: definitionsModel
-            containerId: Cura.MachineManager.activeDefinitionId
+            containerId: base.visible ? Cura.MachineManager.activeDefinitionId: ""
             showAll: true
             exclude: ["command_line_settings"]
             showAncestors: true

resources/qml/Menus/SettingsMenu.qml

@@ -16,10 +16,11 @@ Menu
 
     Instantiator
     {
-        model: Cura.ExtrudersModel { simpleNames: true }
+        model: Cura.MachineManager.activeMachine.extruderList
+
         Menu
         {
-            title: model.name
+            title: modelData.name
 
             NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index }
             MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index }

resources/qml/ViewsSelector.qml

@@ -43,7 +43,7 @@ Cura.ExpandablePopup
         Label
         {
             id: title
-            text: catalog.i18nc("@button", "View types")
+            text: catalog.i18nc("@label", "View types")
             verticalAlignment: Text.AlignVCenter
             height: parent.height
             elide: Text.ElideRight