3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Update ask open project or models dialog to QtControls 2

Browse source 
CURA-8684
This commit is contained in:
casper 2022-01-24 21:58:23 +01:00
parent 4c0ee058e4
commit b45707af54
1 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

51
resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2021 Ultimaker B.V. // Copyright (c) 2022 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.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
@ -97,29 +97,32 @@ UM.Dialog
text: catalog.i18nc("@text:window", "Remember my choice") text: catalog.i18nc("@text:window", "Remember my choice")
checked: UM.Preferences.getValue("cura/choice_on_open_project") != "always_ask" checked: UM.Preferences.getValue("cura/choice_on_open_project") != "always_ask"
} }
}
// Buttons Item
Item { {
id: buttonBar ButtonGroup
anchors.right: parent.right {
anchors.left: parent.left buttons: [openAsProjectButton, importModelsButton]
height: childrenRect.height checkedButton: openAsProjectButton
Button {
id: openAsProjectButton
text: catalog.i18nc("@action:button", "Open as project")
anchors.right: importModelsButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
isDefault: true
onClicked: loadProjectFile()
}
Button {
id: importModelsButton
text: catalog.i18nc("@action:button", "Import models")
anchors.right: parent.right
onClicked: loadModelFiles()
}
} }
} }
onAccepted: loadProjectFile()
onRejected: loadModelFiles()
rightButtons: [
Button
{
id: openAsProjectButton
text: catalog.i18nc("@action:button", "Open as project")
onClicked: loadProjectFile()
},
Button
{
id: importModelsButton
text: catalog.i18nc("@action:button", "Import models")
onClicked: loadModelFiles()
}
]
} }