Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r6f480a8d61165dd24cf8da7e9e637f89147303c3 -re7c552d59935eb2a63f3dcee0a5161d19f5c7ac5
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 6f480a8d61165dd24cf8da7e9e637f89147303c3)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision e7c552d59935eb2a63f3dcee0a5161d19f5c7ac5)
@@ -54,13 +54,6 @@
     confirmVisible  : false // since the static setting is done one by one seems confirm is not needed for now.
     firstFocusInput : _ipAddress
     notificationText: vDevice.status
-    onConfirmClicked:  {
-         vDevice.doConfirm(
-             _ipAddress  .textInput.text ,
-             _gateway    .textInput.text ,
-             _subnetmask .textInput.text ,
-             _dns        .textInput.text )
-    }
 
     Column { id             : _ipColumn
         spacing             : _root.spacing
@@ -74,11 +67,8 @@
             label.text      : qsTr("IP Address")
             textInput.width : entryWidth
             label.width     : labelWidth
-            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
-            onEnterPressed  : {
-                // vDevice.doSetIPAddress(textInput.text)
-            }
         }
 
         TextEntry { id      : _gateway
@@ -87,11 +77,8 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Gateway")
-            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
+             hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
-            onEnterPressed  : {
-                // vDevice.doSetGateway(textInput.text)
-            }
         }
 
         TextEntry { id      : _subnetmask
@@ -100,23 +87,17 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Subnet Mask")
-            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
-            onEnterPressed  : {
-                // vDevice.doSetSubnetMask(textInput.text)
-            }
         }
 
         TextEntry { id      : _dns
             textInput.text  : vDevice.dns
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("DNS")
-            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
-            onEnterPressed  : {
-                // vDevice.doSetDNS(textInput.text)
-            }
         }
     }
 
@@ -238,11 +219,11 @@
         onConfirmClicked    : {
             if ( isPassword ) {
                 if( passwordCurrent.length > 0 ) {
-                    // vNetwork.doJoinNetwork  ( macAddress, passwordCurrent )
+                    vDevice.doConnectWifi( true, ssid, passwordCurrent )
                     pop()
                 }
             } else {
-                // vNetwork.doDisconnectNetwork( macAddress )
+                vDevice.doConnectWifi( false, ssid, "" )
                 pop()
             }
         }