Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r56ad953ae404fcf6956bd4f76b7a54b12d0285d3 -r61f16c988a159401c92730b4cbfca5085c77222f --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 56ad953ae404fcf6956bd4f76b7a54b12d0285d3) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 61f16c988a159401c92730b4cbfca5085c77222f) @@ -64,8 +64,8 @@ qsTr("Factory Reset" ), // FactoryReset ] property var itemsEnabled : [ - false , // Information - false , // VolumeBrightness + true , // Information + true , // VolumeBrightness true , // WiFi false , // Bluetooth true , // DGSettings @@ -82,14 +82,80 @@ true , // WiFi true , // Bluetooth true , // DGSettings - ! serviceMode , // Services + ! serviceMode , // Services serviceMode , // SetDateTime serviceMode , // Language serviceMode , // Calibration serviceMode , // SWUpdate serviceMode , // FactoryReset ] + SettingsBase { id: _settingsInformation + itemIndex : SettingsStack.Information + } + + SettingsBase { 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 itemIndex : SettingsStack.SetDateTime } @@ -142,26 +208,39 @@ itemsVisible : _root.itemsVisible onItemClicked : { switch (vIndex) { + case SettingsStack.Information: + push(_settingsInformation) + break + + case SettingsStack.VolumeBrightness: + push(_settingsVolumeBrightness) + break + case SettingsStack.SetDateTime: vDateTime.doInit() push( _settingsDateTime ) _settingsDateTime.setFocus() break + case SettingsStack.WiFi: vNetwork.doInit() push( _settingsWiFi ) // _settingsWiFi.setFocus() // No keyboard popup. break + case SettingsStack.Bluetooth: push( _settingsBluetooth ) break + case SettingsStack.DGSettings: push( _settingsDGSettings ) break + case SettingsStack.Services: push(_servicePassword) _servicePassword.setFocus() break + default: console.debug("Unknown Index", vIndex) break