Fix layer height slider auto switching

CURA-4617
This commit is contained in:
Lipu Fei 2017-11-28 14:35:42 +01:00
parent 6e171be0b9
commit fa1d1ee3ad

View File

@ -303,7 +303,7 @@ Item
// only change if an active machine is set and the slider is visible at all. // only change if an active machine is set and the slider is visible at all.
if (Cura.MachineManager.activeMachine != null && visible) { if (Cura.MachineManager.activeMachine != null && visible) {
// prevent updating during view initializing. Trigger only if the value changed by user // prevent updating during view initializing. Trigger only if the value changed by user
if (qualitySlider.value != qualityModel.qualitySliderActiveIndex) { if (qualitySlider.value != qualityModel.qualitySliderActiveIndex && qualityModel.qualitySliderActiveIndex != -1) {
// start updating with short delay // start updating with short delay
qualitySliderChangeTimer.start() qualitySliderChangeTimer.start()
} }
@ -368,7 +368,7 @@ Item
{ {
id: customisedSettings id: customisedSettings
visible: Cura.SimpleModeSettingsManager.isProfileCustomized visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.SimpleModeSettingsManager.isProfileUserCreated
height: speedSlider.height * 0.8 height: speedSlider.height * 0.8
width: speedSlider.height * 0.8 width: speedSlider.height * 0.8
@ -381,7 +381,18 @@ Item
onClicked: onClicked:
{ {
discardOrKeepProfileChangesDialog.show() // if the current profile is user-created, switch to a built-in quality
if (Cura.SimpleModeSettingsManager.isProfileUserCreated)
{
if (Cura.ProfilesModel.rowCount() > 0)
{
Cura.MachineManager.setActiveQuality(Cura.ProfilesModel.getItem(0).id)
}
}
if (Cura.SimpleModeSettingsManager.isProfileCustomized)
{
discardOrKeepProfileChangesDialog.show()
}
} }
onEntered: onEntered:
{ {