GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved conflict boxes to be aligned with "headers"

Browse Source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-12-19 13:04:55 +01:00
parent 9fe0ccac23
commit c25c4c1d77
1 changed files with 89 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -85,10 +85,41 @@ UM.Dialog
width: height width: height
} }
Row
{
height: childrenRect.height
width: parent.width
Label Label
{ {
text: catalog.i18nc("@action:label", "Printer settings") text: catalog.i18nc("@action:label", "Printer settings")
font.bold: true font.bold: true
width: parent.width /3
}
Item
{
// spacer
height: spacerHeight
width: parent.width / 3
}
UM.TooltipArea
{
id: machineResolveTooltip
width: parent.width / 3
height: visible ? comboboxHeight : 0
visible: manager.machineConflict
text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
ComboBox
{
model: resolveStrategiesModel
textRole: "label"
id: machineResolveComboBox
width: parent.width
onActivated:
{
manager.setResolveStrategy("machine", resolveStrategiesModel.get(index).key)
}
}
}
} }
Row Row
{ {
@ -120,26 +151,6 @@ UM.Dialog
text: manager.machineName text: manager.machineName
width: parent.width / 3 width: parent.width / 3
} }
UM.TooltipArea
{
id: machineResolveTooltip
width: parent.width / 3
height: visible ? comboboxHeight : 0
visible: manager.machineConflict
text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
ComboBox
{
model: resolveStrategiesModel
textRole: "label"
id: machineResolveComboBox
width: parent.width
onActivated:
{
manager.setResolveStrategy("machine", resolveStrategiesModel.get(index).key)
}
}
}
} }
Item // Spacer Item // Spacer
@ -147,28 +158,22 @@ UM.Dialog
height: spacerHeight height: spacerHeight
width: height width: height
} }
Row
{
height: childrenRect.height
width: parent.width
Label Label
{ {
text: catalog.i18nc("@action:label", "Profile settings") text: catalog.i18nc("@action:label", "Profile settings")
font.bold: true font.bold: true
}
Row
{
width: parent.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Name")
width: parent.width / 3 width: parent.width / 3
} }
Label Item
{ {
text: manager.qualityName // spacer
height: spacerHeight
width: parent.width / 3 width: parent.width / 3
} }
UM.TooltipArea UM.TooltipArea
{ {
id: qualityChangesResolveTooltip id: qualityChangesResolveTooltip
@ -190,6 +195,21 @@ UM.Dialog
} }
} }
Row Row
{
width: parent.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Name")
width: parent.width / 3
}
Label
{
text: manager.qualityName
width: parent.width / 3
}
}
Row
{ {
width: parent.width width: parent.width
height: manager.numUserSettings != 0 ? childrenRect.height : 0 height: manager.numUserSettings != 0 ? childrenRect.height : 0
@ -226,11 +246,41 @@ UM.Dialog
height: spacerHeight height: spacerHeight
width: height width: height
} }
Row
{
height: childrenRect.height
width: parent.width
Label Label
{ {
text: catalog.i18nc("@action:label", "Material settings") text: catalog.i18nc("@action:label", "Material settings")
font.bold: true font.bold: true
width: parent.width / 3
}
Item
{
// spacer
height: spacerHeight
width: parent.width / 3
}
UM.TooltipArea
{
id: materialResolveTooltip
width: parent.width / 3
height: visible ? comboboxHeight : 0
visible: manager.materialConflict
text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
ComboBox
{
model: resolveStrategiesModel
textRole: "label"
id: materialResolveComboBox
width: parent.width
onActivated:
{
manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key)
}
}
}
} }
Repeater Repeater
@ -253,37 +303,6 @@ UM.Dialog
} }
} }
Row
{
width: parent.width
height: childrenRect.height
visible: manager.materialConflict
Item
{
width: parent.width / 3 * 2
height: comboboxHeight
}
UM.TooltipArea
{
id: materialResolveTooltip
width: parent.width / 3
height: visible ? comboboxHeight : 0
text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
ComboBox
{
model: resolveStrategiesModel
textRole: "label"
id: materialResolveComboBox
width: parent.width
onActivated:
{
manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key)
}
}
}
}
Item // Spacer Item // Spacer
{ {
height: spacerHeight height: spacerHeight