diff --git a/linphone-desktop/assets/images/linphone.png b/linphone-desktop/assets/images/linphone.png deleted file mode 100644 index 4031d7205..000000000 Binary files a/linphone-desktop/assets/images/linphone.png and /dev/null differ diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index 4ce35647b..a5cb65f71 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -557,6 +557,29 @@ Server url not configured. Delay (in ms) + + SettingsNetwork + + forceMtuLabel + Forcer MTU + + + mtuLabel + MTU + + + sendDtmfsLabel + Send DTMFs as SIP info + + + allowIpV6Label + Allow IPv6 + + + transportTitle + Transport + + SettingsWindow diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index edca709df..f5112358d 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -567,6 +567,29 @@ Url du serveur non configurée. Délai (en ms) + + SettingsNetwork + + forceMtuLabel + Forcer MTU + + + mtuLabel + MTU + + + sendDtmfsLabel + Envoyer DTMFs en SIP info + + + allowIpV6Label + Autoriser IPv6 + + + transportTitle + Transport + + SettingsWindow diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml index 43c783c63..2c1f7a8bd 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.0 import Common 1.0 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Switch.qml b/linphone-desktop/ui/modules/Common/Form/Switch.qml index 6dd66f2ac..340f71f64 100644 --- a/linphone-desktop/ui/modules/Common/Form/Switch.qml +++ b/linphone-desktop/ui/modules/Common/Form/Switch.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.0 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml index 257da8878..9398c574d 100644 --- a/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml +++ b/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.0 // ============================================================================= diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml index d9b64716d..ac632de83 100644 --- a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 as Controls +import QtQuick.Controls 2.0 as Controls import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/FormGroupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/FormGroupStyle.qml index 62ec85e53..2561de9ef 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/FormGroupStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/FormGroupStyle.qml @@ -10,13 +10,13 @@ QtObject { property QtObject content: QtObject { property int height: 300 - property int width: 300 + property int width: 200 } property QtObject legend: QtObject { property color color: Colors.j property int fontSize: 10 property int height: 36 - property int width: 150 + property int width: 200 } } diff --git a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml index f5c0de773..ef2eb4e5c 100644 --- a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml +++ b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml @@ -2,8 +2,57 @@ import QtQuick 2.7 import Common 1.0 +import App.Styles 1.0 + // ============================================================================= TabContainer { + Column { + anchors.fill: parent + spacing: SettingsWindowStyle.forms.spacing + // ------------------------------------------------------------------------- + // Transport. + // ------------------------------------------------------------------------- + + Form { + title: qsTr('transportTitle') + width: parent.width + + FormLine { + FormGroup { + label: qsTr('forceMtuLabel') + + Switch { + id: forceMtu + } + } + + FormGroup { + label: qsTr('mtuLabel') + + NumericField { + readOnly: !forceMtu.checked + } + } + } + + FormGroup { + label: qsTr('sendDtmfsLabel') + + Switch {} + } + + FormGroup { + label: qsTr('allowIpV6Label') + + Switch {} + } + } + + // ------------------------------------------------------------------------- + // Network protocol and ports. + // ------------------------------------------------------------------------- + + } } diff --git a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml index f9343737a..58825af50 100644 --- a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml +++ b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import Common 1.0