Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r577ab4647b2584d4e32b26797281ec1543d2e1aa -r7077e38c74db9cccb5496ffefcf8936c0916de76 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 577ab4647b2584d4e32b26797281ec1543d2e1aa) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages" /*! * \brief SettingsStack is the screen @@ -36,6 +37,7 @@ SetDateTime , WiFi , Bluetooth , + EmptySep , Services } @@ -55,11 +57,17 @@ itemIndex : SettingsStack.WiFi } + UserConfirmation { id: _servicePassword + itemIndex : SettingsStack.Services + title : qsTr("Please Enter The Service Password") + isPassword: true + } + SettingsHome { id : _settingsHome backVisible : false confirmVisible : false itemsText : _root.itemsText - itemsEnabled : [ 1,1,1,0,0,0,0,0,0 ] + itemsEnabled : [ 1,1,0,0,1,0,0,0,0 ] onItemClicked : { switch (vIndex) { case SettingsStack.SetDateTime: @@ -68,8 +76,14 @@ _settingsDateTime.setFocus() break case SettingsStack.WiFi: - push( _settingsWiFi ) - break + vNetwork.doInit() + push( _settingsWiFi ) + // _settingsWiFi.setFocus() + break + case SettingsStack.Services: + push(_servicePassword) + _servicePassword.setFocus() + break default: console.debug(vIndex) break