From 1671759a9ef01b1e6533d4caf72cfd1ac3c9223e Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Thu, 3 Aug 2017 19:13:52 +0300 Subject: Introduce a placeholder for removed wired networks Disable entering the wired network settings when none have been seen. When a wired network is cable-disconnected, leave a placeholder for it. When a new wired network is cable-connected, replace the placeholder with that. Task-number: QTBUG-60979 Change-Id: I8eeb20d25d765c7bb104ad2e698e4d0686c8dc2d Reviewed-by: Teemu Holappa --- src/settingsui/network/NetworkSettings.qml | 4 +++- src/settingsui/network/WiredSettings.qml | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/settingsui') diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml index 9385ee1..947aae5 100644 --- a/src/settingsui/network/NetworkSettings.qml +++ b/src/settingsui/network/NetworkSettings.qml @@ -72,6 +72,7 @@ Item { RadioButton { id: btn + enabled: (type != NetworkSettingsType.Wired) || NetworkSettingsManager.services.wiredNetworksAvailable Layout.fillWidth: true implicitHeight: 54 @@ -98,7 +99,8 @@ Item { text: name } Label { - text: networkSelect.stateToStr(modelData.state) + text: ((type == NetworkSettingsType.Wired) && !NetworkSettingsManager.services.wiredNetworksAvailable) ? + qsTr("No networks") : networkSelect.stateToStr(modelData.state) font.pixelSize: 12 } } diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml index c68b36c..3bf211e 100644 --- a/src/settingsui/network/WiredSettings.qml +++ b/src/settingsui/network/WiredSettings.qml @@ -44,6 +44,12 @@ Item { ipv4Method.currentIndex = service.ipv4.method } + onServiceChanged: { + if (!service) { + service = NetworkSettingsManager.services.itemFromRow(0); + } + } + GroupBox { title: qsTr("Ethernet Connection") anchors.fill: parent -- cgit v1.2.3