Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 -rf38edd22f7b63694c21b83d6f4b69ea618390126 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) @@ -30,8 +30,11 @@ SettingsBase { id: _root readonly property int spacing: 50 - notificationText: vDevice.status + confirmVisible : false + notificationText: "" + + Column { spacing : _root.spacing anchors.centerIn: parent @@ -48,18 +51,16 @@ width : 500 step : 20 // no zero minimum : 20 // 1 - maximum : 100 // 5 + maximum : 100 // 10 height : 5 ticks : true unit : qsTr("%") onReleased : vDevice.brightness = _brightness.value Connections { target: vDevice // 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 - onBrightnessChanged: { - console.log(_brightness.value, vDevice.brightness) - _brightness.value = vDevice.brightness - } + onBrightnessChanged : _brightness.value = vbrightness + onStatusChanged : _root.notificationText = vstatus } } Label { @@ -68,6 +69,7 @@ text : vDevice.brightness + _brightness.unit } } + Row { spacing : _root.spacing anchors.horizontalCenter: parent.horizontalCenter @@ -85,14 +87,23 @@ height : 5 ticks : true unit : qsTr("%") + onReleased : vAdjustmentAlarmVolume.doAdjustment( _alarmVolume.value ) + 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 + } } Label { anchors.verticalCenter: parent.verticalCenter width : 100 - text : "0" + _alarmVolume.unit + text : vAdjustmentAlarmVolume.hdAlarmVolume + _alarmVolume.unit } } + Row { + visible : false spacing : _root.spacing anchors.horizontalCenter: parent.horizontalCenter Label {