GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Theme welcome_pages_button

Browse Source
This commit is contained in:
Lipu Fei 2019-03-21 16:01:50 +01:00
parent 570b6b9804
commit c3175e5322
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
View File

@ -127,7 +127,7 @@ Item
} }
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: onClicked:
{ {

6
resources/qml/WelcomePages/CloudContent.qml
View File

@ -85,7 +85,7 @@ Item
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Finish") text: catalog.i18nc("@button", "Finish")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }
@ -97,7 +97,7 @@ Item
anchors.verticalCenter: finishButton.verticalCenter anchors.verticalCenter: finishButton.verticalCenter
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Create an account") text: catalog.i18nc("@button", "Create an account")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
} }
@ -108,7 +108,7 @@ Item
anchors.left: createAccountButton.right anchors.left: createAccountButton.right
anchors.verticalCenter: finishButton.verticalCenter anchors.verticalCenter: finishButton.verticalCenter
text: catalog.i18nc("@button", "Sign in") text: catalog.i18nc("@button", "Sign in")
width: 80 width: UM.Theme.getSize("welcome_pages_button").width
shadowEnabled: false shadowEnabled: false
color: "transparent" color: "transparent"
hoverColor: "transparent" hoverColor: "transparent"

2
resources/qml/WelcomePages/DataCollectionsContent.qml
View File

@ -62,7 +62,7 @@ Item
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }

2
resources/qml/WelcomePages/FirstStartMachineActionsContent.qml
View File

@ -72,7 +72,7 @@ Item
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: onClicked:
{ {

4
resources/qml/WelcomePages/UserAgreementContent.qml
View File

@ -60,7 +60,7 @@ Item
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Agree") text: catalog.i18nc("@button", "Agree")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: onClicked:
{ {
@ -77,7 +77,7 @@ Item
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Decline and close") text: catalog.i18nc("@button", "Decline and close")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: onClicked:
{ {

2
resources/qml/WelcomePages/WelcomeContent.qml
View File

@ -59,7 +59,7 @@ Column
id: getStartedButton id: getStartedButton
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@button", "Get started") text: catalog.i18nc("@button", "Get started")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }

2
resources/qml/WelcomePages/WhatsNewContent.qml
View File

@ -78,7 +78,7 @@ Item
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: 40 anchors.margins: 40
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
width: 140 width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }

2
resources/themes/cura-light/theme.json
View File

@ -509,6 +509,8 @@
"button_icon": [2.5, 2.5], "button_icon": [2.5, 2.5],
"button_lining": [0, 0], "button_lining": [0, 0],
"welcome_pages_button": [12.0, 2.5],
"action_button": [15.0, 2.5], "action_button": [15.0, 2.5],
"action_button_icon": [1.0, 1.0], "action_button_icon": [1.0, 1.0],
"action_button_radius": [0.15, 0.15], "action_button_radius": [0.15, 0.15],