diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-08-30 18:52:51 +0300 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-08-31 08:56:47 +0000 |
commit | 65b663a9be5d27cbb77b48f9e392c9463416383a (patch) | |
tree | f135b8cc7d927e8451ba1faaf88dad30d8192e76 /src/settingsui/settingsuiplugin/SettingsHeader.qml | |
parent | 010ca29d1eb902906b0005df7fb853dade60c778 (diff) |
Fix ip address tracking and display
Task-number: QTBUG-69814
Change-Id: Ifc90871c11aeddd1d07c5f1feb2a4292f0d36463
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Diffstat (limited to 'src/settingsui/settingsuiplugin/SettingsHeader.qml')
-rw-r--r-- | src/settingsui/settingsuiplugin/SettingsHeader.qml | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/src/settingsui/settingsuiplugin/SettingsHeader.qml b/src/settingsui/settingsuiplugin/SettingsHeader.qml index 37469e2..24192c9 100644 --- a/src/settingsui/settingsuiplugin/SettingsHeader.qml +++ b/src/settingsui/settingsuiplugin/SettingsHeader.qml @@ -39,24 +39,6 @@ Item { signal clicked() - function refreshIP() { - var networkCount = NetworkSettingsManager.services.sourceModel.rowCount(); - var ipAddress = "Not Found"; - for (var i = 0; i < networkCount; ++i) { - var networkService = NetworkSettingsManager.services.itemFromRow(i); - var tmp = NetworkSettingsManager.services.itemFromRow(i).ipv4.address; - if (tmp !== "" && ipAddress === "Not Found") - ipAddress = tmp; - - if (networkService.type === NetworkSettingsType.Wired && - (networkService.status === NetworkSettingsState.Ready || - networkService.status === NetworkSettingsState.Online)) { - break; - } - } - ipItem.text = qsTr("Wired IP: ") + ipAddress; - } - Image { id: backButton anchors.left: parent.left @@ -100,12 +82,9 @@ Item { color: "white" font.family: appFont font.styleName: "SemiBold" - text: qsTr("Wired IP: ") - - MouseArea { - anchors.fill: parent - onClicked: header.refreshIP() - } + text: NetworkSettingsManager.currentWiredConnection ? + qsTr("Wired IP: ") + + NetworkSettingsManager.currentWiredConnection.ipv4.address : "" } Text { @@ -121,16 +100,8 @@ Item { 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) { - NetworkSettingsManager.services.itemFromRow(i).ipv4Changed.connect(refreshIP); - } - header.refreshIP() + text: NetworkSettingsManager.currentWifiConnection ? + qsTr("Wireless IP: ") + + NetworkSettingsManager.currentWifiConnection.ipv4.address : "" } } |