From 2215248c450b6bd3f728e813f289f099d4301523 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Thu, 26 Apr 2018 11:57:16 +0300
Subject: Add support for wi-fi networks with hidden SSID

Task-number: QTBUG-62661
Change-Id: I894f37d2ac397ca2a10db92b1daec9997a9733bb
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/settingsui/settingsuiplugin/SettingsHeader.qml | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'src/settingsui/settingsuiplugin/SettingsHeader.qml')

diff --git a/src/settingsui/settingsuiplugin/SettingsHeader.qml b/src/settingsui/settingsuiplugin/SettingsHeader.qml
index 9432789..37469e2 100644
--- a/src/settingsui/settingsuiplugin/SettingsHeader.qml
+++ b/src/settingsui/settingsuiplugin/SettingsHeader.qml
@@ -54,7 +54,7 @@ Item {
                 break;
             }
         }
-        ipItem.text = qsTr("Device IP: ") + ipAddress;
+        ipItem.text = qsTr("Wired IP: ") + ipAddress;
     }
 
     Image {
@@ -90,8 +90,8 @@ Item {
     Text {
         id: ipItem
         width: parent.width * 0.25
-        height: parent.height
-        anchors.verticalCenter: settingsText.verticalCenter
+        height: parent.height/2
+        anchors.top: settingsText.top
         anchors.right: parent.right
         anchors.rightMargin: pluginMain.margin
         horizontalAlignment: Text.AlignRight
@@ -100,7 +100,7 @@ Item {
         color: "white"
         font.family: appFont
         font.styleName: "SemiBold"
-        text: qsTr("Device IP: ")
+        text: qsTr("Wired IP: ")
 
         MouseArea {
             anchors.fill: parent
@@ -108,6 +108,24 @@ Item {
         }
     }
 
+    Text {
+        id: wifiIpItem
+        width: parent.width * 0.25
+        height: parent.height/2
+        anchors.top: ipItem.bottom
+        anchors.right: parent.right
+        anchors.rightMargin: pluginMain.margin
+        horizontalAlignment: Text.AlignRight
+        verticalAlignment: Text.AlignVCenter
+        font.pixelSize: parent.height * 0.3
+        color: "white"
+        font.family: appFont
+        font.styleName: "SemiBold"
+        text: qsTr((NetworkSettingsManager.currentWifiConnection ?
+                   "Wireless IP: " +
+                        NetworkSettingsManager.currentWifiConnection.ipv4.address : ""))
+    }
+
     Component.onCompleted: {
         var networkCount = NetworkSettingsManager.services.sourceModel.rowCount();
         for (var i = 0; i < networkCount; ++i) {
-- 
cgit v1.2.3