Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rf0a80523d37c862fd24064522216b0bd53a2cc33
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision f0a80523d37c862fd24064522216b0bd53a2cc33)
@@ -55,12 +55,11 @@
     firstFocusInput : _ipAddress
     notificationText: vDevice.status
     onConfirmClicked:  {
-        // ===================== Device Controller: FIXME
-        // vNetwork.doConfirm(
-        //     _ipAddress  .textInput.text ,
-        //     _gateway    .textInput.text ,
-        //     _subnetmask .textInput.text ,
-        //     _dns        .textInput.text )
+         vDevice.doConfirm(
+             _ipAddress  .textInput.text ,
+             _gateway    .textInput.text ,
+             _subnetmask .textInput.text ,
+             _dns        .textInput.text )
     }
 
     Column { id             : _ipColumn
@@ -71,56 +70,52 @@
 
         TextEntry { id      : _ipAddress
             nextInput       : _gateway // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
-            textInput.text  : "ipAddress" //TODO: Wifi
+            textInput.text  : vDevice.ipAddress
             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  : {
-                // ===================== Device Controller: FIXME
-                // vNetwork.doSetIPAddress(textInput.text)
+                // vDevice.doSetIPAddress(textInput.text)
             }
         }
 
         TextEntry { id      : _gateway
             nextInput       : _subnetmask // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
-            textInput.text  : "gateway" //TODO: Wifi
+            textInput.text  : vDevice.gateway
             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  : {
-                // ===================== Device Controller: FIXME
-                // vNetwork.doSetGateway(textInput.text)
+                // vDevice.doSetGateway(textInput.text)
             }
         }
 
         TextEntry { id      : _subnetmask
             nextInput       : _dns // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
-            textInput.text  : "subnetMask" //TODO: Wifi
+            textInput.text  : vDevice.subnetMask
             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  : {
-                // ===================== Device Controller: FIXME
-                // vNetwork.doSetSubnetMask(textInput.text)
+                // vDevice.doSetSubnetMask(textInput.text)
             }
         }
 
         TextEntry { id      : _dns
-            textInput.text  : "dns" //TODO: Wifi
+            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  : {
-                // ===================== Device Controller: FIXME
-                // vNetwork.doSetDNS(textInput.text)
+                // vDevice.doSetDNS(textInput.text)
             }
         }
     }
@@ -180,6 +175,7 @@
             onIsConnectedChanged: {
                 if ( isConnected ) {
                     _ssidText.text = wifiSsid
+                    
                 }
             }
 
@@ -242,12 +238,10 @@
         onConfirmClicked    : {
             if ( isPassword ) {
                 if( passwordCurrent.length > 0 ) {
-                    // ===================== Device Controller: FIXME
                     // vNetwork.doJoinNetwork  ( macAddress, passwordCurrent )
                     pop()
                 }
             } else {
-                // ===================== Device Controller: FIXME
                 // vNetwork.doDisconnectNetwork( macAddress )
                 pop()
             }