diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-07-03 14:52:28 +0300 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-07-04 11:22:05 +0000 |
commit | ec4cdbc7c0a1efb44299437be4e0c41f08a6adb5 (patch) | |
tree | b5b301340b300737194f2d04c137b662bd70dd00 /src | |
parent | 99d54e264d8f783b7be22be1dd34e0cecc76dfb8 (diff) |
Allow editing ipv4 settings in manual mode directly after saving
Task-number: QTBUG-60979
Change-Id: I9f2c2eddc50cfae2130dea4ec51360312ea343e5
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/settingsui/network/WiredSettings.qml | 99 |
1 files changed, 55 insertions, 44 deletions
diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml index c55d2b7..c68b36c 100644 --- a/src/settingsui/network/WiredSettings.qml +++ b/src/settingsui/network/WiredSettings.qml @@ -88,57 +88,68 @@ Item { } } } - GridLayout { - columns: 2 - rows: 4 + Item { width: parent.width - visible: service.ipv4.method !== NetworkSettingsIPv4.Off + height: gridLayout.implicitHeight + GridLayout { + id: gridLayout + columns: 2 + rows: 4 + width: parent.width + visible: service.ipv4.method !== NetworkSettingsIPv4.Off - Label { - text: qsTr("IP Address: ") - width: parent.width * .3 - } - IpAddressTextField { - id: ipv4Address - text: service.ipv4.address - enabled: editMode - onAccepted: if (text.length > 0) service.ipv4.address = text - } - Label { - text: qsTr("Mask: ") - } - IpAddressTextField { - id: ipv4Mask - text: service.ipv4.mask - enabled: editMode - onAccepted: if (text.length > 0) service.ipv4.mask = text - } - Label { - text: qsTr("Router: ") - } - IpAddressTextField { - id: ipv4Gateway - text: service.ipv4.gateway - enabled: editMode - onAccepted: if (text.length > 0) service.ipv4.gateway = text - } - Label { - Layout.alignment: Qt.AlignTop - text: qsTr("DNS server: ") - } - Column { - spacing: 10 - Layout.fillWidth: true - Layout.alignment: Qt.AlignTop + Label { + text: qsTr("IP Address: ") + width: parent.width * .3 + } + IpAddressTextField { + id: ipv4Address + text: service.ipv4.address + enabled: editMode + onAccepted: if (text.length > 0) service.ipv4.address = text + } + Label { + text: qsTr("Mask: ") + } + IpAddressTextField { + id: ipv4Mask + text: service.ipv4.mask + enabled: editMode + onAccepted: if (text.length > 0) service.ipv4.mask = text + } + Label { + text: qsTr("Router: ") + } + IpAddressTextField { + id: ipv4Gateway + text: service.ipv4.gateway + enabled: editMode + onAccepted: if (text.length > 0) service.ipv4.gateway = text + } + Label { + Layout.alignment: Qt.AlignTop + text: qsTr("DNS server: ") + } + Column { + spacing: 10 + Layout.fillWidth: true + Layout.alignment: Qt.AlignTop - Repeater { - model: service.nameservers + Repeater { + model: service.nameservers - Label { - text: display + Label { + text: display + } } } } + MouseArea { + anchors.fill: parent + enabled: !editMode + && methodsModel.get(ipv4Method.currentIndex).method === NetworkSettingsIPv4.Manual + onClicked: editMode = true + } } Row { spacing: 10 |