Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2017-05-12 16:46:12 +02:00
commit a7b2386421

View File

@ -230,26 +230,33 @@ UM.Dialog
} }
} }
Row
{
id: buttonRow
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
height: childrenRect.height
CheckBox CheckBox
{ {
id: dontShowAgainCheckbox id: dontShowAgainCheckbox
anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
text: catalog.i18nc("@action:label", "Don't show project summary on save again") text: catalog.i18nc("@action:label", "Don't show project summary on save again")
checked: dontShowAgain checked: dontShowAgain
} }
Button
{
id: cancel_button
anchors.bottom: parent.bottom
anchors.right: ok_button.left
anchors.rightMargin: 2
text: catalog.i18nc("@action:button","Cancel");
enabled: true
onClicked: close()
}
Button Button
{ {
id: ok_button id: ok_button
anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
text: catalog.i18nc("@action:button","Save"); text: catalog.i18nc("@action:button","Save");
@ -259,17 +266,5 @@ UM.Dialog
yes() yes()
} }
} }
Button
{
id: cancel_button
anchors.right: ok_button.left
anchors.rightMargin: 2
text: catalog.i18nc("@action:button","Cancel");
enabled: true
onClicked: close()
}
}
} }
} }