From 8d60ee12b42f0ab0114e12e85f356f57b256ffac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoffer=20Bj=C3=B6rnram?=
 <43721414+cbjornram@users.noreply.github.com>
Date: Mon, 19 Apr 2021 18:12:56 +0200
Subject: [PATCH] Changed TCP/UDP connection settings names to follow more
 common terminology (#9502)

* Name and layout change for UDP/TCP settings

- To be more coherent with terminology used by MAVLink proxy/router softwares, the connection fields' labels was changed.
- A slight redesign of UDP server/host connection settings to allow for explaining notes and easier overview.

* Inherit widths from parent for less static layout

* Removed non-functional and unused reference
---
 src/ui/preferences/TcpSettings.qml |  4 ++--
 src/ui/preferences/UdpSettings.qml | 32 +++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/ui/preferences/TcpSettings.qml b/src/ui/preferences/TcpSettings.qml
index 022ebf6..55d60dd 100644
--- a/src/ui/preferences/TcpSettings.qml
+++ b/src/ui/preferences/TcpSettings.qml
@@ -30,7 +30,7 @@ Column {
     Row {
         spacing:        ScreenTools.defaultFontPixelWidth
         QGCLabel {
-            text:       qsTr("Host Address:")
+            text:       qsTr("Server Address:")
             width:      _firstColumn
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -44,7 +44,7 @@ Column {
     Row {
         spacing:        ScreenTools.defaultFontPixelWidth
         QGCLabel {
-            text:       qsTr("TCP Port:")
+            text:       qsTr("Port:")
             width:      _firstColumn
             anchors.verticalCenter: parent.verticalCenter
         }
diff --git a/src/ui/preferences/UdpSettings.qml b/src/ui/preferences/UdpSettings.qml
index bc77297..dc8addc 100644
--- a/src/ui/preferences/UdpSettings.qml
+++ b/src/ui/preferences/UdpSettings.qml
@@ -28,10 +28,24 @@ Column {
 
     property string _currentHost: ""
 
+    Item {
+        height: ScreenTools.defaultFontPixelHeight * 2
+        width:  parent.width
+        QGCLabel {
+            id:                 warningLabel
+            anchors.top:        parent.top
+            anchors.left:       parent.left
+            anchors.right:      parent.right
+            font.pointSize:     ScreenTools.smallFontPointSize
+            wrapMode:           Text.WordWrap
+            text:               qsTr("Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.")
+        }
+    }
+
     Row {
         spacing:    ScreenTools.defaultFontPixelWidth
         QGCLabel {
-            text:   qsTr("Listening Port:")
+            text:   qsTr("Port:")
             width:  _firstColumn
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -54,7 +68,7 @@ Column {
         width:  parent.width
     }
     QGCLabel {
-        text:   qsTr("Target Hosts:")
+        text:   qsTr("Server addresses (optional):")
     }
     Item {
         width:  hostRow.width
@@ -62,16 +76,12 @@ Column {
         Row {
             id:      hostRow
             spacing: ScreenTools.defaultFontPixelWidth
-            Item {
-                height: 1
-                width:  _firstColumn
-            }
             Column {
                 id:         hostColumn
                 spacing:    ScreenTools.defaultFontPixelHeight / 2
                 Rectangle {
                     height:  1
-                    width:   _secondColumn
+                    width:   parent.width
                     color:   qgcPal.button
                     visible: subEditConfig && subEditConfig.linkType === LinkConfiguration.TypeUdp && subEditConfig.hostList.length > 0
                 }
@@ -80,7 +90,7 @@ Column {
                     delegate:
                     QGCButton {
                         text:               modelData
-                        width:              _secondColumn
+                        width:              parent.width
                         anchors.leftMargin: ScreenTools.defaultFontPixelWidth * 2
                         autoExclusive:      true
                         onClicked: {
@@ -93,7 +103,7 @@ Column {
                     id:         hostField
                     focus:      true
                     visible:    false
-                    width:      ScreenTools.defaultFontPixelWidth * 30
+                    width:      parent.width
                     onEditingFinished: {
                         if(subEditConfig) {
                             if(hostField.text !== "") {
@@ -112,7 +122,7 @@ Column {
                 }
                 Rectangle {
                     height: 1
-                    width:  _secondColumn
+                    width:  parent.width
                     color:  qgcPal.button
                 }
                 Item {
@@ -120,7 +130,7 @@ Column {
                     width:  parent.width
                 }
                 Item {
-                    width:  _secondColumn
+                    width:  _firstColumn + _secondColumn
                     height: udpButtonRow.height
                     Row {
                         id:         udpButtonRow