Merge branch '5.0' of github.com:Ultimaker/Cura

17 files changed, 37 insertions, 25 deletions

diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 187da07cb6..21cdda0627 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -155,6 +155,7 @@ Button
         height: parent.height
 
         visible: false
+        running: visible
 
         RotationAnimator
         {
diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml
index cbae92efba..65f3409c8a 100644
--- a/resources/qml/Menus/ContextMenu.qml
+++ b/resources/qml/Menus/ContextMenu.qml
@@ -46,7 +46,7 @@ Cura.Menu
         }
         // Add it to the fifth position (and above) as we want it to be added after the extruder header.
         onObjectAdded: function(index, object) { base.insertItem(index + 5, object) }
-        onObjectRemoved: function(object) {  base.removeItem(object) }
+        onObjectRemoved: function(index, object) {  base.removeItem(object) }
     }
 
     // Global actions
@@ -134,6 +134,7 @@ Cura.Menu
                 from: 1
                 to: 99
                 width: 2 * UM.Theme.getSize("button").width
+                value: 1
             }
         }
     }
diff --git a/resources/qml/Menus/ExtensionMenu.qml b/resources/qml/Menus/ExtensionMenu.qml
index 4ba36bbb40..919e094e5e 100644
--- a/resources/qml/Menus/ExtensionMenu.qml
+++ b/resources/qml/Menus/ExtensionMenu.qml
@@ -54,11 +54,11 @@ Cura.Menu
                 }
 
                 onObjectAdded: function(index, object) { sub_menu.insertItem(index, object.item)}
-                onObjectRemoved: function(object) { sub_menu.removeItem(object.item)}
+                onObjectRemoved: function(index, object) { sub_menu.removeItem(object.item)}
             }
         }
 
         onObjectAdded: function(index, object) { extensionMenu.insertMenu(index, object) }
-        onObjectRemoved: function(object) { extensionMenu.removeMenu(object)}
+        onObjectRemoved: function(index, object) { extensionMenu.removeMenu(object)}
     }
 }
\ No newline at end of file
diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml
index 338ada60fc..0884053ef3 100644
--- a/resources/qml/Menus/FileMenu.qml
+++ b/resources/qml/Menus/FileMenu.qml
@@ -33,6 +33,7 @@ Cura.Menu
         id: openFilesMenu
 
         shouldBeVisible: base.fileProviderModel.count > 1
+        enabled: shouldBeVisible
     }
 
     RecentFilesMenu { }
diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index c4ae4113f9..cee28cee6a 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -67,7 +67,7 @@ Cura.Menu
             onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
         }
         onObjectAdded: function(index, object) { materialMenu.insertItem(index + 1, object) }
-        onObjectRemoved: function(object) { materialMenu.removeItem(index) }
+        onObjectRemoved: function(index, object) { materialMenu.removeItem(index) }
     }
 
     Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0}
@@ -89,7 +89,7 @@ Cura.Menu
                 onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
             }
             onObjectAdded: function(index, object) { genericMenu.insertItem(index, object)}
-            onObjectRemoved: function(object) {genericMenu.removeItem(index) }
+            onObjectRemoved: function(index, object) {genericMenu.removeItem(index) }
         }
     }
 
@@ -103,7 +103,7 @@ Cura.Menu
             materialTypesModel: model
         }
         onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)}
-        onObjectRemoved: function(object) { materialMenu.removeItem(index) }
+        onObjectRemoved: function(index, object) { materialMenu.removeItem(index) }
     }
 
     Cura.MenuSeparator {}
diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml
index 896866e82f..f286410a11 100644
--- a/resources/qml/Menus/NozzleMenu.qml
+++ b/resources/qml/Menus/NozzleMenu.qml
@@ -50,7 +50,7 @@ Cura.Menu
         }
 
         onObjectAdded: function(index, object) { nozzleMenu.insertItem(index, object) }
-        onObjectRemoved: function(object) {nozzleMenu.removeItem(object)}
+        onObjectRemoved: function(index, object) {nozzleMenu.removeItem(object)}
     }
 
 }
