summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2017-07-05 15:23:35 +0300
committerVille Voutilainen <ville.voutilainen@qt.io>2017-07-05 12:32:25 +0000
commit132c80442f8820e3b82ab21f649c810bddd38d3f (patch)
treea4c7ab46329a0b0cc7c95788dbee17a47800618f /src
parentdd8e7905fa4daf7fb87f99f8c1d7ccd47c2d040d (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/settingsui/network/WifiSettings.qml21
1 files 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
+ }
}
}
}