Index: sources/gui/qml/dialogs/WiFiDialog.qml
===================================================================
diff -u -r3bee9f20350882eca47f3d18b0accf5bec3933d4 -rb38e1590d137f607b982d336e60b614c2ae685c2
--- sources/gui/qml/dialogs/WiFiDialog.qml	(.../WiFiDialog.qml)	(revision 3bee9f20350882eca47f3d18b0accf5bec3933d4)
+++ sources/gui/qml/dialogs/WiFiDialog.qml	(.../WiFiDialog.qml)	(revision b38e1590d137f607b982d336e60b614c2ae685c2)
@@ -4,58 +4,34 @@
 import "qrc:/globals"
 
 HeaderBarPopup { id: _root
-    readonly property int pixelSize : 24
+    readonly property int pixelSize     : 22
+    readonly property bool isConnected  : vDevice.ssid !== ""
 
-
-//    width   : Math.max( _wifiDataTable.contentWidth) + Variables.defaultMargin * 2
-
-    width   : Math.max( test1.contentWidth,
-                       _ssid.contentWidth,
+    width   : Math.max( _ssid.contentWidth,
                        _ipAddress.contentWidth) + Variables.defaultMargin * 2
 
-    height  : 100
+    height  : isConnected ? _ssid.contentHeight + _ipAddress.contentHeight +  Variables.defaultMargin :
+                            _ipAddress.contentHeight +  Variables.defaultMargin
 
-//    ListModel { id: _wiFiData
-////        ListElement { name: qsTr("x");          text: ("%1").arg(_root.x) }
-//        ListElement { name: qsTr("SSID");       text: vDevice.ssid }
-//        ListElement { name: qsTr("IP");         text: vDevice.ipAddress }
-////        ListElement { name: qsTr("Security");   text: 2.45 }
-////        ListElement { name: qsTr("Strength");   text: 2.45 }
-//    }
+    // TODO: Later add Securty type and signal strength if needed
 
-    Column { id : _dialogRow
+    Column { id : _dialogColumn
         anchors.fill        : parent
         anchors.leftMargin  : Variables.defaultMargin
         anchors.topMargin   : 10
 
-
-//        Repeater { id: _wifiDataTable
-//            model: _wiFiData
-//            Text {
-//                text: ("%1: %2").arg(model.name).arg(model.text)
-//                color: Colors.dialogText
-//                font.pixelSize: _root.pixelSize
-//            }
-//        }
-
-        Text { id: test1
-            text: "x: " + _root.x
-            color: Colors.dialogText
-            font.pixelSize: _root.pixelSize
-        }
-
         Text { id: _ssid
-            text: ("%1: %2").arg(qsTr("SSID")).arg(vDevice.ssid)
-            color: Colors.dialogText
-            font.pixelSize:  _root.pixelSize
+            text            : ("%1: %2").arg(qsTr("SSID")).arg(vDevice.ssid)
+            color           : Colors.dialogText
+            font.pixelSize  :  _root.pixelSize
+            visible         : _root.isConnected
         }
 
         Text {  id: _ipAddress
-            text            : ("%1: %2").arg(qsTr("IP")).arg(vDevice.ipAddress)
+            text            : _root.isConnected ? ("%1: %2").arg(qsTr("IP")).arg(vDevice.ipAddress) :
+                                                  qsTr(vDevice.ipAddress)
             color           : Colors.dialogText
             font.pixelSize  :  _root.pixelSize
         }
     }
-
-
 }