diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-08-03 19:13:52 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-08-04 10:21:09 +0000 |
| commit | 1671759a9ef01b1e6533d4caf72cfd1ac3c9223e (patch) | |
| tree | 3ffdf098e05b9a47769c429985b1393401177e4e /src/settingsui | |
| parent | 132c80442f8820e3b82ab21f649c810bddd38d3f (diff) | |
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 <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui')
| -rw-r--r-- | src/settingsui/network/NetworkSettings.qml | 4 | ||||
| -rw-r--r-- | src/settingsui/network/WiredSettings.qml | 6 |
2 files changed, 9 insertions, 1 deletions
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 |