From ec4cdbc7c0a1efb44299437be4e0c41f08a6adb5 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Mon, 3 Jul 2017 14:52:28 +0300
Subject: 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>
---
 src/settingsui/network/WiredSettings.qml | 99 ++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 44 deletions(-)

(limited to 'src/settingsui/network')

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
-- 
cgit v1.2.3