Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r7077e38c74db9cccb5496ffefcf8936c0916de76 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ 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 @@ -32,10 +33,11 @@ stackView.initialItem : _settingsHome - enum ItmesIndex { + enum ItemsIndex { SetDateTime , WiFi , Bluetooth , + EmptySep , Services } @@ -51,19 +53,38 @@ itemIndex : SettingsStack.SetDateTime } + SettingsWiFi { id: _settingsWiFi + 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: vDateTime.doInit() - push(_settingsDateTime) + push( _settingsDateTime ) + _settingsDateTime.setFocus() break - - case 1: + case SettingsStack.WiFi: + vNetwork.doInit() + push( _settingsWiFi ) + // _settingsWiFi.setFocus() + break + case SettingsStack.Services: + push(_servicePassword) + _servicePassword.setFocus() + break + default: console.debug(vIndex) break }