Update settings view to not deactivate transport but allow not binding port

2026-01-20 04:58:09 +00:00 · 2020-10-19 10:26:27 +02:00 · 2020-10-19 10:26:27 +02:00 · 17ecc29f0f
commit 17ecc29f0f
parent 96db4c94f2
16 changed files with 65 additions and 261 deletions
--- a/linphone-app/assets/languages/da.ts
+++ b/linphone-app/assets/languages/da.ts
@ -1379,18 +1379,6 @@ Klik her: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Video RTP UDP port</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Brug en tilfældig port</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Aktiveret port</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP felter</translation>
--- a/linphone-app/assets/languages/de.ts
+++ b/linphone-app/assets/languages/de.ts
@ -1379,18 +1379,6 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Video RTP UDP Port</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Zufälligen Port verwenden</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Aktivierter Port</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP-Felder</translation>
--- a/linphone-app/assets/languages/en.ts
+++ b/linphone-app/assets/languages/en.ts
@ -1367,11 +1367,11 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
    </message>
    <message>
        <source>sipUdpPortLabel</source>
-        <translation>SIP UDP port</translation>
+        <translation>Set SIP/UDP listening port</translation>
    </message>
    <message>
        <source>sipTcpPortLabel</source>
-        <translation>SIP TCP port</translation>
+        <translation>Set SIP/TCP listening port</translation>
    </message>
    <message>
        <source>audioRtpUdpPortLabel</source>
@ -1381,18 +1381,6 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Video RTP UDP port</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Use a random port</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Enabled port</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP Fields</translation>
--- a/linphone-app/assets/languages/es.ts
+++ b/linphone-app/assets/languages/es.ts
@ -1379,18 +1379,6 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Puerto vídeo RTP UDP</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Usar puerto aleatorio</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Puerto activado</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>Campos DSCP</translation>
--- a/linphone-app/assets/languages/fr_FR.ts
+++ b/linphone-app/assets/languages/fr_FR.ts
@ -1365,11 +1365,11 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
    </message>
    <message>
        <source>sipUdpPortLabel</source>
-        <translation>Port SIP UDP</translation>
+        <translation>Port d&apos;écoute SIP UDP</translation>
    </message>
    <message>
        <source>sipTcpPortLabel</source>
-        <translation>Port SIP TCP</translation>
+        <translation>Port d&apos;écoute SIP TCP</translation>
    </message>
    <message>
        <source>audioRtpUdpPortLabel</source>
@ -1379,18 +1379,6 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Port Vidéo RTP UDP</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Utiliser un port aléatoire</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Port activé</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>Champs DSCP</translation>
--- a/linphone-app/assets/languages/hu.ts
+++ b/linphone-app/assets/languages/hu.ts
@ -1378,18 +1378,6 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</translation>
        <source>videoRtpUdpPortLabel</source>
        <translation>Videó RTP UDP kikötő</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Kikötő</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Véletlenszerű kikötő használata</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Engedélyezett kikötő</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP mezők</translation>
--- a/linphone-app/assets/languages/it.ts
+++ b/linphone-app/assets/languages/it.ts
@ -1379,18 +1379,6 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Porta UDP video RTP</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Porta</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Usa una porta random</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Porta abilitata</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>Campi DSCP</translation>
--- a/linphone-app/assets/languages/ja.ts
+++ b/linphone-app/assets/languages/ja.ts
@ -1379,18 +1379,6 @@
        <source>videoRtpUdpPortLabel</source>
        <translation>ビデオRTP UDPポート</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>ポート</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>ランダムポートを使用</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>有効なポート</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCPフィールド</translation>
--- a/linphone-app/assets/languages/lt.ts
+++ b/linphone-app/assets/languages/lt.ts
@ -1379,18 +1379,6 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Vaizdo RTP UDP prievadas</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Prievadas</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Naudoti atsitiktinį prievadą</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Įjungtas prievadas</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP laukai</translation>
--- a/linphone-app/assets/languages/pt_BR.ts
+++ b/linphone-app/assets/languages/pt_BR.ts
@ -1378,18 +1378,6 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;</translation>
        <source>videoRtpUdpPortLabel</source>
        <translation>Porta UDP RTP de vídeo</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Portão</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Usar uma porta aleatória</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Porta habilitada</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>Campos DSCP</translation>
