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

Material labels are now also displayed in the open project dialog

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-12-02 14:54:42 +01:00
parent c950288b86
commit f782a76324
3 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -192,19 +192,35 @@ UM.Dialog
text: catalog.i18nc("@action:label", "Material settings")
font.bold: true
}
Repeater
{
model: manager.materialLabels
delegate: Row
{
width: parent.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Name")
width: parent.width / 3
}
Label
{
text: modelData
width: parent.width / 3
}
}
}
Row
{
width: parent.width
height: childrenRect.height
Label
Item
{
text: catalog.i18nc("@action:label", "Type")
width: parent.width / 3
}
Label
{
text: catalog.i18nc("@action:label", "TOCHANGE")
width: parent.width / 3
width: parent.width / 3 * 2
height: comboboxHeight
}
UM.TooltipArea
@ -213,7 +229,7 @@ UM.Dialog
width: parent.width / 3
height: visible ? comboboxHeight : 0
visible: manager.materialConflict
text: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?")
text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
ComboBox
{
model: resolveStrategiesModel