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

resources/qml/Preferences/MaterialsPage.qml

@@ -1,5 +1,5 @@
-// Copyright (c) 2016 Ultimaker B.V.
-// Cura is released under the terms of the AGPLv3 or higher.
+//Copyright (c) 2017 Ultimaker B.V.
+//Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.1
 import QtQuick.Controls 1.1
@@ -139,6 +139,7 @@ UM.ManagementPage
             enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId && Cura.MachineManager.hasMaterials
             onClicked:
             {
+                forceActiveFocus();
                 Cura.MachineManager.setActiveMaterial(base.currentItem.id)
                 currentItem = base.model.getItem(base.objectList.currentIndex) // Refresh the current item.
             }
@@ -149,6 +150,7 @@ UM.ManagementPage
             iconName: "list-add"
             onClicked:
             {
+                forceActiveFocus();
                 var material_id = Cura.ContainerManager.createMaterial()
                 if(material_id == "")
                 {
@@ -168,6 +170,7 @@ UM.ManagementPage
             enabled: base.currentItem != null
             onClicked:
             {
+                forceActiveFocus();
                 var base_file = Cura.ContainerManager.getContainerMetaDataEntry(base.currentItem.id, "base_file")
                 // We need to copy the base container instead of the specific variant.
                 var material_id = base_file == "" ? Cura.ContainerManager.duplicateMaterial(base.currentItem.id): Cura.ContainerManager.duplicateMaterial(base_file)
@@ -187,20 +190,32 @@ UM.ManagementPage
             text: catalog.i18nc("@action:button", "Remove");
             iconName: "list-remove";
             enabled: base.currentItem != null && !base.currentItem.readOnly && !Cura.ContainerManager.isContainerUsed(base.currentItem.id)
-            onClicked: confirmDialog.open()
+            onClicked:
+            {
+                forceActiveFocus();
+                confirmDialog.open();
+            }
         },
         Button
         {
             text: catalog.i18nc("@action:button", "Import");
             iconName: "document-import";
-            onClicked: importDialog.open();
+            onClicked:
+            {
+                forceActiveFocus();
+                importDialog.open();
+            }
             visible: true;
         },
         Button
         {
             text: catalog.i18nc("@action:button", "Export")
             iconName: "document-export"
-            onClicked: exportDialog.open()
+            onClicked:
+            {
+                forceActiveFocus();
+                exportDialog.open();
+            }
             enabled: currentItem != null
         }
     ]

resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg

@@ -31,7 +31,7 @@ infill_sparse_density = 10
 cool_fan_speed = 60
 speed_travel = 150
 speed_support = 40
-support_z_distance = 0.45
+support_z_distance = =layer_height * 2
 cool_fan_speed_min = =cool_fan_speed * 35 / 60
 brim_line_count = 8
 retraction_hop_enabled = 0.2

resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg

@@ -13,7 +13,7 @@ setting_version = 1
 [values]
 support_xy_distance = 0.65
 speed_travel = 150
-support_z_distance = 0.45
+support_z_distance = =layer_height * 2
 speed_wall_x = 35
 cool_min_speed = 15
 cool_fan_speed = 60
@@ -37,4 +37,3 @@ speed_print = 40
 support_angle = 45
 cool_min_layer_time = 10
 raft_base_line_width = 0.8
-

resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg

@@ -33,7 +33,7 @@ support_angle = 45
 infill_sparse_density = 10
 cool_fan_speed = 60
 speed_support = 40
-support_z_distance = 0.45
+support_z_distance = =layer_height * 2
 cool_fan_speed_min = =cool_fan_speed * 35 / 60
 brim_line_count = 8
 retraction_hop_enabled = 0.2