Skip to content

L
linphone-desktop
Commit 3577df44 authored by Wescoeur's avatar Wescoeur
Browse files
Options

feat(ui/modules/Linphone/Codecs): in progress

parent 4c43ae2f
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 104 deletions
linphone-desktop/assets/languages/en.ts
View file @ 3577df44
......@@ -616,6 +616,10 @@ Server url not configured.</translation>
<source>echoCancellationLabel</source>
<translation>Enable echo cancellation</translation>
</message>
<message>
<source>audioCodecsTitle</source>
<translation>Audio codecs</translation>
</message>
</context>
<context>
<name>SettingsCallsChat</name>
......@@ -819,7 +823,7 @@ Server url not configured.</translation>
</message>
<message>
<source>deleteAccountDescription</source>
<translation type="unfinished"></translation>
<translation>Are you sure you want to delete this account?</translation>
</message>
</context>
<context>
......@@ -866,11 +870,11 @@ Server url not configured.</translation>
</message>
<message>
<source>cancel</source>
<translation type="unfinished">CANCEL</translation>
<translation>CANCEL</translation>
</message>
<message>
<source>confirm</source>
<translation type="unfinished">CONFIRM</translation>
<translation>CONFIRM</translation>
</message>
</context>
<context>
......@@ -934,6 +938,10 @@ Server url not configured.</translation>
<source>videoSizeLabel</source>
<translation>Video resolution</translation>
</message>
<message>
<source>videoCodecsTitle</source>
<translation>Video codecs</translation>
</message>
</context>
<context>
<name>SettingsWindow</name>
......
linphone-desktop/assets/languages/fr.ts
View file @ 3577df44
......@@ -616,6 +616,10 @@ Url du serveur non configurée.</translation>
<source>echoCancellationLabel</source>
<translation>Activer annulation d&apos;écho</translation>
</message>
<message>
<source>audioCodecsTitle</source>
<translation>Codecs audio</translation>
</message>
</context>
<context>
<name>SettingsCallsChat</name>
......@@ -819,7 +823,7 @@ Url du serveur non configurée.</translation>
</message>
<message>
<source>deleteAccountDescription</source>
<translation type="unfinished"></translation>
<translation>Êtes-vous sûr de vouloir supprimer ce compte ?</translation>
</message>
</context>
<context>
......@@ -866,11 +870,11 @@ Url du serveur non configurée.</translation>
</message>
<message>
<source>cancel</source>
<translation type="unfinished">ANNULER</translation>
<translation>ANNULER</translation>
</message>
<message>
<source>confirm</source>
<translation type="unfinished">CONFIRMER</translation>
<translation>CONFIRMER</translation>
</message>
</context>
<context>
......@@ -934,6 +938,10 @@ Url du serveur non configurée.</translation>
<source>videoSizeLabel</source>
<translation>Définition</translation>
</message>
<message>
<source>videoCodecsTitle</source>
<translation>Codecs vidéo</translation>
</message>
</context>
<context>
<name>SettingsWindow</name>
......
linphone-desktop/resources.qrc
View file @ 3577df44
......@@ -275,6 +275,7 @@
<file>ui/modules/Linphone/Chat/Message.js</file>
<file>ui/modules/Linphone/Chat/Message.qml</file>
<file>ui/modules/Linphone/Chat/OutgoingMessage.qml</file>
<file>ui/modules/Linphone/Codecs/CodecsViewer.qml</file>
<file>ui/modules/Linphone/Contact/Avatar.qml</file>
<file>ui/modules/Linphone/Contact/ContactDescription.qml</file>
<file>ui/modules/Linphone/Contact/Contact.qml</file>
......
linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml 0 → 100644
View file @ 3577df44
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common 1.0
// =============================================================================
ColumnLayout {
property alias model: view.model
// ---------------------------------------------------------------------------
height: 350
// ---------------------------------------------------------------------------
// Header.
// ---------------------------------------------------------------------------
Row {
Layout.fillWidth: true
height: 50
}
// ---------------------------------------------------------------------------
// Codecs.
// ---------------------------------------------------------------------------
ScrollableListView {
id: view
Layout.fillWidth: true
Layout.fillHeight: true
delegate: Rectangle {
color: 'red'
height: 30
width: view.width
Row {
anchors.fill: parent
Text {
text: $codec.mime
}
Text {
text: $codec.description
}
Text {
text: $codec.channels
}
Text {
text: $codec.bitrate
}
}
}
}
}
linphone-desktop/ui/modules/Linphone/qmldir
View file @ 3577df44
......@@ -14,6 +14,8 @@ Calls 1.0 Calls/Calls.qml
Chat 1.0 Chat/Chat.qml
CodecsViewer 1.0 Codecs/CodecsViewer.qml
Avatar 1.0 Contact/Avatar.qml
Contact 1.0 Contact/Contact.qml
ContactDescription 1.0 Contact/ContactDescription.qml
......
linphone-desktop/ui/views/App/Settings/SettingsAudio.qml
View file @ 3577df44
......@@ -4,80 +4,105 @@ import Common 1.0
import Linphone 1.0
import Utils 1.0
import App.Styles 1.0
// =============================================================================
TabContainer {
Form {
title: qsTr('audioTitle')
Column {
spacing: SettingsWindowStyle.forms.spacing
width: parent.width
FormLine {
FormGroup {
label: qsTr('playbackDeviceLabel')
// -------------------------------------------------------------------------
// Audio parameters.
// -------------------------------------------------------------------------
Form {
title: qsTr('audioTitle')
width: parent.width
FormLine {
FormGroup {
label: qsTr('playbackDeviceLabel')
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.playbackDevice
})
model: SettingsModel.audioDevices
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.playbackDevice
})
model: SettingsModel.audioDevices
onActivated: SettingsModel.playbackDevice = model[index]
onActivated: SettingsModel.playbackDevice = model[index]
}
}
}
}
FormLine {
FormGroup {
label: qsTr('captureDeviceLabel')
FormLine {
FormGroup {
label: qsTr('captureDeviceLabel')
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.captureDevice
})
model: SettingsModel.audioDevices
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.captureDevice
})
model: SettingsModel.audioDevices
onActivated: SettingsModel.captureDevice = model[index]
onActivated: SettingsModel.captureDevice = model[index]
}
}
}
}
FormLine {
FormGroup {
label: qsTr('ringerDeviceLabel')
FormLine {
FormGroup {
label: qsTr('ringerDeviceLabel')
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.ringerDevice
})
model: SettingsModel.audioDevices
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.ringerDevice
})
model: SettingsModel.audioDevices
onActivated: SettingsModel.ringerDevice = model[index]
onActivated: SettingsModel.ringerDevice = model[index]
}
}
}
}
FormLine {
FormGroup {
label: qsTr('ringLabel')
FormLine {
FormGroup {
label: qsTr('ringLabel')
FileChooserButton {
selectedFile: SettingsModel.ringPath
FileChooserButton {
selectedFile: SettingsModel.ringPath
onAccepted: SettingsModel.ringPath = selectedFile
onAccepted: SettingsModel.ringPath = selectedFile
}
}
}
}
FormLine {
FormGroup {
label: qsTr('echoCancellationLabel')
FormLine {
FormGroup {
label: qsTr('echoCancellationLabel')
Switch {
checked: SettingsModel.echoCancellationEnabled
Switch {
checked: SettingsModel.echoCancellationEnabled
onClicked: SettingsModel.echoCancellationEnabled = !checked
onClicked: SettingsModel.echoCancellationEnabled = !checked
}
}
}
}
// -------------------------------------------------------------------------
// Audio Codecs.
// -------------------------------------------------------------------------
Form {
title: qsTr('audioCodecsTitle')
width: parent.width
CodecsViewer {
model: AudioCodecsModel
width: parent.width
}
}
}
}
linphone-desktop/ui/views/App/Settings/SettingsVideo.qml
View file @ 3577df44
......@@ -4,88 +4,113 @@ import Common 1.0
import Linphone 1.0
import Utils 1.0
import App.Styles 1.0
// =============================================================================
TabContainer {
Form {
title: qsTr('videoCaptureTitle')
Column {
spacing: SettingsWindowStyle.forms.spacing
width: parent.width
FormLine {
FormGroup {
label: qsTr('videoInputDeviceLabel')
// -------------------------------------------------------------------------
// Video parameters.
// -------------------------------------------------------------------------
Form {
title: qsTr('videoCaptureTitle')
width: parent.width
FormLine {
FormGroup {
label: qsTr('videoInputDeviceLabel')
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.videoDevice
})
model: SettingsModel.videoDevices
ComboBox {
currentIndex: Utils.findIndex(model, function (device) {
return device === SettingsModel.videoDevice
})
model: SettingsModel.videoDevices
onActivated: SettingsModel.videoDevice = model[index]
onActivated: SettingsModel.videoDevice = model[index]
}
}
}
}
FormLine {
FormGroup {
label: qsTr('videoPresetLabel')
FormLine {
FormGroup {
label: qsTr('videoPresetLabel')
ComboBox {
currentIndex: {
var preset = SettingsModel.videoPreset
ComboBox {
currentIndex: {
var preset = SettingsModel.videoPreset
return Number(Utils.findIndex([ 'default', 'high-fps', 'custom' ], function (value) {
return preset === value
}))
}
return Number(Utils.findIndex([ 'default', 'high-fps', 'custom' ], function (value) {
return preset === value
}))
}
model: ListModel {
id: presets
model: ListModel {
id: presets
ListElement {
key: qsTr('presetDefault')
value: 'default'
}
ListElement {
key: qsTr('presetDefault')
value: 'default'
}
ListElement {
key: qsTr('presetHighFps')
value: 'high-fps'
}
ListElement {
key: qsTr('presetHighFps')
value: 'high-fps'
}
ListElement {
key: qsTr('presetCustom')
value: 'custom'
ListElement {
key: qsTr('presetCustom')
value: 'custom'
}
}
}
textRole: 'key'
textRole: 'key'
onActivated: SettingsModel.videoPreset = presets.get(index).value
onActivated: SettingsModel.videoPreset = presets.get(index).value
}
}
}
}
FormLine {
FormGroup {
label: qsTr('videoSizeLabel')
FormLine {
FormGroup {
label: qsTr('videoSizeLabel')
ComboBox {
// TODO
ComboBox {
// TODO
}
}
}
FormGroup {
label: qsTr('videoFramerateLabel')
FormGroup {
label: qsTr('videoFramerateLabel')
NumericField {
maxValue: 60
minValue: 1
readOnly: SettingsModel.videoPreset !== 'custom'
text: SettingsModel.videoFramerate
NumericField {
maxValue: 60
minValue: 1
readOnly: SettingsModel.videoPreset !== 'custom'
text: SettingsModel.videoFramerate
onEditingFinished: SettingsModel.videoFramerate = text
onEditingFinished: SettingsModel.videoFramerate = text
}
}
}
}
// -------------------------------------------------------------------------
// Video Codecs.
// -------------------------------------------------------------------------
Form {
title: qsTr('videoCodecsTitle')
width: parent.width
CodecsViewer {
model: VideoCodecsModel
width: parent.width
}
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023