Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r0932b2beee9cc169291cbf69161f902f805237b1 -r574c7c5fb48b1fcb72337f5fb4c0119a20288815
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 0932b2beee9cc169291cbf69161f902f805237b1)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 574c7c5fb48b1fcb72337f5fb4c0119a20288815)
@@ -69,7 +69,7 @@
 
         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  : vNetwork.ipAddress
+            textInput.text  : "vNetwork.ipAddress" //TODO: Wifi
             label.text      : qsTr("IP Address")
             textInput.width : entryWidth
             label.width     : labelWidth
@@ -82,7 +82,7 @@
 
         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  : vNetwork.gateway
+            textInput.text  : "vNetwork.gateway" //TODO: Wifi
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Gateway")
@@ -95,7 +95,7 @@
 
         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  : vNetwork.subnetMask
+            textInput.text  : "vNetwork.subnetMask" //TODO: Wifi
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Subnet Mask")
@@ -107,7 +107,7 @@
         }
 
         TextEntry { id      : _dns
-            textInput.text  : vNetwork.dns
+            textInput.text  : "vNetwork.dns" //TODO: Wifi
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("DNS")
@@ -136,7 +136,7 @@
             font.pixelSize  : Fonts.fontPixelTextRectExtra
             color           : Colors.textMain
             horizontalAlignment : TextInput.Alignleft
-            text            : vNetwork.ssid
+            text            : "vNetwork.ssid" //TODO: Wifi
             width           : entryWidth
         }
     }
@@ -157,7 +157,7 @@
                 anchors.fill: _networkList
     }
     ListView    { id        : _networkList
-        model               : vNetwork
+        model               : vDevice
         clip                : true
         spacing             : 7
         y                   : _root.topMargin
@@ -166,15 +166,15 @@
         anchors.bottom      : _scanButton.bottom
         anchors.right       : _root.right
         anchors.rightMargin : _root.rightMargin
-        delegate            : TouchRect { id : _delegate
+        delegate            :
+        TouchRect { id : _delegate
+            readonly property color  networkDelegateTextColor   : wifiSupported ? Colors.textMain : Colors.textDisableButton
+            readonly property string postSecurityTypeLabel      : wifiSupported ? "" : " - " + qsTr("Not Supported")
+                     property bool   isCurrrentNetwork          : vDevice.wifiSupported === wifiSupported
 
-            readonly property color networkDelegateTextColor : isNetworkSupported ? Colors.textMain : Colors.textDisableButton
-            readonly property string postSecurityTypeLabel   : isNetworkSupported ? "" : " - " + qsTr("Not Supported")
-            property bool isCurrrentNetwork                  : vNetwork.macAddress === macAddress
 
-
             clip            : true
-            text.text       : ssid
+            text.text       : wifiSsid
             text.elide      : Text.ElideLeft
             text.color      : _delegate.networkDelegateTextColor
             width           : _networkList.width - Variables.minVGap
@@ -193,7 +193,7 @@
                     bottom      : parent.bottom
                 }
                 font.pixelSize  : Fonts.fontPixelDialogText
-                text            : securityTypes + _delegate.postSecurityTypeLabel
+                text            : wifiSecurityTypes + _delegate.postSecurityTypeLabel
                 color           : _delegate.networkDelegateTextColor
             }