Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r6c5b5292ae3b3ebf979175dcb1256c88b1baf90c --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 6c5b5292ae3b3ebf979175dcb1256c88b1baf90c) @@ -37,37 +37,45 @@ SetDateTime , WiFi , Bluetooth , - EmptySep , + DGSettings , Services } - property var itemsText : [ - qsTr("Set Date And Time"), - qsTr("Wi-Fi" ), - qsTr("Bluetooth" ), - "" , - qsTr("Services" ), - ] - - SettingsDateTime { id: _settingsDateTime + SettingsDateTime { id: _settingsDateTime itemIndex : SettingsStack.SetDateTime } - SettingsWiFi { id: _settingsWiFi + SettingsWiFi { id: _settingsWiFi itemIndex : SettingsStack.WiFi } + SettingsBase { id: _settingsBluetooth + itemIndex : SettingsStack.Bluetooth + } + + SettingsDG { id: _settingsDGSettings + itemIndex : SettingsStack.DGSettings + } + UserConfirmation { id: _servicePassword itemIndex : SettingsStack.Services title : qsTr("Please Enter The Service Password") isPassword: true } + property var itemsText : [ + qsTr("Set Date And Time" ), + qsTr("Wi-Fi" ), + qsTr("Bluetooth" ), + qsTr("Dialysate Generator Settings" ), + qsTr("Services" ), + ] + SettingsHome { id : _settingsHome backVisible : false confirmVisible : false itemsText : _root.itemsText - itemsEnabled : [ 1,1,0,0,1,0,0,0,0 ] + itemsEnabled : [ 1,1,1,1,1,0,0,0,0,0 ] onItemClicked : { switch (vIndex) { case SettingsStack.SetDateTime: @@ -78,14 +86,20 @@ case SettingsStack.WiFi: vNetwork.doInit() push( _settingsWiFi ) - // _settingsWiFi.setFocus() + // _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(vIndex) + console.debug("Unknown Index", vIndex) break } }