Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -ra04fd119778f0483cba5139a11e3c6bad7f2324a --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision a04fd119778f0483cba5139a11e3c6bad7f2324a) @@ -79,6 +79,7 @@ text: qsTr("Alarm Volume") } Slider { id : _alarmVolume + property bool adjustment: false anchors.verticalCenter: parent.verticalCenter width : 500 step : 20 // no zero @@ -87,12 +88,34 @@ height : 5 ticks : true unit : qsTr("%") - onReleased : vAdjustmentAlarmVolume.doAdjustment( _alarmVolume.value ) + onReleased : { + _alarmVolume.adjustment = true + vAdjustmentAlarmVolume.doAdjustment( _alarmVolume.value ) + } + Connections { target: vSettings + onAlarmVolumeChanged: { + if ( ! _alarmVolume.adjustment ) { + vAdjustmentAlarmVolume.doAdjustment( vSettings.alarmVolume ) + } + _alarmVolume.value = vSettings.alarmVolume + } + } Connections { target: vAdjustmentAlarmVolume // in case the value is rejecte it will be set to the previous value // also the init value shall be set when navigate to the screen - onHdAlarmVolumeChanged : _alarmVolume.value = vAdjustmentAlarmVolume.hdAlarmVolume - onStatusChanged : _root.notificationText = vstatus + onAdjustmentTriggered : { + _alarmVolume.adjustment = false + if ( vAdjustmentAlarmVolume.adjustment_Accepted ) { + vSettings.alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume + _root.notificationText = "" + } + else { + _root.notificationText = vAdjustmentAlarmVolume.adjustment_ReasonText + } + } + onHdAlarmVolumeChanged : { + _alarmVolume.value = vAdjustmentAlarmVolume.hdAlarmVolume + } } } Label {