From 56fa7036b3545ebdfad420fa28e8efc3b35bfcfa Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 23 Oct 2017 20:55:08 +0200
Subject: [PATCH] Add controls for jogging the head/bed

---
 resources/qml/PrintMonitor.qml             | 277 +++++++++++++++++++++
 resources/themes/cura-light/icons/home.svg |  56 +++++
 2 files changed, 333 insertions(+)
 create mode 100644 resources/themes/cura-light/icons/home.svg

diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml
index a2626e53de..e8ab76a264 100644
--- a/resources/qml/PrintMonitor.qml
+++ b/resources/qml/PrintMonitor.qml
@@ -677,6 +677,192 @@ Column
         watchedProperties: ["value"]
     }
 
+    Loader
+    {
+        sourceComponent: monitorSection
+        property string label: catalog.i18nc("@label", "Printer control")
+    }
+
+    Row
+    {
+        width: base.width - 2 * UM.Theme.getSize("default_margin").width
+        height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").width
+        anchors.left: parent.left
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+
+        spacing: UM.Theme.getSize("default_margin").width
+
+        Label
+        {
+            text: catalog.i18nc("@label", "Position")
+            color: UM.Theme.getColor("setting_control_text")
+            font: UM.Theme.getFont("default")
+
+            width: Math.floor(parent.width * 0.4) - UM.Theme.getSize("default_margin").width
+        }
+
+        GridLayout
+        {
+            columns: 3
+            rows: 4
+            rowSpacing: UM.Theme.getSize("default_lining").width
+            columnSpacing: UM.Theme.getSize("default_lining").height
+
+            Label
+            {
+                text: catalog.i18nc("@label", "X/Y")
+                color: UM.Theme.getColor("setting_control_text")
+                font: UM.Theme.getFont("default")
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+
+                Layout.row: 1
+                Layout.column: 2
+                Layout.preferredWidth: UM.Theme.getSize("section").height
+            }
+
+            Button
+            {
+                Layout.row: 2
+                Layout.column: 2
+                Layout.preferredWidth: width
+                Layout.preferredHeight: height
+                iconSource: UM.Theme.getIcon("arrow_top");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.moveHead(0, 10, 0)
+                }
+            }
+
+            Button
+            {
+                Layout.row: 3
+                Layout.column: 1
+                Layout.preferredWidth: width
+                Layout.preferredHeight: height
+                iconSource: UM.Theme.getIcon("arrow_left");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.moveHead(-10, 0, 0)
+                }
+            }
+
+            Button
+            {
+                Layout.row: 3
+                Layout.column: 3
+                Layout.preferredWidth: width
+                Layout.preferredHeight: height
+                iconSource: UM.Theme.getIcon("arrow_right");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.moveHead(10, 0, 0)
+                }
+            }
+
+            Button
+            {
+                Layout.row: 4
+                Layout.column: 2
+                Layout.preferredWidth: width
+                Layout.preferredHeight: height
+                iconSource: UM.Theme.getIcon("arrow_bottom");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.moveHead(0, -10, 0)
+                }
+            }
+
+            Button
+            {
+                Layout.row: 3
+                Layout.column: 2
+                Layout.preferredWidth: width
+                Layout.preferredHeight: height
+                iconSource: UM.Theme.getIcon("home");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.homeHead()
+                }
+            }
+        }
+
+
+        Column
+        {
+            spacing: UM.Theme.getSize("default_lining").height
+
+            Label
+            {
+                text: catalog.i18nc("@label", "Z")
+                color: UM.Theme.getColor("setting_control_text")
+                font: UM.Theme.getFont("default")
+                width: UM.Theme.getSize("section").height
+
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            Button
+            {
+                iconSource: UM.Theme.getIcon("arrow_top");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.moveHead(0, 0, 10)
+                }
+            }
+
+            Button
+            {
+                iconSource: UM.Theme.getIcon("home");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.homeBed()
+                }
+            }
+
+            Button
+            {
+                iconSource: UM.Theme.getIcon("arrow_bottom");
+                style: monitorButtonStyle
+                width: height
+                height: UM.Theme.getSize("setting_control").height
+
+                onClicked:
+                {
+                    connectedPrinter.moveHead(0, 0, -10)
+                }
+            }
+        }
+    }
+
     Loader
     {
         sourceComponent: monitorSection
@@ -754,4 +940,95 @@ Column
             }
         }
     }
