Merge remote-tracking branch 'origin/master' into ui_rework_4_0

This commit is contained in:
Lipu Fei 2018-12-04 17:12:24 +01:00
commit a13fb4a81e
6 changed files with 162 additions and 96 deletions

View file

@ -25,11 +25,7 @@ UM.PreferencesPage
function reset()
{
UM.Preferences.resetPreference("general/visible_settings")
// After calling this function update Setting visibility preset combobox.
// Reset should set default setting preset ("Basic")
visibilityPreset.currentIndex = 1
settingVisibilityPresetsModel.setActivePreset("basic")
}
resetEnabled: true;