--- a/linphone-app/assets/languages/ru.ts
+++ b/linphone-app/assets/languages/ru.ts
@ -1379,18 +1379,6 @@
        <source>videoRtpUdpPortLabel</source>
        <translation>UDP порт RTP видео</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Использовать случайный порт</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Включенный порт</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>Поля DSCP</translation>
--- a/linphone-app/assets/languages/sv.ts
+++ b/linphone-app/assets/languages/sv.ts
@ -1379,18 +1379,6 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Video-RTP UDP-port</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Använd en slumpmässig port</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Aktiverad port</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP-fält</translation>
--- a/linphone-app/assets/languages/tr.ts
+++ b/linphone-app/assets/languages/tr.ts
@ -1379,18 +1379,6 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
        <source>videoRtpUdpPortLabel</source>
        <translation>Görüntü RTP UDP bağlantı noktası</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Bağlantı noktası</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Rastgele bir bağlantı noktası kullan</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Etkin bağlantı noktası</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP Alanları</translation>
--- a/linphone-app/assets/languages/uk.ts
+++ b/linphone-app/assets/languages/uk.ts
@ -1379,18 +1379,6 @@
        <source>videoRtpUdpPortLabel</source>
        <translation>UDP порт RTP відео</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>Використовувати випадковий порт</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>Увімкнений порт</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>Поля DSCP</translation>
--- a/linphone-app/assets/languages/zh_CN.ts
+++ b/linphone-app/assets/languages/zh_CN.ts
@ -1379,18 +1379,6 @@
        <source>videoRtpUdpPortLabel</source>
        <translation>视频 RTP UDP 端口</translation>
    </message>
-    <message>
-        <source>portHeader</source>
-        <translation>端口</translation>
-    </message>
-    <message>
-        <source>randomPortHeader</source>
-        <translation>使用随机端口</translation>
-    </message>
-    <message>
-        <source>enabledPortHeader</source>
-        <translation>一起用端口</translation>
-    </message>
    <message>
        <source>dscpFieldsTitle</source>
        <translation>DSCP 域</translation>
