From 1086fdaeb026df49fcdecd5544a2f388733b2258 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 20 Apr 2017 15:51:57 +0200 Subject: [PATCH] feat(ui/views/App/Settings/SettingsNetwork): supports tls port --- .../src/components/settings/SettingsModel.cpp | 16 ++++++++++++++++ .../src/components/settings/SettingsModel.hpp | 5 +++++ .../ui/views/App/Settings/SettingsNetwork.qml | 6 +++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/linphone-desktop/src/components/settings/SettingsModel.cpp b/linphone-desktop/src/components/settings/SettingsModel.cpp index 305872ca8..676f6f1b3 100644 --- a/linphone-desktop/src/components/settings/SettingsModel.cpp +++ b/linphone-desktop/src/components/settings/SettingsModel.cpp @@ -440,6 +440,22 @@ void SettingsModel::setUdpPort (int port) { // ----------------------------------------------------------------------------- +int SettingsModel::getTlsPort () const { + return CoreManager::getInstance()->getCore()->getTransports()->getTlsPort(); +} + +void SettingsModel::setTlsPort (int port) { + shared_ptr core = CoreManager::getInstance()->getCore(); + shared_ptr transports = core->getTransports(); + + transports->setTlsPort(port); + core->setTransports(transports); + + emit tlsPortChanged(port); +} + +// ----------------------------------------------------------------------------- + QList SettingsModel::getAudioPortRange () const { shared_ptr range = CoreManager::getInstance()->getCore()->getAudioPortsRange(); return QList() << range->getMin() << range->getMax(); diff --git a/linphone-desktop/src/components/settings/SettingsModel.hpp b/linphone-desktop/src/components/settings/SettingsModel.hpp index 427bdbacf..ce3161df5 100644 --- a/linphone-desktop/src/components/settings/SettingsModel.hpp +++ b/linphone-desktop/src/components/settings/SettingsModel.hpp @@ -92,6 +92,7 @@ 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 audioPortRange READ getAudioPortRange WRITE setAudioPortRange NOTIFY audioPortRangeChanged); Q_PROPERTY(QList videoPortRange READ getVideoPortRange WRITE setVideoPortRange NOTIFY videoPortRangeChanged); @@ -220,6 +221,9 @@ public: int getUdpPort () const; void setUdpPort (int port); + int getTlsPort () const; + void setTlsPort (int port); + QList getAudioPortRange () const; void setAudioPortRange (const QList &range); @@ -309,6 +313,7 @@ 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); diff --git a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml index 6799e0a43..0dbc92a6d 100644 --- a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml +++ b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml @@ -256,7 +256,11 @@ TabContainer { FormGroup { label: qsTr('enableTlsLabel') - Switch {} + Switch { + checked: SettingsModel.tlsPort !== 0 + + onClicked: SettingsModel.tlsPort = checked ? 0 : -1 + } } } }