diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2018-03-20 18:19:40 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2018-03-20 18:23:23 +0300 |
| commit | 6d21a6bddbf6fa33ebce023cecefafbe1a4c8311 (patch) | |
| tree | ef673dc8c1fa506c7c549c4fba181529668b1ec3 /plugins/3MFReader/WorkspaceDialog.qml | |
| parent | 363166bbb71d2752262d93c67bcd7e9e24d0805f (diff) | |
Show printer group and which machine to update in project loading
CURA-5125
Diffstat (limited to 'plugins/3MFReader/WorkspaceDialog.qml')
| -rw-r--r-- | plugins/3MFReader/WorkspaceDialog.qml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 5418dcef6d..58d881c915 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -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 |