--- a/linphone-app/ui/views/App/Settings/SettingsNetwork.qml
+++ b/linphone-app/ui/views/App/Settings/SettingsNetwork.qml
@ -152,88 +152,67 @@ TabContainer {
      width: parent.width

      FormTable {
-        titles: [
-          qsTr('portHeader'),
-          qsTr('randomPortHeader'),
-          qsTr('enabledPortHeader')
-        ]
+        titles: []
+

        FormTableLine {
          title: qsTr('sipUdpPortLabel')

+
+          FormTableEntry {
+            width:fixSipUdpPort.width
+            Switch {
+              id: fixSipUdpPort
+
+              readonly property int defaultPort: 5060
+
+              checked: SettingsModel.udpPort > 0
+
+              onClicked: SettingsModel.udpPort = (checked ? -2 : defaultPort)
+            }
+          }
+          
          FormTableEntry {
            NumericField {
              minValue: 1
              maxValue: 65535
-              readOnly: randomSipUdpPort.checked || !enableSipUdpPort.checked
+              readOnly: !fixSipUdpPort.checked
+              visible:fixSipUdpPort.checked

              text: SettingsModel.udpPort

              onEditingFinished: SettingsModel.udpPort = text
            }
          }
-
-          FormTableEntry {
-            Switch {
-              id: randomSipUdpPort
-
-              readonly property int defaultPort: 5060
-
-              checked: SettingsModel.udpPort === -1
-              enabled: enableSipUdpPort.checked
-
-              onClicked: SettingsModel.udpPort = checked ? defaultPort : -1
-            }
-          }
-
-          FormTableEntry {
-            Switch {
-              id: enableSipUdpPort
-
-              checked: SettingsModel.udpPort !== 0
-
-              onClicked: SettingsModel.udpPort = checked ? 0 : -1
-            }
-          }
        }

        FormTableLine {
          title: qsTr('sipTcpPortLabel')

+          FormTableEntry {
+            width:fixSipTcpPort.width
+            Switch {
+              id: fixSipTcpPort
+
+              readonly property int defaultPort: 5060
+
+              checked: SettingsModel.tcpPort > 0 
+
+              onClicked: SettingsModel.tcpPort = (checked ? -2 : defaultPort)
+            }
+          }
          FormTableEntry {
            NumericField {
              minValue: 1
              maxValue: 65535
-              readOnly: randomSipTcpPort.checked || !enableSipTcpPort.checked
+              readOnly: !fixSipTcpPort.checked
+              visible:fixSipTcpPort.checked

              text: SettingsModel.tcpPort

              onEditingFinished: SettingsModel.tcpPort = text
            }
          }
-
-          FormTableEntry {
-            Switch {
-              id: randomSipTcpPort
-
-              readonly property int defaultPort: 5060
-
-              checked: SettingsModel.tcpPort === -1
-              enabled: enableSipTcpPort.checked
-
-              onClicked: SettingsModel.tcpPort = checked ? defaultPort : -1
-            }
-          }
-
-          FormTableEntry {
-            Switch {
-              id: enableSipTcpPort
-
-              checked: SettingsModel.tcpPort !== 0
-
-              onClicked: SettingsModel.tcpPort = checked ? 0 : -1
-            }
-          }
        }

        FormTableLine {
@ -244,24 +223,27 @@ TabContainer {
          title: qsTr('audioRtpUdpPortLabel')

          FormTableEntry {
-            PortField {
-              readOnly: randomAudioRtpUdpPort.checked
-              supportsRange: true
-              text: SettingsModel.audioPortRange.join(':')
+          
+            width:randomAudioRtpUdpPort.width
+            Switch {
+              id: randomAudioRtpUdpPort

-              onEditingFinished: SettingsModel.audioPortRange = [ portA, portB ]
+              checked: SettingsModel.audioPortRange[0] !== -1
+
+              onClicked: SettingsModel.audioPortRange = checked
+                ? [ -1, -1 ]
+                : [ audioRtpUdpPort.defaultPort, -1 ]
            }
          }

          FormTableEntry {
-            Switch {
-              id: randomAudioRtpUdpPort
+            PortField {
+              readOnly: !randomAudioRtpUdpPort.checked
+              visible: randomAudioRtpUdpPort.checked
+              supportsRange: true
+              text: SettingsModel.audioPortRange.join(':')

-              checked: SettingsModel.audioPortRange[0] === -1
-
-              onClicked: SettingsModel.audioPortRange = checked
-                ? [ audioRtpUdpPort.defaultPort, -1 ]
-                : [ -1, -1 ]
+              onEditingFinished: SettingsModel.audioPortRange = [ portA, portB ]
            }
          }
        }
@ -275,24 +257,26 @@ TabContainer {
          visible: SettingsModel.videoSupported

          FormTableEntry {
-            PortField {
-              readOnly: randomVideoRtpUdpPort.checked
-              supportsRange: true
-              text: SettingsModel.videoPortRange.join(':')
+            width:randomVideoRtpUdpPort.width
+            Switch {
+              id: randomVideoRtpUdpPort

-              onEditingFinished: SettingsModel.videoPortRange = [ portA, portB ]
+              checked: SettingsModel.videoPortRange[0] !== -1
+
+              onClicked: SettingsModel.videoPortRange = checked
+                ? [ -1, -1 ]
+                : [ videoRtpUdpPort.defaultPort, -1 ]
            }
          }

          FormTableEntry {
-            Switch {
-              id: randomVideoRtpUdpPort
+            PortField {
+              readOnly: !randomVideoRtpUdpPort.checked
+              visible: randomVideoRtpUdpPort.checked
+              supportsRange: true
+              text: SettingsModel.videoPortRange.join(':')

-              checked: SettingsModel.videoPortRange[0] === -1
-
-              onClicked: SettingsModel.videoPortRange = checked
-                ? [ videoRtpUdpPort.defaultPort, -1 ]
-                : [ -1, -1 ]
+              onEditingFinished: SettingsModel.videoPortRange = [ portA, portB ]
            }
          }
        }