Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r7c86f3854db9ad02d95681203198d75a0d65c9fa -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 7c86f3854db9ad02d95681203198d75a0d65c9fa) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) @@ -27,7 +27,9 @@ * \brief SettingsVolumeBrightness is used to adjust the * volume (alarm/system), brightness on the device */ -SettingsBase { id: _root +SettingsBase { id: _root + itemIndex : SettingsStack.VolumeBrightness + readonly property int spacing: 50 confirmVisible : false @@ -78,7 +80,6 @@ text: qsTr("Alarm Volume") } Slider { id : _alarmVolume - property bool postInit: true anchors.verticalCenter: parent.verticalCenter width : 500 step : 1 // no zero @@ -89,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 {