From 9dd50c88046128bd77dcd4cd7a02b7180a4fd580 Mon Sep 17 00:00:00 2001
From: Nino van Hooff <ninovanhooff@gmail.com>
Date: Fri, 17 Jan 2020 11:44:57 +0100
Subject: [PATCH] Replace buttons by PrimaryButtons for cloud sync dialogs

CURA-6984
---
 .../qml/dialogs/CompatibilityDialog.qml       |  4 +++-
 .../qml/dialogs/ToolboxLicenseDialog.qml      | 21 ++++++++++++-------
 resources/themes/cura-light/theme.json        |  1 +
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml b/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml
index 06c1102811..32b4da4823 100644
--- a/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml
+++ b/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml
@@ -152,7 +152,7 @@ UM.Dialog{
 
         } // End of ScrollView
 
-        Cura.ActionButton
+        Cura.PrimaryButton
         {
             id: nextButton
             anchors.bottom: parent.bottom
@@ -160,6 +160,8 @@ UM.Dialog{
             anchors.margins: UM.Theme.getSize("default_margin").height
             text: catalog.i18nc("@button", "Next")
             onClicked: accept()
+            leftPadding: UM.Theme.getSize("dialog_primary_button_padding").width
+            rightPadding: UM.Theme.getSize("dialog_primary_button_padding").width
         }
     }
 }
diff --git a/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml b/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
index 2c88ac6d5f..3e7cdc9df8 100644
--- a/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
+++ b/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
@@ -10,6 +10,7 @@ import QtQuick.Controls.Styles 1.4
 // TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
 
 import UM 1.1 as UM
+import Cura 1.6 as Cura
 
 UM.Dialog
 {
@@ -51,18 +52,22 @@ UM.Dialog
     }
     rightButtons:
     [
-        Button
+        Cura.PrimaryButton
         {
-            id: acceptButton
-            anchors.margins: UM.Theme.getSize("default_margin").width
-            text: catalog.i18nc("@action:button", "Accept")
+            leftPadding: UM.Theme.getSize("dialog_primary_button_padding").width
+            rightPadding: UM.Theme.getSize("dialog_primary_button_padding").width
+
+            text: catalog.i18nc("@button", "Agree")
             onClicked: { handler.onLicenseAccepted() }
-        },
-        Button
+        }
+    ]
+
+    leftButtons:
+    [
+        Cura.SecondaryButton
         {
             id: declineButton
-            anchors.margins: UM.Theme.getSize("default_margin").width
-            text: catalog.i18nc("@action:button", "Decline")
+            text: catalog.i18nc("@button", "Decline and remove from account")
             onClicked: { handler.onLicenseDeclined() }
         }
     ]
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index e5009d8633..de4c9ccb42 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -520,6 +520,7 @@
         "action_button": [15.0, 2.5],
         "action_button_icon": [1.0, 1.0],
         "action_button_radius": [0.15, 0.15],
+        "dialog_primary_button_padding": [3.0, 0],
 
         "radio_button": [1.3, 1.3],