mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-24 15:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/views/App/Settings/SettingsNetwork): view in progress

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-14 14:30:47 +01:00
parent 4404cca269
commit e84c5e2ee5
13 changed files with 84 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-desktop/assets/languages/en.ts
View file

@ -613,7 +613,7 @@ Server url not configured.</translation>
</message>
<message>
<source>randomSipUdpPortLabel</source>
<translation>Random</translation>
<translation type="vanished">Random</translation>
</message>
<message>
<source>sipTcpPortLabel</source>
@ -621,7 +621,7 @@ Server url not configured.</translation>
</message>
<message>
<source>randomSipTcpPortLabel</source>
<translation>Random</translation>
<translation type="vanished">Random</translation>
</message>
<message>
<source>audioRtpUdpPortLabel</source>
@ -629,11 +629,11 @@ Server url not configured.</translation>
</message>
<message>
<source>randomAudioRtpUdpPortLabel</source>
<translation>Random</translation>
<translation type="vanished">Random</translation>
</message>
<message>
<source>randomVideoRtpUdpPortLabel</source>
<translation>Random</translation>
<translation type="vanished">Random</translation>
</message>
<message>
<source>videoRtpUdpPortLabel</source>

8
linphone-desktop/assets/languages/fr.ts
View file

@ -623,7 +623,7 @@ Url du serveur non configurée.</translation>
</message>
<message>
<source>randomSipUdpPortLabel</source>
<translation>Aléatoire</translation>
<translation type="vanished">Aléatoire</translation>
</message>
<message>
<source>sipTcpPortLabel</source>
@ -631,7 +631,7 @@ Url du serveur non configurée.</translation>
</message>
<message>
<source>randomSipTcpPortLabel</source>
<translation>Aléatoire</translation>
<translation type="vanished">Aléatoire</translation>
</message>
<message>
<source>audioRtpUdpPortLabel</source>
@ -639,11 +639,11 @@ Url du serveur non configurée.</translation>
</message>
<message>
<source>randomAudioRtpUdpPortLabel</source>
<translation>Aléatoire</translation>
<translation type="vanished">Aléatoire</translation>
</message>
<message>
<source>randomVideoRtpUdpPortLabel</source>
<translation>Aléatoire</translation>
<translation type="vanished">Aléatoire</translation>
</message>
<message>
<source>videoRtpUdpPortLabel</source>

13
linphone-desktop/resources.qrc
View file

@ -181,10 +181,11 @@
<file>ui/modules/Common/Form/ExclusiveButtons.qml</file>
<file>ui/modules/Common/Form/Fields/NumericField.qml</file>
<file>ui/modules/Common/Form/Fields/TextField.qml</file>
<file>ui/modules/Common/Form/FormGroup.qml</file>
<file>ui/modules/Common/Form/FormLine.qml</file>
<file>ui/modules/Common/Form/Form.qml</file>
<file>ui/modules/Common/Form/ListForm.qml</file>
<file>ui/modules/Common/Form/Placements/FormEntry.qml</file>
<file>ui/modules/Common/Form/Placements/FormGroup.qml</file>
<file>ui/modules/Common/Form/Placements/FormLine.qml</file>
<file>ui/modules/Common/Form/Placements/Form.qml</file>
<file>ui/modules/Common/Form/SmallButton.qml</file>
<file>ui/modules/Common/Form/StaticListForm.qml</file>
<file>ui/modules/Common/Form/Switch.qml</file>
@ -221,10 +222,10 @@
<file>ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml</file>
<file>ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml</file>
<file>ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml</file>
<file>ui/modules/Common/Styles/Form/FormGroupStyle.qml</file>
<file>ui/modules/Common/Styles/Form/FormLineStyle.qml</file>
<file>ui/modules/Common/Styles/Form/FormStyle.qml</file>
<file>ui/modules/Common/Styles/Form/ListFormStyle.qml</file>
<file>ui/modules/Common/Styles/Form/Placements/FormGroupStyle.qml</file>
<file>ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml</file>
<file>ui/modules/Common/Styles/Form/Placements/FormStyle.qml</file>
<file>ui/modules/Common/Styles/Form/SmallButtonStyle.qml</file>
<file>ui/modules/Common/Styles/Form/SwitchStyle.qml</file>
<file>ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml</file>

0
linphone-desktop/ui/modules/Common/Form/Form.qml → linphone-desktop/ui/modules/Common/Form/Placements/Form.qml
View file

30
linphone-desktop/ui/modules/Common/Form/Placements/FormEntry.qml Normal file
View file

@ -0,0 +1,30 @@
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common.Styles 1.0
// =============================================================================
// Like a `FormGroup` but without label.
// =============================================================================
RowLayout {
default property alias _content: content.data
// ---------------------------------------------------------------------------
spacing: 0
width: FormGroupStyle.content.width
Item {
id: content
readonly property int currentHeight: _content[0] ? _content[0].height : 0
Layout.alignment: (
currentHeight < FormGroupStyle.legend.height ? Qt.AlignVCenter : Qt.AlignTop
) | Qt.AlignHCenter
Layout.preferredHeight: currentHeight
Layout.maximumWidth: FormGroupStyle.content.width
}
}

11
linphone-desktop/ui/modules/Common/Form/FormGroup.qml → linphone-desktop/ui/modules/Common/Form/Placements/FormGroup.qml
View file

