From a0431801b55ecadbe18326110d07d30f634c8124 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 13 Feb 2017 16:32:58 +0100 Subject: [PATCH] feat(ui/views/App/Settings/SettingsNetwork): view in progress --- linphone-desktop/assets/images/linphone.png | Bin 2733 -> 0 bytes linphone-desktop/assets/languages/en.ts | 23 ++++++++ linphone-desktop/assets/languages/fr.ts | 23 ++++++++ .../Common/Form/Fields/NumericField.qml | 2 +- .../ui/modules/Common/Form/Switch.qml | 2 +- .../ui/modules/Common/Form/Tab/TabBar.qml | 2 +- .../ui/modules/Common/Form/Tab/TabButton.qml | 2 +- .../Common/Styles/Form/FormGroupStyle.qml | 4 +- .../ui/views/App/Settings/SettingsNetwork.qml | 49 ++++++++++++++++++ .../ui/views/App/Settings/SettingsWindow.qml | 2 +- 10 files changed, 102 insertions(+), 7 deletions(-) delete mode 100644 linphone-desktop/assets/images/linphone.png diff --git a/linphone-desktop/assets/images/linphone.png b/linphone-desktop/assets/images/linphone.png deleted file mode 100644 index 4031d72056a20472c6b99b0b79c8dfd6b1c5ce95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2733 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 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