Browse Source

Replace buttons by PrimaryButtons for cloud sync dialogs

CURA-6984
Nino van Hooff 5 years ago
parent
commit
9dd50c8804

+ 3 - 1
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
         }
     }
 }

+ 13 - 8
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() }
         }
     ]

+ 1 - 0
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],