Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r9c7a790376d07de7ddaa67e39d47102d68693c87 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 9c7a790376d07de7ddaa67e39d47102d68693c87) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file SettingsVolumeBrightness.qml - * \author (last) Vy - * \date (last) 13-Apr-2023 + * \author (last) Behrouz NematiPour + * \date (last) 18-Jul-2023 * \author (original) Behrouz NematiPour * \date (original) 06-Jun-2021 * @@ -80,7 +80,6 @@ text: qsTr("Alarm Volume") } Slider { id : _alarmVolume - property bool postInit: true anchors.verticalCenter: parent.verticalCenter width : 500 step : 1 // no zero @@ -91,32 +90,18 @@ onReleased : { vAdjustmentAlarmVolume.doAdjustment( _alarmVolume.value ) } - Connections { target: vSettings - function onAlarmVolumeChanged ( vValue ) { - if ( _alarmVolume.postInit ) { - vAdjustmentAlarmVolume.doAdjustment( vSettings.alarmVolume ) - } - _alarmVolume.postInit = false - _alarmVolume.reset(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 function onAdjustmentTriggered ( vValue ) { - _alarmVolume.postInit = false if ( vAdjustmentAlarmVolume.adjustment_Accepted ) { - vSettings.alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume + vSettings .alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume _root.notificationText = "" } else { _root.notificationText = vAdjustmentAlarmVolume.adjustment_ReasonText } + // regardless of the rejection or acceptance the value will be sent from C++ to be adjusted. + _alarmVolume.reset ( vAdjustmentAlarmVolume.hdAlarmVolume ) } - function onHdAlarmVolumeChanged ( vValue ) { - _alarmVolume.postInit = false - _alarmVolume.reset(vAdjustmentAlarmVolume.hdAlarmVolume) - } } } Label {