Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) @@ -90,89 +90,31 @@ serviceMode , // FactoryReset ] - SettingsBase { id: _settingsInformation + SettingsBase { id: _settingsInformation itemIndex : SettingsStack.Information } - SettingsBase { id: _settingsVolumeBrightness + SettingsVolumeBrightness { id: _settingsVolumeBrightness itemIndex : SettingsStack.VolumeBrightness - Column { - spacing: 50 - anchors.centerIn: parent - Row { - anchors.horizontalCenter: parent.horizontalCenter - Label { - anchors.verticalCenter: parent.verticalCenter - text: qsTr("Brightness") - } - Slider { id : _brightness - anchors.verticalCenter: parent.verticalCenter - width : 500 - step : 20 // no zero - minimum : 20 // 1 - maximum : 100 // 5 - height : 5 - ticks : true - 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: _brightness.value = vDevice.brightness - } - } - } - Row { - anchors.horizontalCenter: parent.horizontalCenter - Label { - anchors.verticalCenter: parent.verticalCenter - text: qsTr("Alarm Volume") - } - Slider { id : _alarmVolume - anchors.verticalCenter: parent.verticalCenter - width : 500 - step : 20 // no zero - minimum : 20 // 1 - maximum : 100 // 5 - height : 5 - ticks : true - } - } - Row { - anchors.horizontalCenter: parent.horizontalCenter - Label { - anchors.verticalCenter: parent.verticalCenter - text: qsTr("System Volume") - } - Slider { id : _systemVolume - anchors.verticalCenter: parent.verticalCenter - width : 500 - step : 20 // no zero - minimum : 20 // 1 - maximum : 100 // 5 - height : 5 - ticks : true - } - } - } } - SettingsDateTime { id: _settingsDateTime + SettingsDateTime { id: _settingsDateTime itemIndex : SettingsStack.SetDateTime } - SettingsWiFi { id: _settingsWiFi + SettingsWiFi { id: _settingsWiFi itemIndex : SettingsStack.WiFi } - SettingsBase { id: _settingsBluetooth + SettingsBase { id: _settingsBluetooth itemIndex : SettingsStack.Bluetooth } - SettingsDG { id: _settingsDGSettings + SettingsDG { id: _settingsDGSettings itemIndex : SettingsStack.DGSettings } - UserConfirmation { id: _servicePassword + UserConfirmation { id: _servicePassword itemIndex : SettingsStack.Services title : qsTr("Please Enter The Service Password") isPassword: true