diff --git a/resources/qml/Menus/OpenFilesMenu.qml b/resources/qml/Menus/OpenFilesMenu.qml
index 1cc98d2285..ca838b5cb3 100644
--- a/resources/qml/Menus/OpenFilesMenu.qml
+++ b/resources/qml/Menus/OpenFilesMenu.qml
@@ -36,6 +36,6 @@ Cura.Menu
         }
         onObjectAdded: function(index, object) { openFilesMenu.insertItem(index, object)}
 
-        onObjectRemoved: function(object) { openFilesMenu.removeItem(object) }
+        onObjectRemoved: function(index, object) { openFilesMenu.removeItem(object) }
     }
 }
diff --git a/resources/qml/Menus/PrinterMenu.qml b/resources/qml/Menus/PrinterMenu.qml
index 6a9a36b17d..7cea1de52e 100644
--- a/resources/qml/Menus/PrinterMenu.qml
+++ b/resources/qml/Menus/PrinterMenu.qml
@@ -39,7 +39,7 @@ Cura.Menu
             onTriggered: Cura.MachineManager.setActiveMachine(model.id)
         }
         onObjectAdded: function(index, object) { menu.insertItem(2, object)}
-        onObjectRemoved: function(object) {  menu.removeItem(object)}
+        onObjectRemoved: function(index, object) {  menu.removeItem(object)}
     }
 
     Cura.MenuSeparator { visible: networKPrinterInstantiator.count > 0 }
@@ -67,7 +67,7 @@ Cura.Menu
         }
         // A bit hackish, but we have 2 items at the end, put them before that
         onObjectAdded: function(index, object) { menu.insertItem(menu.count - 2, object) }
-        onObjectRemoved: function(object) {  menu.removeItem(object) }
+        onObjectRemoved: function(index, object) {  menu.removeItem(object) }
     }
 
     Cura.MenuSeparator { visible: localPrinterInstantiator.count > 0 }
diff --git a/resources/qml/Menus/PrinterTypeMenu.qml b/resources/qml/Menus/PrinterTypeMenu.qml
index 1447113208..8691bf7ecc 100644
--- a/resources/qml/Menus/PrinterTypeMenu.qml
+++ b/resources/qml/Menus/PrinterTypeMenu.qml
@@ -29,6 +29,6 @@ Cura.Menu
             }
         }
         onObjectAdded: function(index, object) { return menu.insertItem(index, object); }
-        onObjectRemoved: function(object) { return menu.removeItem(object); }
+        onObjectRemoved: function(index, object) { return menu.removeItem(object); }
     }
 }
diff --git a/resources/qml/Menus/SaveProjectMenu.qml b/resources/qml/Menus/SaveProjectMenu.qml
index ac40f4b598..2140d5e0ef 100644
--- a/resources/qml/Menus/SaveProjectMenu.qml
+++ b/resources/qml/Menus/SaveProjectMenu.qml
@@ -44,7 +44,7 @@ Cura.Menu
             enabled: saveProjectMenu.shouldBeVisible
         }
         onObjectAdded: function(index, object) {  saveProjectMenu.insertItem(index, object)}
-        onObjectRemoved: function(object) {  saveProjectMenu.removeItem(object)}
+        onObjectRemoved: function(index, object) {  saveProjectMenu.removeItem(object)}
     }
 
     WorkspaceSummaryDialog
diff --git a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
index 8518f4e93c..57298030c4 100644
--- a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
+++ b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
@@ -33,7 +33,7 @@ Cura.Menu
         }
 
         onObjectAdded: function(index, object) { menu.insertItem(index, object) }
-        onObjectRemoved: function(object) { menu.removeItem(object)}
+        onObjectRemoved: function(index, object) { menu.removeItem(object)}
     }
 
     Cura.MenuSeparator {}
diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml
index c93ee0bb09..ea5de6c66f 100644
--- a/resources/qml/Menus/SettingsMenu.qml
+++ b/resources/qml/Menus/SettingsMenu.qml
@@ -68,7 +68,7 @@ Cura.Menu
             }
         }
         onObjectAdded: function(index, object) {  base.insertMenu(index, object) }
-        onObjectRemoved:function(object) {  base.removeMenu(object)}
+        onObjectRemoved: function(index, object) {  base.removeMenu(object);}
     }
 
     Cura.MenuSeparator { }
diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index 1e783c9b4d..22f8091314 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -246,7 +246,7 @@ UM.ManagementPage
                         break;
                 }
                 messageDialog.open();
-                CuraApplication.setDefaultPath("dialog_material_path", folder);
+                CuraApplication.setDefaultPath("dialog_material_path", currentFolder);
             }
         }
 
@@ -259,7 +259,9 @@ UM.ManagementPage
             currentFolder: CuraApplication.getDefaultPath("dialog_material_path")
             onAccepted:
             {
-                const result = Cura.ContainerManager.exportContainer(base.currentItem.root_material_id, selectedNameFilter, selectedFile);
+                const nameFilterString = selectedNameFilter.index >= 0 ? nameFilters[selectedNameFilter.index] : nameFilters[0];
+
+                const result = Cura.ContainerManager.exportContainer(base.currentItem.root_material_id, nameFilterString, selectedFile);
 
                 const messageDialog = Qt.createQmlObject("import Cura 1.5 as Cura; Cura.MessageDialog { onClosed: destroy() }", base);
                 messageDialog.title = catalog.i18nc("@title:window", "Export Material");
@@ -275,7 +277,7 @@ UM.ManagementPage
                 }
                 messageDialog.open();
 
-                CuraApplication.setDefaultPath("dialog_material_path", folder);
+                CuraApplication.setDefaultPath("dialog_material_path", currentFolder);
             }
         }
     }
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index b033f755cf..a172949812 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -574,11 +574,11 @@ Item
                     elide: Text.ElideRight
                     verticalAlignment: Qt.AlignVCenter
                 }
-                Cura.SpinBox
+                Cura.NumericTextFieldWithUnit
                 {
                     id: spinBox
                     anchors.left: label.right
-                    value:
+                    valueText:
                     {
                         // In case the setting is not in the material...
                         if (!isNaN(parseFloat(materialPropertyProvider.properties.value)))
@@ -598,11 +598,11 @@ Item
                         return 0;
                     }
                     width: settingsPage.columnWidth
-                    suffix: " " + model.unit
-                    to: 99999
+                    maximum: 99999
+                    unitText: model.unit
                     decimals: model.unit == "mm" ? 2 : 0
 
-                    onEditingFinished: materialPropertyProvider.setPropertyValue("value", value)
+                    editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value)
                 }
 
                 UM.ContainerPropertyProvider
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 9957747c42..2a7c50fe59 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -354,8 +354,13 @@ UM.ManagementPage
             currentFolder: CuraApplication.getDefaultPath("dialog_profile_path")
             onAccepted:
             {
+
+                // If nameFilters contains only 1 item, the index of selectedNameFilter will always be -1
+                // This fetches the nameFilter at index selectedNameFilter.index if it is positive
+                const nameFilterString = selectedNameFilter.index >= 0 ? nameFilters[selectedNameFilter.index] : nameFilters[0];
+
                 var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group,
-                                                                             selectedFile, selectedNameFilter);
+                                                                             selectedFile, nameFilterString);
 
                 if (result && result.status == "error")
                 {
@@ -365,7 +370,7 @@ UM.ManagementPage
                 }
 
                 // else pop-up Message thing from python code
-                CuraApplication.setDefaultPath("dialog_profile_path", folder);
+                CuraApplication.setDefaultPath("dialog_profile_path", currentFolder);
             }
         }
 
diff --git a/resources/qml/PrintSetupTooltip.qml b/resources/qml/PrintSetupTooltip.qml
index 20b9ac8981..e4d322f9d4 100644
--- a/resources/qml/PrintSetupTooltip.qml
+++ b/resources/qml/PrintSetupTooltip.qml
@@ -17,6 +17,8 @@ UM.PointingRectangle
     arrowSize: UM.Theme.getSize("default_arrow").width
 
     opacity: 0
+    // This should be disabled when invisible, otherwise it will catch mouse events.
+    enabled: opacity > 0
 
     Behavior on opacity
     {
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index 3072161c59..697acdec0b 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -154,7 +154,7 @@ SettingItem
             background: Rectangle
             {
                 id: swatch
-                height: Math.round(parent.height / 2)
+                height: UM.Theme.getSize("standard_arrow").width
                 width: height
                 radius: Math.round(width / 2)
                 anchors.right: parent.right