From 132c80442f8820e3b82ab21f649c810bddd38d3f Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Wed, 5 Jul 2017 15:23:35 +0300
Subject: Display the current IP address for a wifi connection

Task-number: QTBUG-60979
Change-Id: I0057aa65c4787c9eb59da67cb36590faf7aa33fe
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
---
 src/settingsui/network/WifiSettings.qml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml
index b265746..b7779bd 100644
--- a/src/settingsui/network/WifiSettings.qml
+++ b/src/settingsui/network/WifiSettings.qml
@@ -209,15 +209,22 @@ Item {
                         }
                     }
                 }
-                Button {
-                    id: disconnect
-                    text: qsTr("Disconnect")
+                ColumnLayout {
+                    spacing: parent.spacing
+                    width: parent.width
                     visible: selectedInterface.state === NetworkSettingsState.Online ||
                              selectedInterface.state === NetworkSettingsState.Ready
-                    onClicked: {
-                        NetworkSettingsManager.services.itemFromRow(networkSelection.currentIndex).disconnectService();
-                        networkSelection.currentIndex = -1;
-                        root.connecting = false
+                    Label {
+                        text: qsTr("IP Address: ") + NetworkSettingsManager.services.itemFromRow(networkSelection.currentIndex).ipv4.address
+                    }
+                    Button {
+                        id: disconnect
+                        text: qsTr("Disconnect")
+                        onClicked: {
+                            NetworkSettingsManager.services.itemFromRow(networkSelection.currentIndex).disconnectService();
+                            networkSelection.currentIndex = -1;
+                            root.connecting = false
+                        }
                     }
                 }
             }
-- 
cgit v1.2.3