diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 019319cb2..589bf7cb0 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -1379,18 +1379,6 @@ Klik her: <a href="%1">%1</a> videoRtpUdpPortLabel Video RTP UDP port - - portHeader - Port - - - randomPortHeader - Brug en tilfældig port - - - enabledPortHeader - Aktiveret port - dscpFieldsTitle DSCP felter diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index beb3802ee..8bd3dcf5c 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -1379,18 +1379,6 @@ Klicken Sie hier: <a href="%1">%1</a> videoRtpUdpPortLabel Video RTP UDP Port - - portHeader - Port - - - randomPortHeader - Zufälligen Port verwenden - - - enabledPortHeader - Aktivierter Port - dscpFieldsTitle DSCP-Felder diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 3585a0814..393afd92d 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -1367,11 +1367,11 @@ Click here: <a href="%1">%1</a> sipUdpPortLabel - SIP UDP port + Set SIP/UDP listening port sipTcpPortLabel - SIP TCP port + Set SIP/TCP listening port audioRtpUdpPortLabel @@ -1381,18 +1381,6 @@ Click here: <a href="%1">%1</a> videoRtpUdpPortLabel Video RTP UDP port - - portHeader - Port - - - randomPortHeader - Use a random port - - - enabledPortHeader - Enabled port - dscpFieldsTitle DSCP Fields diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 49d65902c..e40aa9bbf 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -1379,18 +1379,6 @@ Haga clic aquí: <a href="%1">%1 </a> videoRtpUdpPortLabel Puerto vídeo RTP UDP - - portHeader - Puerto - - - randomPortHeader - Usar puerto aleatorio - - - enabledPortHeader - Puerto activado - dscpFieldsTitle Campos DSCP diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index dc90cfbb1..4fca75aed 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -1365,11 +1365,11 @@ Cliquez ici : <a href="%1">%1</a> sipUdpPortLabel - Port SIP UDP + Port d'écoute SIP UDP sipTcpPortLabel - Port SIP TCP + Port d'écoute SIP TCP audioRtpUdpPortLabel @@ -1379,18 +1379,6 @@ Cliquez ici : <a href="%1">%1</a> videoRtpUdpPortLabel Port Vidéo RTP UDP - - portHeader - Port - - - randomPortHeader - Utiliser un port aléatoire - - - enabledPortHeader - Port activé - dscpFieldsTitle Champs DSCP diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 66a03428d..27c3c8924 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -1378,18 +1378,6 @@ Kattintson ide: <a href="%1">%1</a> videoRtpUdpPortLabel Videó RTP UDP kikötő - - portHeader - Kikötő - - - randomPortHeader - Véletlenszerű kikötő használata - - - enabledPortHeader - Engedélyezett kikötő - dscpFieldsTitle DSCP mezők diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 90e911d82..b03a0227d 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -1379,18 +1379,6 @@ Clicca: <a href="%1">%1</a> videoRtpUdpPortLabel Porta UDP video RTP - - portHeader - Porta - - - randomPortHeader - Usa una porta random - - - enabledPortHeader - Porta abilitata - dscpFieldsTitle Campi DSCP diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index fcc4c6643..42d6584a1 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -1379,18 +1379,6 @@ videoRtpUdpPortLabel ビデオRTP UDPポート - - portHeader - ポート - - - randomPortHeader - ランダムポートを使用 - - - enabledPortHeader - 有効なポート - dscpFieldsTitle DSCPフィールド diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index a1bbb04f7..db71da49b 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -1379,18 +1379,6 @@ Spustelėkite čia: <a href="%1">%1</a> videoRtpUdpPortLabel Vaizdo RTP UDP prievadas - - portHeader - Prievadas - - - randomPortHeader - Naudoti atsitiktinį prievadą - - - enabledPortHeader - Įjungtas prievadas - dscpFieldsTitle DSCP laukai diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 6d207fb46..5ca09d079 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -1378,18 +1378,6 @@ Clique aqui: <a href="%1">%1 </a> videoRtpUdpPortLabel Porta UDP RTP de vídeo - - portHeader - Portão - - - randomPortHeader - Usar uma porta aleatória - - - enabledPortHeader - Porta habilitada - dscpFieldsTitle Campos DSCP diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 3be35b04b..28edf5c36 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -1379,18 +1379,6 @@ videoRtpUdpPortLabel UDP порт RTP видео - - portHeader - Порт - - - randomPortHeader - Использовать случайный порт - - - enabledPortHeader - Включенный порт - dscpFieldsTitle Поля DSCP diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index ec1e511c4..1f5581297 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -1379,18 +1379,6 @@ Klicka här: <a href="%1">%1</a> videoRtpUdpPortLabel Video-RTP UDP-port - - portHeader - Port - - - randomPortHeader - Använd en slumpmässig port - - - enabledPortHeader - Aktiverad port - dscpFieldsTitle DSCP-fält diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index c232441ad..f102f97ac 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -1379,18 +1379,6 @@ Buraya tıklayın: <a href="%1">%1</a> videoRtpUdpPortLabel Görüntü RTP UDP bağlantı noktası - - portHeader - Bağlantı noktası - - - randomPortHeader - Rastgele bir bağlantı noktası kullan - - - enabledPortHeader - Etkin bağlantı noktası - dscpFieldsTitle DSCP Alanları diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 55f7a701f..89a6f781e 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -1379,18 +1379,6 @@ videoRtpUdpPortLabel UDP порт RTP відео - - portHeader - Порт - - - randomPortHeader - Використовувати випадковий порт - - - enabledPortHeader - Увімкнений порт - dscpFieldsTitle Поля DSCP diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 22de801dc..0b7459d5f 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -1379,18 +1379,6 @@ videoRtpUdpPortLabel 视频 RTP UDP 端口 - - portHeader - 端口 - - - randomPortHeader - 使用随机端口 - - - enabledPortHeader - 一起用端口 - dscpFieldsTitle DSCP 域 diff --git a/linphone-app/ui/views/App/Settings/SettingsNetwork.qml b/linphone-app/ui/views/App/Settings/SettingsNetwork.qml index fa6f0b3bb..9be7c2e41 100644 --- 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 ] } } }