From 4b79770d58e4f3f608a1aa6b079f07b522262564 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Thu, 6 Dec 2018 13:42:29 +0100
Subject: [PATCH] Align the buttons in the output process widget

The menu in the output device selector has now a rounded corner.
---
 resources/qml/ActionButton.qml                  |  5 ++++-
 .../ActionPanel/OutputDevicesActionButton.qml   |  2 ++
 .../qml/ActionPanel/OutputProcessWidget.qml     | 17 ++++++++++++++---
 resources/themes/cura-light/styles.qml          |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 54d77f7d59..fc4a1c05f4 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.1
 import QtGraphicalEffects 1.0 // For the dropshadow
 
 import UM 1.1 as UM
+import Cura 1.0 as Cura
 
 Button
 {
@@ -16,6 +17,7 @@ Button
     property alias textFont: buttonText.font
     property alias cornerRadius: backgroundRect.radius
     property alias tooltip: tooltip.text
+    property alias cornerSide: backgroundRect.cornerSide
 
     property color color: UM.Theme.getColor("primary")
     property color hoverColor: UM.Theme.getColor("primary_hover")
@@ -82,9 +84,10 @@ Button
         }
     }
 
-    background: Rectangle
+    background: Cura.RoundedRectangle
     {
         id: backgroundRect
+        cornerSide: Cura.RoundedRectangle.Direction.All
         color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor
         radius: UM.Theme.getSize("action_button_radius").width
         border.width: UM.Theme.getSize("default_lining").width
diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
index 12e4ac42fd..95750e6d11 100644
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@@ -17,6 +17,7 @@ Item
         id: saveToButton
         height: parent.height
         fixedWidthMode: true
+        cornerSide: deviceSelectionMenu.visible ? Cura.RoundedRectangle.Direction.Left : Cura.RoundedRectangle.Direction.All
 
         anchors
         {
@@ -44,6 +45,7 @@ Item
 
         shadowEnabled: true
         shadowColor: UM.Theme.getColor("primary_shadow")
+        cornerSide: Cura.RoundedRectangle.Direction.Right
 
         anchors
         {
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index d1790b3791..1d1a1e44e1 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -101,16 +101,24 @@ Column
         }
     }
 
-    Row
+    Item
     {
         id: buttonRow
-        spacing: UM.Theme.getSize("default_margin").width
-        width: parent.width
+        anchors.right: parent.right
+        anchors.left: parent.left
+        height: UM.Theme.getSize("action_button").height
 
         Cura.SecondaryButton
         {
             id: previewStageShortcut
 
+            anchors
+            {
+                left: parent.left
+                right: outputDevicesButton.left
+                rightMargin: UM.Theme.getSize("default_margin").width
+            }
+
             height: UM.Theme.getSize("action_button").height
             leftPadding: UM.Theme.getSize("default_margin").width
             rightPadding: UM.Theme.getSize("default_margin").width
@@ -125,6 +133,9 @@ Column
 
         Cura.OutputDevicesActionButton
         {
+            id: outputDevicesButton
+
+            anchors.right: parent.right
             width: previewStageShortcut.visible ? UM.Theme.getSize("action_button").width : parent.width
             height: UM.Theme.getSize("action_button").height
         }
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index aaa8ec18f1..30cf42859a 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -145,7 +145,7 @@ QtObject
                     text: control.text
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.horizontalCenter: parent.horizontalCenter
-                    font: UM.Theme.getFont("medium_bold")
+                    font: UM.Theme.getFont("medium")
                     color:
                     {
                         if (control.checked)