mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-06 20:23:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(SettingsModel): remove misunderstood tls enabled button

Browse source
This commit is contained in:
Ronan Abhamon 2018-08-09 14:44:45 +02:00
parent b2e96277c6
commit c59a68c2d6
12 changed files with 0 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/languages/de.ts
View file

@ -1326,10 +1326,6 @@ Server URL ist nicht konfiguriert.</translation>
<source>enabledPortHeader</source>
<translation>Aktivierter Port</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>TLS aktivieren</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>DSCP-Felder</translation>

4
assets/languages/en.ts
View file

@ -1331,10 +1331,6 @@ your friend&apos;s SIP address or username.</translation>
<source>enabledPortHeader</source>
<translation>Enabled port</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>Enable TLS</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>DSCP Fields</translation>

4
assets/languages/fr_FR.ts
View file

@ -1329,10 +1329,6 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>enabledPortHeader</source>
<translation>Port activé</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>Activer TLS</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>Champs DSCP</translation>

4
assets/languages/ja.ts
View file

@ -1326,10 +1326,6 @@
<source>enabledPortHeader</source>
<translation>有効なポート</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>TLSを有効にする</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>DSCPフィールド</translation>

4
assets/languages/lt.ts
View file

@ -1331,10 +1331,6 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą.</translation>
<source>enabledPortHeader</source>
<translation>Įjungtas prievadas</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>Įjungti TLS</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>DSCP laukai</translation>

4
assets/languages/pt_BR.ts
View file

@ -1331,10 +1331,6 @@ o endereço SIP ou nome de usuário do seu amigo.</translation>
<source>enabledPortHeader</source>
<translation>Habilitar porta</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>Habilitar TLS</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>Campos DSCP</translation>

4
assets/languages/ru.ts
View file

@ -1329,10 +1329,6 @@
<source>enabledPortHeader</source>
<translation>Включенный порт</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>Включить TLS</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>Поля DSCP</translation>

4
assets/languages/sv.ts
View file

@ -1329,10 +1329,6 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>enabledPortHeader</source>
<translation>Aktiverad port</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>Aktivera TLS</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>DSCP-fält</translation>

4
assets/languages/tr.ts
View file

@ -1328,10 +1328,6 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin.</translation>
<source>enabledPortHeader</source>
<translation>Etkin bağlantı noktası</translation>
</message>
<message>
<source>enableTlsLabel</source>
<translation>TLS&apos;yi etkinleştir</translation>
</message>
<message>
<source>dscpFieldsTitle</source>
<translation>DSCP Alanları</translation>

16
src/components/settings/SettingsModel.cpp
View file

@ -702,22 +702,6 @@ void SettingsModel::setUdpPort (int port) {
// -----------------------------------------------------------------------------
int SettingsModel::getTlsPort () const {
return CoreManager::getInstance()->getCore()->getTransports()->getTlsPort();
}
void SettingsModel::setTlsPort (int port) {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
shared_ptr<linphone::Transports> transports = core->getTransports();
transports->setTlsPort(port);
core->setTransports(transports);
emit tlsPortChanged(port);
}
// -----------------------------------------------------------------------------
QList<int> SettingsModel::getAudioPortRange () const {
shared_ptr<linphone::Range> range = CoreManager::getInstance()->getCore()->getAudioPortsRange();
return QList<int>() << range->getMin() << range->getMax();

5
src/components/settings/SettingsModel.hpp
View file

@ -132,7 +132,6 @@ class SettingsModel : public QObject {
Q_PROPERTY(int tcpPort READ getTcpPort WRITE setTcpPort NOTIFY tcpPortChanged);
Q_PROPERTY(int udpPort READ getUdpPort WRITE setUdpPort NOTIFY udpPortChanged);
Q_PROPERTY(int tlsPort READ getTlsPort WRITE setTlsPort NOTIFY tlsPortChanged);
Q_PROPERTY(QList<int> audioPortRange READ getAudioPortRange WRITE setAudioPortRange NOTIFY audioPortRangeChanged);
Q_PROPERTY(QList<int> videoPortRange READ getVideoPortRange WRITE setVideoPortRange NOTIFY videoPortRangeChanged);
@ -343,9 +342,6 @@ public:
int getUdpPort () const;
void setUdpPort (int port);
int getTlsPort () const;
void setTlsPort (int port);
QList<int> getAudioPortRange () const;
void setAudioPortRange (const QList<int> &range);
@ -509,7 +505,6 @@ signals:
void tcpPortChanged (int port);
void udpPortChanged (int port);
void tlsPortChanged (int port);
void audioPortRangeChanged (int a, int b);
void videoPortRangeChanged (int a, int b);

14
ui/views/App/Settings/SettingsNetwork.qml
View file

@ -297,20 +297,6 @@ TabContainer {
}
}
}
FormEmptyLine {}
FormLine {
FormGroup {
label: qsTr('enableTlsLabel')
Switch {
checked: SettingsModel.tlsPort !== 0
onClicked: SettingsModel.tlsPort = checked ? 0 : -1
}
}
}
}
// -------------------------------------------------------------------------