@ -31,13 +31,14 @@ RowLayout {
Item {
id: content
Layout.alignment: {
var height = _content[0] ? _content[0].height : 0
return height < label.height ? Qt.AlignVCenter : Qt.AlignTop
}
readonly property int currentHeight: _content[0] ? _content[0].height : 0
Layout.alignment: currentHeight < FormGroupStyle.legend.height
? Qt.AlignVCenter
: Qt.AlignTop
Layout.maximumWidth: FormGroupStyle.content.width
Layout.preferredHeight: _content[0] ? _content[0].height : 0
Layout.preferredHeight: currentHeight
Layout.preferredWidth: FormGroupStyle.content.width
}
}

0
linphone-desktop/ui/modules/Common/Form/FormLine.qml → linphone-desktop/ui/modules/Common/Form/Placements/FormLine.qml
View file

0
linphone-desktop/ui/modules/Common/Styles/Form/FormGroupStyle.qml → linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormGroupStyle.qml
View file

0
linphone-desktop/ui/modules/Common/Styles/Form/FormLineStyle.qml → linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml
View file

0
linphone-desktop/ui/modules/Common/Styles/Form/FormStyle.qml → linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml
View file

7
linphone-desktop/ui/modules/Common/Styles/qmldir
View file

@ -17,6 +17,10 @@ singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton NumericFieldStyle 1.0 Form/Fields/NumericFieldStyle.qml
singleton TextFieldStyle 1.0 Form/Fields/TextFieldStyle.qml
singleton FormGroupStyle 1.0 Form/Placements/FormGroupStyle.qml
singleton FormLineStyle 1.0 Form/Placements/FormLineStyle.qml
singleton FormStyle 1.0 Form/Placements/FormStyle.qml
singleton TabButtonStyle 1.0 Form/Tab/TabButtonStyle.qml
singleton TabContainerStyle 1.0 Form/Tab/TabContainerStyle.qml
@ -24,9 +28,6 @@ singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml
singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml
singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml
singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton FormGroupStyle 1.0 Form/FormGroupStyle.qml
singleton FormLineStyle 1.0 Form/FormLineStyle.qml
singleton FormStyle 1.0 Form/FormStyle.qml
singleton ListFormStyle 1.0 Form/ListFormStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton SwitchStyle 1.0 Form/SwitchStyle.qml

8
linphone-desktop/ui/modules/Common/qmldir
View file

@ -34,6 +34,11 @@ ForceScrollBar 1.0 ForceScrollBar.qml
NumericField 1.0 Form/Fields/NumericField.qml
TextField 1.0 Form/Fields/TextField.qml
Form 1.0 Form/Placements/Form.qml
FormEntry 1.0 Form/Placements/FormEntry.qml
FormGroup 1.0 Form/Placements/FormGroup.qml
FormLine 1.0 Form/Placements/FormLine.qml
TabBar 1.0 Form/Tab/TabBar.qml
TabButton 1.0 Form/Tab/TabButton.qml
TabContainer 1.0 Form/Tab/TabContainer.qml
@ -43,9 +48,6 @@ ActionButton 1.0 Form/ActionButton.qml
ActionSwitch 1.0 Form/ActionSwitch.qml
CheckBoxText 1.0 Form/CheckBoxText.qml
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
Form 1.0 Form/Form.qml
FormGroup 1.0 Form/FormGroup.qml
FormLine 1.0 Form/FormLine.qml
LightButton 1.0 Form/LightButton.qml
ListForm 1.0 Form/ListForm.qml
StaticListForm 1.0 Form/StaticListForm.qml

46
linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml
View file

@ -67,9 +67,7 @@ TabContainer {
}
}
FormGroup {
label: qsTr('randomSipUdpPortLabel')
FormEntry {
Switch {
id: randomSipUdpPort
@ -77,8 +75,10 @@ TabContainer {
}
}
Switch {
id: enableSipUdpPort
FormEntry {
Switch {
id: enableSipUdpPort
}
}
}
@ -91,9 +91,7 @@ TabContainer {
}
}
FormGroup {
label: qsTr('randomSipTcpPortLabel')
FormEntry {
Switch {
id: randomSipTcpPort
@ -101,8 +99,10 @@ TabContainer {
}
}
Switch {
id: enableSipTcpPort
FormEntry {
Switch {
id: enableSipTcpPort
}
}
}
@ -115,9 +115,7 @@ TabContainer {
}
}
FormGroup {
label: qsTr('randomAudioRtpUdpPortLabel')
FormEntry {
Switch {
id: randomAudioRtpUdpPort
@ -125,8 +123,10 @@ TabContainer {
}
}
Switch {
id: enableAudioRtpUdpPort
FormEntry {
Switch {
id: enableAudioRtpUdpPort
}
}
}
@ -139,9 +139,7 @@ TabContainer {
}
}
FormGroup {
label: qsTr('randomVideoRtpUdpPortLabel')
FormEntry {
Switch {
id: randomVideoRtpUdpPort
@ -149,8 +147,10 @@ TabContainer {
}
}
Switch {
id: enableVideoRtpUdpPort
FormEntry {
Switch {
id: enableVideoRtpUdpPort
}
}
}
}
@ -187,6 +187,8 @@ TabContainer {
Switch {
id: enableTurn
enabled: enableIce.checked
}
}
@ -194,7 +196,7 @@ TabContainer {
label: qsTr('turnUserLabel')
TextField {
readOnly: !enableTurn.checked
readOnly: !enableTurn.checked || !enableTurn.enabled
}
}
}
@ -209,7 +211,7 @@ TabContainer {
TextField {
echoMode: TextInput.Password
readOnly: !enableTurn.checked
readOnly: !enableTurn.checked || !enableTurn.enabled
}
}
}