3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Process feedback comments

Browse source 
Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281

CURA-7609
This commit is contained in:
Kostas Karmas 2020-08-03 17:30:21 +02:00
parent 60cfb6a8be
commit 6c59616e39
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -20,6 +20,7 @@ UM.Dialog
property int comboboxHeight: 15 * screenScaleFactor property int comboboxHeight: 15 * screenScaleFactor
property int spacerHeight: 10 * screenScaleFactor property int spacerHeight: 10 * screenScaleFactor
property int doubleSpacerHeight: 20 * screenScaleFactor
property string machineResolveStrategyCurrentKey: "override" property string machineResolveStrategyCurrentKey: "override"
onClosing: manager.notifyClosed() onClosing: manager.notifyClosed()
@ -36,7 +37,7 @@ UM.Dialog
Item Item
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: 20 * screenScaleFactor anchors.margins: 10 * screenScaleFactor
UM.I18nCatalog UM.I18nCatalog
{ {
@ -80,7 +81,7 @@ UM.Dialog
} }
Item // Spacer Item // Spacer
{ {
height: 2 * spacerHeight height: doubleSpacerHeight
width: height width: height
} }
@ -105,7 +106,7 @@ UM.Dialog
id: machineResolveStrategyTooltip id: machineResolveStrategyTooltip
width: (parent.width / 3) | 0 width: (parent.width / 3) | 0
height: visible ? comboboxHeight : 0 height: visible ? comboboxHeight : 0
visible: manager.updatableMachinesCount != 0 visible: manager.updatableMachineNamesCount != 0
text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?") text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
ComboBox ComboBox
{ {
@ -163,12 +164,12 @@ UM.Dialog
id: machineResolveTooltip id: machineResolveTooltip
width: (parent.width / 3) | 0 width: (parent.width / 3) | 0
height: visible ? comboboxHeight : 0 height: visible ? comboboxHeight : 0
visible: base.visible && manager.updatableMachinesCount != 0 && machineResolveStrategyCurrentKey == "override" visible: base.visible && manager.updatableMachineNamesCount != 0 && machineResolveStrategyCurrentKey == "override"
text: catalog.i18nc("@info:tooltip", "Which machine of the same type should be overriden?") text: catalog.i18nc("@info:tooltip", "Which machine of the same type should be overriden?")
ComboBox ComboBox
{ {
id: selectMachineComboBox id: selectMachineComboBox
model: manager.updatableMachines model: manager.updatableMachineNames
width: parent.width width: parent.width
onCurrentIndexChanged: onCurrentIndexChanged:
{ {
@ -176,18 +177,18 @@ UM.Dialog
} }
onVisibleChanged: onVisibleChanged:
{ {
if (visible) if (!visible) {return}
currentIndex = 0
for (var i = 0; i < count; i++)
{ {
currentIndex = 0 if (model[i] == manager.machineName)
for (var i = 0; i < count; i++)
{ {
if (model[i] == manager.machineName) currentIndex = i
{ break
currentIndex = i
break
}
} }
} }
} }
} }
} }
@ -195,7 +196,7 @@ UM.Dialog
Item // Spacer Item // Spacer
{ {
height: 2 * spacerHeight height: doubleSpacerHeight
width: height width: height
} }
Row Row
@ -298,7 +299,7 @@ UM.Dialog
} }
Item // Spacer Item // Spacer
{ {
height: 2 * spacerHeight height: doubleSpacerHeight
width: height width: height
} }
Row Row
@ -360,7 +361,7 @@ UM.Dialog
Item // Spacer Item // Spacer
{ {
height: 2 * spacerHeight height: doubleSpacerHeight
width: height width: height
} }
@ -402,7 +403,7 @@ UM.Dialog
} }
Item // Spacer Item // Spacer
{ {
height: 2 * spacerHeight height: spacerHeight
width: height width: height
} }
Row Row