Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -re1c1417fadbcc7e72064fd806f2e117e5d3ce228 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision e1c1417fadbcc7e72064fd806f2e117e5d3ce228) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) @@ -7,7 +7,7 @@ * * \file SettingsWiFi.qml * \author (last) Behrouz NematiPour - * \date (last) 02-Apr-2023 + * \date (last) 03-Apr-2023 * \author (original) Behrouz NematiPour * \date (original) 06-May-2021 * @@ -28,7 +28,8 @@ * \brief SettingsWiFi * The settings screen to setup the WiFi connection */ -SettingsBase { id: _root +SettingsBase { id: _root + itemIndex : SettingsStack.WiFi property var ipValidator: RegExpValidator { regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ @@ -53,7 +54,7 @@ firstFocusInput : _ipAddress notificationText: vNetwork.status onConfirmClicked: { - vDateTime.doConfirm( + vNetwork.doConfirm( _ipAddress .textInput.text , _gateway .textInput.text , _subnetmask .textInput.text , @@ -229,8 +230,8 @@ title : isPassword ? qsTr("Join") + separator + ssid + spaceSeparator + qsTr("Password") : qsTr("Disconnect") + separator + ssid onConfirmClicked : { if ( isPassword ) { - if( password.length > 0 ) { - vNetwork.doJoinNetwork ( macAddress, password ) + if( passwordCurrent.length > 0 ) { + vNetwork.doJoinNetwork ( macAddress, passwordCurrent ) pop() } } else {