Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jack Ha 2017-10-23 14:20:22 +02:00
commit c56d135b15

View File

@ -98,7 +98,14 @@ Item
// Set selected value // Set selected value
if (Cura.MachineManager.activeQualityType == qualityItem.metadata.quality_type) { if (Cura.MachineManager.activeQualityType == qualityItem.metadata.quality_type) {
// set to -1 when switching to user created profile so all ticks are clickable
if (Cura.SimpleModeSettingsManager.isProfileUserCreated) {
qualityModel.qualitySliderActiveIndex = -1
} else {
qualityModel.qualitySliderActiveIndex = i qualityModel.qualitySliderActiveIndex = i
}
qualityModel.existingQualityProfile = 1 qualityModel.existingQualityProfile = 1
} }
@ -293,14 +300,12 @@ Item
} }
onValueChanged: { onValueChanged: {
// 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)
{
// start updating with short delay // start updating with short delay
qualitySliderChangeTimer.start(); qualitySliderChangeTimer.start()
} }
} }
} }