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

Show printer group and which machine to update in project loading

Browse source 
CURA-5125
This commit is contained in:
Lipu Fei 2018-03-20 16:19:40 +01:00
parent 363166bbb7
commit 6d21a6bddb
3 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -108,7 +108,22 @@ UM.Dialog
text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
ComboBox
{
model: resolveStrategiesModel
model: ListModel
{
Component.onCompleted:
{
append({"key": "override", "label": catalog.i18nc("@action:ComboBox option", "Update") + " " + manager.machineName});
append({"key": "new", "label": catalog.i18nc("@action:ComboBox option", "Create new")});
}
}
Connections
{
target: manager
onMachineNameChanged:
{
machineResolveComboBox.model.get(0).label = catalog.i18nc("@action:ComboBox option", "Update") + " " + manager.machineName;
}
}
textRole: "label"
id: machineResolveComboBox
width: parent.width
@ -141,7 +156,7 @@ UM.Dialog
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Name")
text: catalog.i18nc("@action:label", manager.isPrinterGroup ? "Printer Group" : "Printer Name")
width: (parent.width / 3) | 0
}
Label