+
+    Component
+    {
+        id: monitorButtonStyle
+
+        ButtonStyle
+        {
+            background: Rectangle
+            {
+                border.width: UM.Theme.getSize("default_lining").width
+                border.color:
+                {
+                    if(!control.enabled)
+                    {
+                        return UM.Theme.getColor("action_button_disabled_border");
+                    }
+                    else if(control.pressed)
+                    {
+                        return UM.Theme.getColor("action_button_active_border");
+                    }
+                    else if(control.hovered)
+                    {
+                        return UM.Theme.getColor("action_button_hovered_border");
+                    }
+                    else
+                    {
+                        return UM.Theme.getColor("action_button_border");
+                    }
+                }
+                color:
+                {
+                    if(!control.enabled)
+                    {
+                        return UM.Theme.getColor("action_button_disabled");
+                    }
+                    else if(control.pressed)
+                    {
+                        return UM.Theme.getColor("action_button_active");
+                    }
+                    else if(control.hovered)
+                    {
+                        return UM.Theme.getColor("action_button_hovered");
+                    }
+                    else
+                    {
+                        return UM.Theme.getColor("action_button");
+                    }
+                }
+                Behavior on color
+                {
+                    ColorAnimation
+                    {
+                        duration: 50
+                    }
+                }
+            }
+
+            label: Item
+            {
+                UM.RecolorImage
+                {
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    width: Math.floor(control.width / 2)
+                    height: Math.floor(control.height / 2)
+                    sourceSize.width: width
+                    sourceSize.height: width
+                    color:
+                    {
+                        if(!control.enabled)
+                        {
+                            return UM.Theme.getColor("action_button_disabled_text");
+                        }
+                        else if(control.pressed)
+                        {
+                            return UM.Theme.getColor("action_button_active_text");
+                        }
+                        else if(control.hovered)
+                        {
+                            return UM.Theme.getColor("action_button_hovered_text");
+                        }
+                        else
+                        {
+                            return UM.Theme.getColor("action_button_text");
+                        }
+                    }
+                    source: control.iconSource
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/home.svg b/resources/themes/cura-light/icons/home.svg
new file mode 100644
index 0000000000..617c3ce9da
--- /dev/null
+++ b/resources/themes/cura-light/icons/home.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="10"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="home.svg"
+   inkscape:version="0.92.0 r15299">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1104"
+     inkscape:window-height="1008"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="84.1"
+     inkscape:cx="5"
+     inkscape:cy="5"
+     inkscape:window-x="712"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 8.5727081,5.62578 v 2.97725 q 0,0.16127 -0.1178498,0.27912 Q 8.3370085,9 8.1757405,9 H 5.7939349 V 6.61819 H 4.2060646 V 9 H 1.824259 Q 1.6629909,9 1.5451412,8.88215 1.4272914,8.7643 1.4272914,8.60303 V 5.62578 q 0,-0.006 0.0031,-0.0186 0.0031,-0.0124 0.0031,-0.0186 L 4.9999998,2.64852 8.5665054,5.58856 q 0.0062,0.0124 0.0062,0.0372 z M 9.955892,5.19779 9.5713297,5.65679 q -0.049621,0.0558 -0.130255,0.0682 h -0.018608 q -0.080634,0 -0.130255,-0.0434 L 4.9999998,2.10269 0.70778771,5.6816 Q 0.63335631,5.7312 0.55892486,5.725 0.47829087,5.7126 0.42866987,5.6568 L 0.04410752,5.1978 Q -0.00551343,5.1358 6.8917799e-4,5.05204 0.00689178,4.96834 0.06891799,4.91869 L 4.5286008,1.20331 q 0.1984838,-0.16127 0.471399,-0.16127 0.2729153,0 0.471399,0.16127 L 6.9848377,2.46864 V 1.25913 q 0,-0.0868 0.055824,-0.14266 0.055824,-0.0558 0.1426602,-0.0558 h 1.1909028 q 0.086837,0 0.1426602,0.0558 0.055824,0.0558 0.055824,0.14266 V 3.7898 l 1.3583734,1.12888 q 0.062026,0.0496 0.068229,0.13335 0.0062,0.0837 -0.043418,0.14576 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.00620262" />
+</svg>