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

Use correct descriptor for project open

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-12-02 11:13:21 +01:00
parent 4cf454757f
commit 5119ee9a93
3 changed files with 74 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -110,8 +110,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
Logger.log("w", "File %s is not a valid workspace.", file_name)
return WorkspaceReader.PreReadResult.failed
if machine_conflict or quality_changes_conflict or material_conflict:
# There is a conflict; User should choose to either update the existing data, add everything as new data or abort
# Show the dialog, informing the user what is about to happen.
self._dialog.setMachineConflict(machine_conflict)
self._dialog.setQualityChangesConflict(quality_changes_conflict)
self._dialog.setMaterialConflict(material_conflict)

69
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -48,7 +48,7 @@ UM.Dialog
// See http://stackoverflow.com/questions/7659442/listelement-fields-as-properties
Component.onCompleted:
{
append({"key": "override", "label": catalog.i18nc("@action:ComboBox option", "Override existing")});
append({"key": "override", "label": catalog.i18nc("@action:ComboBox option", "Update existing")});
append({"key": "new", "label": catalog.i18nc("@action:ComboBox option", "Create new")});
}
}
@ -56,14 +56,70 @@ UM.Dialog
Column
{
anchors.fill: parent
spacing: 2
Label
{
id: infoLabel
width: parent.width
text: catalog.i18nc("@action:label", "Cura detected a number of conflicts while importing the workspace. How would you like to resolve these?")
wrapMode: Text.Wrap
height: 50
id: titleLabel
text: catalog.i18nc("@action:title", "Summary - Cura Project")
font.pixelSize: 22
}
Rectangle
{
id: separator
color: "black"
width: parent.width
height: 1
}
Item // Spacer
{
height: 5
width: height
}
Label
{
text: catalog.i18nc("@action:label", "Printer settings")
font.bold: true
}
Row
{
width: parent.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Type")
width: parent.width / 3
}
Label
{
text: catalog.i18nc("@action:label", "TOCHANGE")
width: parent.width / 3
}
}
Label
{
text: catalog.i18nc("@action:label", "Profile settings")
font.bold: true
}
Row
{
width: parent.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Type")
width: parent.width / 3
}
Label
{
text: catalog.i18nc("@action:label", "TOCHANGE")
width: parent.width / 3
}
}
UM.TooltipArea
{
id: machineResolveTooltip
@ -86,6 +142,7 @@ UM.Dialog
model: resolveStrategiesModel
textRole: "label"
id: machineResolveComboBox
width: 150
onActivated:
{
manager.setResolveStrategy("machine", resolveStrategiesModel.get(index).key)

2
resources/qml/Actions.qml
View file

@ -290,7 +290,7 @@ Item
Action
{
id: loadWorkspaceAction
text: catalog.i18nc("@action:inmenu menubar:file","&Save project...");
text: catalog.i18nc("@action:inmenu menubar:file","&Open project...");
}
Action