From c268fcd8c6f510c72b5292692c7db70642601061 Mon Sep 17 00:00:00 2001
From: Tim Kuipers <t.kuipers@ultimaker.com>
Date: Mon, 5 Sep 2016 14:38:24 +0200
Subject: [PATCH 1/3] fix: wire printing height depends on nozzle head dist
 (CURA-1555)

---
 resources/definitions/fdmprinter.def.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index ce406dc923..8b2805b3aa 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -3759,6 +3759,7 @@
                     "type": "float",
                     "unit": "mm",
                     "default_value": 3,
+                    "value": "machine_nozzle_head_distance",
                     "minimum_value": "0.0001",
                     "maximum_value_warning": "20",
                     "enabled": "wireframe_enabled",

From df519ed00a838e89ca22be4e0adc22d866d17f8e Mon Sep 17 00:00:00 2001
From: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Date: Sat, 3 Sep 2016 13:16:15 +0200
Subject: [PATCH 2/3] CURA-2157: Adding an confirmation dialog

Tested while starting two prints and aborting them. The buttons for
"Yes" and "No" are translated by Qt5.
---
 resources/qml/MonitorButton.qml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index 79168ed6df..2a8e2f4097 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -4,6 +4,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
+import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
 
 import UM 1.1 as UM
@@ -160,7 +161,7 @@ Rectangle
         anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
         text: catalog.i18nc("@label:", "Abort Print")
-        onClicked: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
+        onClicked: confirmationDialog.visible = true
 
         style: ButtonStyle
         {
@@ -216,6 +217,18 @@ Rectangle
         }
     }
 
+    MessageDialog
+    {
+        id: confirmationDialog
+
+        title: catalog.i18nc("@text:MessageDialog", "Abort print")
+        icon: StandardIcon.Warning
+        text: catalog.i18nc("@text:MessageDialog", "Do you really want to abort the print?")
+        standardButtons: StandardButton.Yes | StandardButton.No
+        Component.onCompleted: visible = false
+        onYes: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
+    }
+
     Button
     {
         id: pauseResumeButton

From 938a2fc691f80f2684df0f81eadd49ab6f88e008 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 5 Sep 2016 15:38:56 +0200
Subject: [PATCH 3/3] Update wording

CURA-2157
---
 resources/qml/MonitorButton.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index 2a8e2f4097..b1dc76872d 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -221,9 +221,9 @@ Rectangle
     {
         id: confirmationDialog
 
-        title: catalog.i18nc("@text:MessageDialog", "Abort print")
+        title: catalog.i18nc("@window:title", "Abort print")
         icon: StandardIcon.Warning
-        text: catalog.i18nc("@text:MessageDialog", "Do you really want to abort the print?")
+        text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
         standardButtons: StandardButton.Yes | StandardButton.No
         Component.onCompleted: visible = false
         onYes: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")