diff --git a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml b/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml index faa2d259be..4b9ef1a779 100644 --- a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml +++ b/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml @@ -127,7 +127,7 @@ Item } text: catalog.i18nc("@button", "Next") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: { diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 09e52c17dd..36c2431e7c 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -85,7 +85,7 @@ Item anchors.bottom: parent.bottom anchors.margins: 40 text: catalog.i18nc("@button", "Finish") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: base.showNextPage() } @@ -97,7 +97,7 @@ Item anchors.verticalCenter: finishButton.verticalCenter anchors.margins: 40 text: catalog.i18nc("@button", "Create an account") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") } @@ -108,7 +108,7 @@ Item anchors.left: createAccountButton.right anchors.verticalCenter: finishButton.verticalCenter text: catalog.i18nc("@button", "Sign in") - width: 80 + width: UM.Theme.getSize("welcome_pages_button").width shadowEnabled: false color: "transparent" hoverColor: "transparent" diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index 93426d2c2c..c22434b9f1 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -62,7 +62,7 @@ Item anchors.bottom: parent.bottom anchors.margins: 40 text: catalog.i18nc("@button", "Next") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: base.showNextPage() } diff --git a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml index 1bc4b7c284..d02f3cfcb0 100644 --- a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml +++ b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml @@ -72,7 +72,7 @@ Item anchors.bottom: parent.bottom anchors.margins: 40 text: catalog.i18nc("@button", "Next") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: { diff --git a/resources/qml/WelcomePages/UserAgreementContent.qml b/resources/qml/WelcomePages/UserAgreementContent.qml index 82b16ba2ee..493f42e6f2 100644 --- a/resources/qml/WelcomePages/UserAgreementContent.qml +++ b/resources/qml/WelcomePages/UserAgreementContent.qml @@ -60,7 +60,7 @@ Item anchors.bottom: parent.bottom anchors.margins: 40 text: catalog.i18nc("@button", "Agree") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: { @@ -77,7 +77,7 @@ Item anchors.bottom: parent.bottom anchors.margins: 40 text: catalog.i18nc("@button", "Decline and close") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: { diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index fe47567da6..272c7bda47 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -59,7 +59,7 @@ Column id: getStartedButton anchors.horizontalCenter: parent.horizontalCenter text: catalog.i18nc("@button", "Get started") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: base.showNextPage() } diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index b083c99e32..351f2f07b7 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -78,7 +78,7 @@ Item anchors.bottom: parent.bottom anchors.margins: 40 text: catalog.i18nc("@button", "Next") - width: 140 + width: UM.Theme.getSize("welcome_pages_button").width fixedWidthMode: true onClicked: base.showNextPage() } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 83edda6486..61797350e5 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -509,6 +509,8 @@ "button_icon": [2.5, 2.5], "button_lining": [0, 0], + "welcome_pages_button": [12.0, 2.5], + "action_button": [15.0, 2.5], "action_button_icon": [1.0, 1.0], "action_button_radius": [0.15, 0.15],