3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-22 12:07:59 +01:00
commit 9e7c687853
9 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ Item
id: agreeButton
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: 40
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
text: catalog.i18nc("@button", "Agree")
width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true
@ -75,7 +75,7 @@ Item
id: declineButton
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.margins: 40
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
text: catalog.i18nc("@button", "Decline and close")
width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true