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

Merge branch '4.1'

Browse source
This commit is contained in:
Diego Prado Gesto 2019-05-07 11:49:45 +02:00
commit 6708d9da64
11 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/qml/Preferences/MachinesPage.qml
View file

@ -104,10 +104,11 @@ UM.ManagementPage
text: machineActionRepeater.model[index].label
onClicked:
{
actionDialog.content = machineActionRepeater.model[index].displayItem;
machineActionRepeater.model[index].displayItem.reset();
actionDialog.title = machineActionRepeater.model[index].label;
actionDialog.show();
var currentItem = machineActionRepeater.model[index]
actionDialog.loader.manager = currentItem
actionDialog.loader.source = currentItem.qmlPath
actionDialog.title = currentItem.label
actionDialog.show()
}
}
}
@ -117,13 +118,7 @@ UM.ManagementPage
UM.Dialog
{
id: actionDialog
property var content
onContentChanged:
{
contents = content;
content.onCompleted.connect(hide)
content.dialog = actionDialog
}
rightButtons: Button
{
text: catalog.i18nc("@action:button", "Close")