Use buttons from QtQuick.Controls 2

This is to make it look more consistent with the open dialog, which needed Controls 2 in order to make the drop-downs work on MacOS.

As discussed in the CCB.
This commit is contained in:
Ghostkeeper 2021-06-15 16:28:20 +02:00
parent 88f6bb743c
commit adf3f51a4e
No known key found for this signature in database
GPG Key ID: 14C3586CD2EFC5B9

View File

@ -1,8 +1,9 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls 2.0 as Controls2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Window 2.2 import QtQuick.Window 2.2
@ -281,7 +282,7 @@ UM.Dialog
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 Controls2.Button
{ {
id: cancel_button id: cancel_button
anchors anchors
@ -293,7 +294,7 @@ UM.Dialog
enabled: true enabled: true
onClicked: close() onClicked: close()
} }
Button Controls2.Button
{ {
id: ok_button id: ok_button
anchors.right: parent.right anchors.right: parent.right