data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #LINQT-1370 + ui call end text

Browse source
This commit is contained in:
Gaelle Braud 2024-10-30 16:04:12 +01:00
parent a780825c12
commit 12b73b9c0c
3 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Linphone/view/Control/Container/Call/CallLayout.qml
View file

@ -41,15 +41,13 @@ Item {
anchors.topMargin: 25 * DefaultStyle.dp
z: 1
visible: callState === LinphoneEnums.CallState.End || callState === LinphoneEnums.CallState.Error || callState === LinphoneEnums.CallState.Released
text: callState === LinphoneEnums.CallState.End
? mainItem.conference
text: mainItem.conference
? qsTr("Vous avez quitté la conférence")
: mainItem.callStarted
? mainItem.callTerminatedByUser
? qsTr("Vous avez terminé l'appel")
: qsTr("Votre correspondant a terminé l'appel")
: call.core.lastErrorMessage
: call && call.core.lastErrorMessage || ""
: call && call.core.lastErrorMessage || ""
color: DefaultStyle.grey_0
font {
pixelSize: 22 * DefaultStyle.dp

22
Linphone/view/Control/Display/Call/CallListView.qml
View file

@ -76,33 +76,43 @@ ListView {
Layout.preferredHeight: 24 * DefaultStyle.dp
Layout.rightMargin: 10 * DefaultStyle.dp
Layout.leftMargin: 14 * DefaultStyle.dp
popup.rightPadding: 10 * DefaultStyle.dp
popup.contentItem: ColumnLayout {
spacing: 0
width: childrenRect.width
spacing: 16 * DefaultStyle.dp
MenuButton {
id: pausingButton
onClicked: modelData.core.lSetPaused(!modelData.core.paused)
KeyNavigation.up: endCallButton
KeyNavigation.down: endCallButton
Layout.preferredWidth: implicitWidth
Layout.preferredHeight: icon.height
Layout.preferredWidth: icon.width + spacing + pauseMeter.advanceWidth + leftPadding + rightPadding
icon.source: modelData.core.state === LinphoneEnums.CallState.Paused
|| modelData.core.state === LinphoneEnums.CallState.PausedByRemote
? AppIcons.phone : AppIcons.pause
text: modelData.core.state === LinphoneEnums.CallState.Paused
|| modelData.core.state === LinphoneEnums.CallState.PausedByRemote
? qsTr("Reprendre l'appel") : qsTr("Mettre en pause")
TextMetrics {
id: pauseMeter
text: pausingButton.text
}
}
MenuButton {
id: endCallButton
onClicked: mainWindow.endCall(modelData)
onClicked: {
mainWindow.callTerminatedByUser = true
mainWindow.endCall(modelData)
}
KeyNavigation.up: pausingButton
KeyNavigation.down: pausingButton
Layout.preferredWidth: width
Layout.preferredWidth: icon.width + spacing + endMeter.advanceWidth + leftPadding + rightPadding
icon.source: AppIcons.endCall
contentImageColor: DefaultStyle.danger_500main
textColor: DefaultStyle.danger_500main
text: qsTr("Terminer l'appel")
TextMetrics {
id: endMeter
text: endCallButton.text
}
}
}
}

16
Linphone/view/Page/Window/Call/CallsWindow.qml
View file

@ -1245,7 +1245,6 @@ AbstractWindow {
: DefaultStyle.grey_600
radius: 40 * DefaultStyle.dp
}
popup.x: width/2
Connections {
target: moreOptionsButton.popup
function onOpened() {
@ -1258,10 +1257,7 @@ AbstractWindow {
MenuButton {
visible: mainWindow.conference
Layout.fillWidth: true
icon.source: AppIcons.squaresFour
icon.width: 32 * DefaultStyle.dp
icon.height: 32 * DefaultStyle.dp
text: qsTr("Modifier la disposition")
onClicked: {
rightPanel.visible = true
@ -1271,10 +1267,7 @@ AbstractWindow {
}
MenuButton {
visible: mainWindow.conference
Layout.fillWidth: true
icon.source: AppIcons.fullscreen
icon.width: 32 * DefaultStyle.dp
icon.height: 32 * DefaultStyle.dp
text: qsTr("Mode Plein écran")
checkable: true
onToggled: {
@ -1289,7 +1282,6 @@ AbstractWindow {
}
MenuButton {
icon.source: AppIcons.callList
Layout.fillWidth: true
text: qsTr("Liste d'appel")
onClicked: {
rightPanel.visible = true
@ -1300,7 +1292,6 @@ AbstractWindow {
MenuButton {
icon.source: AppIcons.dialer
text: qsTr("Dialer")
Layout.fillWidth: true
onClicked: {
rightPanel.visible = true
rightPanel.replace(dialerPanel)
@ -1312,8 +1303,6 @@ AbstractWindow {
visible: mainWindow.call && !mainWindow.conference && !SettingsCpp.disableCallRecordings
enabled: mainWindow.call && mainWindow.call.core.recordable
icon.source: AppIcons.recordFill
icon.width: 32 * DefaultStyle.dp
icon.height: 32 * DefaultStyle.dp
checked: mainWindow.call && mainWindow.call.core.recording
contentImageColor: down
? DefaultStyle.main1_500_main
@ -1326,7 +1315,6 @@ AbstractWindow {
:mainWindow.call && mainWindow.call.core.recording
? DefaultStyle.danger_500main
: DefaultStyle.main2_500main
Layout.fillWidth: true
onToggled: {
if (mainWindow.call)
if (mainWindow.call.core.recording) mainWindow.call.core.lStopRecording()
@ -1336,8 +1324,6 @@ AbstractWindow {
MenuButton {
checkable: true
icon.source: !mainWindow.call || mainWindow.call.core.speakerMuted ? AppIcons.speakerSlash : AppIcons.speaker
icon.width: 32 * DefaultStyle.dp
icon.height: 32 * DefaultStyle.dp
contentImageColor: down
? DefaultStyle.main1_500_main
: mainWindow.call && mainWindow.call.core.speakerMuted
@ -1349,13 +1335,11 @@ AbstractWindow {
:mainWindow.call && mainWindow.call.core.speakerMuted
? DefaultStyle.danger_500main
: DefaultStyle.main2_500main
Layout.fillWidth: true
onCheckedChanged: {
if (mainWindow.call) mainWindow.call.core.lSetSpeakerMuted(!mainWindow.call.core.speakerMuted)
}
}
MenuButton {
Layout.fillWidth: true
icon.source: AppIcons.settings
text: qsTr("Paramètres")
onClicked: {