diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index e42512f34..3a0dbfead 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -1305,10 +1305,6 @@ Server url ikke konfigureret. acceptVideoDescription Din kontakt vil skifte til video. - - pendingRequestLabel - Vent, en anmodning er i gang. - securedStringFormat Opkaldet er krypteret med: %1. @@ -1318,31 +1314,130 @@ Server url ikke konfigureret. Opkaldet er ikke krypteret. - takeSnapshotLabel - Tag en snapshot. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Start optagelsen. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Stop optagelsen. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Tag en snapshot. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Start optagelsen. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Stop optagelsen. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Klik her: <a href="%1">%1</a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index f8e8186af..80140be4d 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -1305,10 +1305,6 @@ Server URL ist nicht konfiguriert. acceptVideoDescription Ihr Kontakt würde gerne die Videoübertragung aktivieren. - - pendingRequestLabel - Bitte warten, Anfrage wird verarbeitet. - securedStringFormat Anruf ist verschlüsselt mit: %1. @@ -1318,31 +1314,130 @@ Server URL ist nicht konfiguriert. Anruf nicht verschlüsselt. - takeSnapshotLabel - Schnappschuss machen. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Aufnahme starten. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Aufnahme stoppen. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Schnappschuss machen. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Aufnahme starten. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Aufnahme stoppen. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Klicken Sie hier: <a href="%1">%1</a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 6fc6ff4d8..760d1fa5c 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -1305,10 +1305,6 @@ Server URL not configured. acceptVideoDescription Your contact would like to turn on video. - - pendingRequestLabel - Please wait, a request is pending. - securedStringFormat Call is encrypted with: %1. @@ -1318,31 +1314,130 @@ Server URL not configured. Call not encrypted. - takeSnapshotLabel - Take a snapshot. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + You are currently out of the conference. - startRecordingLabel - Start recording. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + Click on play button to join it back. - stopRecordingLabel - Stop recording. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + Start recording + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + Stop Recording + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + Take Snapshot' + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + Video conference is not ready. Please Wait… + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + This call is being recorded. + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + Waiting for another participant... - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Take a snapshot. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + You are currently out of the conference. - startRecordingLabel - Start recording. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + Click on play button to join it back. - stopRecordingLabel - Stop recording. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + Start recording + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + Stop Recording + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + Take Snapshot + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + Video conference is not ready. Please Wait… + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + This call is being recorded. + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + Multimedia parameters + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + Change layout + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + Invite participants + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + Participants list + + + incallMenuTitle + 'Settings' : Main menu title for settings. + Settings + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + Mosaic mode + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + Active speaker mode + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + Audio only mode + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + You are currently alone in this conference @@ -3391,135 +3486,6 @@ Click here: <a href="%1">%1</a> To enable it in a commercial project, please contact us. - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - You are currently out of the conference. - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - Click on play button to join it back. - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - Start recording - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - Stop Recording - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - Take Snapshot' - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - Video conference is not ready. Please Wait… - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - This call is being recorded. - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - Waiting for another participant... - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - You are currently out of the conference. - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - Click on play button to join it back. - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - Start recording - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - Stop Recording - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - Take Snapshot - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - Video conference is not ready. Please Wait… - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - This call is being recorded. - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - Multimedia parameters - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - Change layout - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - Invite participants - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - Participants list - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - Settings - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - Mosaic mode - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - Active speaker mode - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - Audio only mode - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - You are currently alone in this conference - - WaitingRoom diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index face20bab..89349f81a 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -1305,10 +1305,6 @@ URL del servidor no configurada. acceptVideoDescription Su contacto desea que habilite el vídeo. - - pendingRequestLabel - Por favor espere, una petición está pendiente. - securedStringFormat La llamada está cifrada con: %1. @@ -1318,31 +1314,130 @@ URL del servidor no configurada. Llamada no cifrada. - takeSnapshotLabel - Tomar una captura. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Empezar grabación. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Parar grabación. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Tomar una captura. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Empezar grabación. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Parar grabación. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Haga clic aquí: <a href="%1">%1 </a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index f8916a777..de63f6464 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -1305,10 +1305,6 @@ URL du serveur non configurée. acceptVideoDescription Votre correspondant souhaite ajouter la vidéo. - - pendingRequestLabel - Merci de patienter, une requête est en attente. - securedStringFormat L'appel est chiffré avec : %1. @@ -1318,31 +1314,130 @@ URL du serveur non configurée. Appel non chiffré. - takeSnapshotLabel - Prendre une capture d'écran. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Commencer l'enregistrement. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Arrêter l'enregistrement. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Prendre une capture d'écran. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Commencer l'enregistrement. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Arrêter l'enregistrement. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Cliquez ici : <a href="%1">%1</a> Si vous souhaitez les activer pour un projet professionnel, contactez-nous. - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index ce6b366d7..5b5e60249 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -1295,10 +1295,6 @@ A kiszolgáló URL-je nincs konfigurálva. acceptVideoDescription Kapcsolattartója szeretné bekapcsolni a videót. - - pendingRequestLabel - Kérjük, várjon, egy kérés függőben van. - securedStringFormat A hívás titkosítva: %1. @@ -1308,31 +1304,130 @@ A kiszolgáló URL-je nincs konfigurálva. A hívás nincs titkosítva. - takeSnapshotLabel - Pillanatkép készítése. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Felvétel megindítása. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - A felvétel leállítása. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Pillanatkép készítése. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Felvétel megindítása. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - A felvétel leállítása. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3355,135 +3450,6 @@ Kattintson ide: <a href="%1">%1</a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index bedb629ac..1f8d25923 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -1305,10 +1305,6 @@ URL del server non configurato. acceptVideoDescription Il tuo contatto vorrebbe passare al video. - - pendingRequestLabel - Attendi, la richiesta è in sospeso. - securedStringFormat Chiamata cifrata con: %1. @@ -1318,31 +1314,130 @@ URL del server non configurato. Chiamata non cifrata. - takeSnapshotLabel - Fai un'istantanea. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Inizia a registrare. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Ferma la registrazione. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Fai un'istantanea. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Inizia a registrare. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Ferma la registrazione. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Clicca: <a href="%1">%1</a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 36572f45e..b4ab4aabd 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -1295,10 +1295,6 @@ acceptVideoDescription あなたの連絡先がビデオをオンにしました。 - - pendingRequestLabel - リクエストを処理しています。しばらくお待ちください。 - securedStringFormat 通話は %1 で暗号化されています。 @@ -1308,31 +1304,130 @@ 通話は暗号化されていません。 - takeSnapshotLabel - スナップショットを撮る. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - 録音開始. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - 録音停止. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - スナップショットを撮る. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - 録音開始. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - 録音停止. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3355,135 +3450,6 @@ - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index f00985cc5..de45e2faf 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -1315,10 +1315,6 @@ Nesukonfigūruotas serverio url. acceptVideoDescription Jūsų kontaktas norėtų įjungti vaizdą. - - pendingRequestLabel - Palaukite, laukiama užklausa. - securedStringFormat Skambutis yra šifruotas, naudojant: %1. @@ -1328,31 +1324,130 @@ Nesukonfigūruotas serverio url. Skambutis nėra šifruotas. - takeSnapshotLabel - Padarykite momentinę nuotrauką. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Pradėkite įrašymą. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Nustokite įrašinėti. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Padarykite momentinę nuotrauką. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Pradėkite įrašymą. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Nustokite įrašinėti. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3381,135 +3476,6 @@ Spustelėkite čia: <a href="%1">%1</a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index d3db85dcc..67a5bbd04 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -1305,10 +1305,6 @@ URL do servidor não configurado. acceptVideoDescription Seu contato gostaria de ativar o vídeo. - - pendingRequestLabel - Aguarde, uma solicitação está pendente. - securedStringFormat A chamada está encriptada com: %1. @@ -1318,31 +1314,130 @@ URL do servidor não configurado. Chamada não criptografada. - takeSnapshotLabel - Tire uma foto. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Comece a gravar. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Pare de gravar. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Tire uma foto. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Comece a gravar. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Pare de gravar. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Clique aqui: <a href="%1">%1 </a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index cd99ce0d8..cc6b22cd5 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -1315,10 +1315,6 @@ acceptVideoDescription Ваш контакт хотел бы включить видео. - - pendingRequestLabel - Пожалуйста, подождите, запрос обрабатывается. - securedStringFormat Звонок зашифрован с: %1. @@ -1328,31 +1324,130 @@ Звонок не зашифрован. - takeSnapshotLabel - Сделать снимок. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + Сейчас вы вне конференции. - startRecordingLabel - Начать запись. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + Нажмите на кнопку воспроизведения, чтобы присоединиться к ней обратно. - stopRecordingLabel - Остановить запись. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + Начать запись + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + Остановить запись + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + Сделать скриншот + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + Видеоконференция не готова. Пожалуйста, подождите… + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Сделать снимок. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + Сейчас вы вне конференции. - startRecordingLabel - Начать запись. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + Нажмите на кнопку воспроизведения, чтобы присоединиться к ней обратно. - stopRecordingLabel - Остановить запись. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + Начать запись + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + Остановить запись + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + Сделать скриншот + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + Видеоконференция не готова. Пожалуйста, подождите… + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + Параметры мультимедиа + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + Изменить макет + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + Пригласить участников + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + Список участников + + + incallMenuTitle + 'Settings' : Main menu title for settings. + Настройки + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + Мозаичный режим + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + Активизировать режим динамика + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + Режим только аудио + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + Сейчас вы одни на этой конференции @@ -3381,135 +3476,6 @@ Чтобы включить их в коммерческом проекте, свяжитесь с нами. - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - Сейчас вы вне конференции. - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - Нажмите на кнопку воспроизведения, чтобы присоединиться к ней обратно. - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - Начать запись - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - Остановить запись - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - Сделать скриншот - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - Видеоконференция не готова. Пожалуйста, подождите… - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - Сейчас вы вне конференции. - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - Нажмите на кнопку воспроизведения, чтобы присоединиться к ней обратно. - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - Начать запись - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - Остановить запись - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - Сделать скриншот - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - Видеоконференция не готова. Пожалуйста, подождите… - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - Параметры мультимедиа - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - Изменить макет - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - Пригласить участников - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - Список участников - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - Настройки - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - Мозаичный режим - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - Активизировать режим динамика - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - Режим только аудио - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - Сейчас вы одни на этой конференции - - WaitingRoom diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 972bdf086..84b571117 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -1305,10 +1305,6 @@ Serverwebbadressen är inte konfigurerad. acceptVideoDescription Din kontakt vill gärna slå på video. - - pendingRequestLabel - Vänta, en förfrågan väntar. - securedStringFormat Samtalet är krypterat med: %1. @@ -1318,31 +1314,130 @@ Serverwebbadressen är inte konfigurerad. Samtal inte krypterat. - takeSnapshotLabel - Ta en ögonblicksbild. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Börja inspelning. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Stoppa inspelning. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Ta en ögonblicksbild. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Börja inspelning. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Stoppa inspelning. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3368,135 +3463,6 @@ Klicka här: <a href="%1">%1</a> - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 07db88764..365aa8ac1 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -1295,10 +1295,6 @@ Sunucu url'si yapılandırılmadı. acceptVideoDescription Kişiniz görüntüyü açmak istiyor. - - pendingRequestLabel - Lütfen bekleyin, bir istek askıda. - securedStringFormat Çağrı şununla şifrelendi: %1. @@ -1308,31 +1304,130 @@ Sunucu url'si yapılandırılmadı. Çağrı şifrelenmedi. - takeSnapshotLabel - Anlık görüntü al. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Kayda başla. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Kaydı durdur. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Anlık görüntü al. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Kayda başla. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Kaydı durdur. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3355,135 +3450,6 @@ Buraya tıklayın: <a href="%1">%1</a> Ticari projede etkinleştirmek için lütfen bizimle iletişime geçin. - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index e0ec6d81a..7ccd7340b 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -1315,10 +1315,6 @@ acceptVideoDescription Ваш контакт волів би увімкнути відео. - - pendingRequestLabel - Будь ласка, зачекайте, запит опрацьовується. - securedStringFormat Виклик зашифрований з: %1. @@ -1328,31 +1324,130 @@ Виклик не зашифрований. - takeSnapshotLabel - Зробити зняток. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Почати запис. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Зупинити запис. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - Зробити зняток. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - Почати запис. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - Зупинити запис. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3381,135 +3476,6 @@ - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 029069101..a07a93104 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -1295,10 +1295,6 @@ acceptVideoDescription 你的联系人希望开启视频通话 - - pendingRequestLabel - 请稍候，请求等待中 - securedStringFormat 通话使用 %1 加密. @@ -1308,31 +1304,130 @@ 通话未加密 - takeSnapshotLabel - 截取快照. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - 开始录制. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - 停止录制. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + incallWaitParticipantMessage + 'Waiting for another participant...' : Waiting message for more participant. + - IncallFullscreenWindow + IncallFullscreen - takeSnapshotLabel - 截取快照. + incallPauseWarning + 'You are currently out of the conference.' : Pause message in video conference. + - startRecordingLabel - 开始录制. + incallPauseHint + 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + - stopRecordingLabel - 停止录制. + incallStartRecordTooltip + 'Start recording' : Tootltip when straing record. + + + + incallStopRecordTooltip + 'Stop Recording' : Tooltip when stopping record. + + + + incallSnapshotTooltip + 'Take Snapshot' : Tooltip for takking snapshot. + + + + incallWaitMessage + 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + + + + callWarningRecord + 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + + + + + IncallMenu + + incallMenuMultimedia + 'Multimedia parameters' : Menu title to show multimedia devices configuration. + + + + incallMenuLayout + 'Change layout' : Menu title to change the conference layout. + + + + incallMenuInvite + 'Invite participants' : Menu title to invite participants in admin mode. + + + + incallMenuParticipants + 'Participants list' : Menu title to show participants in non-admin mode. + + + + incallMenuTitle + 'Settings' : Main menu title for settings. + + + + incallMenuGridLayout + 'Mosaic mode' : Grid layout for video conference. + + + + incallMenuActiveSpeakerLayout + 'Active speaker mode' : Active speaker layout for video conference. + + + + incallMenuAudioLayout + 'Audio only mode' : Audio only layout for video conference. + + + + incallMenuParticipantsAlone + 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. + @@ -3355,135 +3450,6 @@ - - VideoConference - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - videoConferenceWaitParticipantMessage - 'Waiting for another participant...' : Waiting message for more participant. - - - - - VideoConferenceFullscreen - - videoConferencePauseWarning - 'You are currently out of the conference.' : Pause message in video conference. - - - - videoConferencePauseHint - 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - - - - videoConferenceStartRecordTooltip - 'Start recording' : Tootltip when straing record. - - - - videoConferenceStopRecordTooltip - 'Stop Recording' : Tooltip when stopping record. - - - - videoConferenceSnapshotTooltip - 'Take Snapshot' : Tooltip for takking snapshot. - - - - videoConferenceWaitMessage - 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - - - - callWarningRecord - 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - - - - - VideoConferenceMenu - - conferenceMenuMultimedia - 'Multimedia parameters' : Menu title to show multimedia devices configuration. - - - - conferenceMenuLayout - 'Change layout' : Menu title to change the conference layout. - - - - conferenceMenuInvite - 'Invite participants' : Menu title to invite participants in admin mode. - - - - conferenceMenuParticipants - 'Participants list' : Menu title to show participants in non-admin mode. - - - - conferenceMenuTitle - 'Settings' : Main menu title for settings. - - - - conferenceMenuGridLayout - 'Mosaic mode' : Grid layout for video conference. - - - - conferenceMenuActiveSpeakerLayout - 'Active speaker mode' : Active speaker layout for video conference. - - - - conferenceMenuAudioLayout - 'Audio only mode' : Audio only layout for video conference. - - - - conferenceMenuParticipantsAlone - 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - - - WaitingRoom diff --git a/linphone-app/resources.qrc b/linphone-app/resources.qrc index db21087dd..be45788a3 100644 --- a/linphone-app/resources.qrc +++ b/linphone-app/resources.qrc @@ -350,7 +350,7 @@ ui/modules/Linphone/History/History.js ui/modules/Linphone/History/Event.qml ui/modules/Linphone/Menus/SipAddressesMenu.qml - ui/modules/Linphone/Menus/VideoConferenceMenu.qml + ui/modules/Linphone/Menus/IncallMenu.qml ui/modules/Linphone/Misc/MessageCounter.qml ui/modules/Linphone/Notifications/NotificationBasic.qml ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml @@ -392,7 +392,7 @@ ui/modules/Linphone/Styles/Dialog/SipAddressDialogStyle.qml ui/modules/Linphone/Styles/History/HistoryStyle.qml ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml - ui/modules/Linphone/Styles/Menus/VideoConferenceMenuStyle.qml + ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml @@ -426,16 +426,14 @@ ui/views/App/Calls/CallsWindow.js ui/views/App/Calls/CallsWindow.qml ui/views/App/Calls/Conference.qml - ui/views/App/Calls/VideoConference.qml - ui/views/App/Calls/VideoConferenceActiveSpeaker.qml - ui/views/App/Calls/VideoConferenceFullscreen.qml - ui/views/App/Calls/VideoConferenceGrid.qml ui/views/App/Calls/Dialogs/CallSipAddress.qml ui/views/App/Calls/Dialogs/CallTransfer.qml ui/views/App/Calls/Dialogs/ConferenceManager.qml - ui/views/App/Calls/IncallFullscreenWindow.qml ui/views/App/Calls/Incall.js ui/views/App/Calls/Incall.qml + ui/views/App/Calls/IncallActiveSpeaker.qml + ui/views/App/Calls/IncallFullscreen.qml + ui/views/App/Calls/IncallGrid.qml ui/views/App/Calls/IncomingCall.qml ui/views/App/Calls/WaitingRoom.qml ui/views/App/Calls/ZrtpTokenAuthentication.qml @@ -499,7 +497,7 @@ ui/views/App/Styles/Calls/CallFullscreenStyle.qml ui/views/App/Styles/Calls/CallsWindowStyle.qml ui/views/App/Styles/Calls/ConferenceStyle.qml - ui/views/App/Styles/Calls/VideoConferenceStyle.qml + ui/views/App/Styles/Calls/IncallStyle.qml ui/views/App/Styles/Calls/WaitingRoomStyle.qml ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml diff --git a/linphone-app/ui/modules/Linphone/Menus/VideoConferenceMenu.qml b/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml similarity index 75% rename from linphone-app/ui/modules/Linphone/Menus/VideoConferenceMenu.qml rename to linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml index 03f99bc33..26fec8e81 100644 --- a/linphone-app/ui/modules/Linphone/Menus/VideoConferenceMenu.qml +++ b/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml @@ -29,18 +29,18 @@ Rectangle{ height: 500 width: 400 color: "white" - radius: VideoConferenceMenuStyle.radius + radius: IncallMenuStyle.radius // List of title texts in order to allow bindings between all components property var menuTitles: [ //: 'Multimedia parameters' : Menu title to show multimedia devices configuration. - qsTr('conferenceMenuMultimedia'), + qsTr('incallMenuMultimedia'), //: 'Change layout' : Menu title to change the conference layout. - qsTr('conferenceMenuLayout'), + qsTr('incallMenuLayout'), //: 'Invite participants' : Menu title to invite participants in admin mode. - mainItem.isMeAdmin ? qsTr('conferenceMenuInvite') + mainItem.isMeAdmin ? qsTr('incallMenuInvite') //: 'Participants list' : Menu title to show participants in non-admin mode. - : qsTr('conferenceMenuParticipants') + : qsTr('incallMenuParticipants') ] function showParticipantsMenu(){ @@ -56,15 +56,15 @@ Rectangle{ // HEADER Borders{ Layout.fillWidth: true - Layout.preferredHeight: Math.max(VideoConferenceMenuStyle.header.height, titleMenu.implicitHeight+20) - bottomColor: VideoConferenceMenuStyle.list.border.color - bottomWidth: VideoConferenceMenuStyle.list.border.width + Layout.preferredHeight: Math.max(IncallMenuStyle.header.height, titleMenu.implicitHeight+20) + bottomColor: IncallMenuStyle.list.border.color + bottomWidth: IncallMenuStyle.list.border.width RowLayout{ anchors.fill: parent ActionButton{ backgroundRadius: width/2 isCustom: true - colorSet: VideoConferenceMenuStyle.buttons.back + colorSet: IncallMenuStyle.buttons.back onClicked: contentsStack.pop() visible: contentsStack.nViews > 1 } @@ -74,9 +74,9 @@ Rectangle{ Layout.fillWidth: true Layout.preferredHeight: implicitHeight horizontalAlignment: Qt.AlignCenter - color: VideoConferenceMenuStyle.header.color - font.pointSize: VideoConferenceMenuStyle.header.pointSize - font.weight: VideoConferenceMenuStyle.header.weight + color: IncallMenuStyle.header.color + font.pointSize: IncallMenuStyle.header.pointSize + font.weight: IncallMenuStyle.header.weight wrapMode: Text.WordWrap elide: Text.ElideRight } @@ -84,7 +84,7 @@ Rectangle{ Layout.rightMargin: 10 backgroundRadius: width/2 isCustom: true - colorSet: VideoConferenceMenuStyle.buttons.close + colorSet: IncallMenuStyle.buttons.close onClicked: mainItem.close() } } @@ -101,33 +101,33 @@ Rectangle{ ColumnLayout{ property string objectName: 'settingsMenu' //: 'Settings' : Main menu title for settings. - property string title: qsTr('conferenceMenuTitle') + property string title: qsTr('incallMenuTitle') Layout.fillHeight: true Layout.fillWidth: true Repeater{ model: [ {titleIndex: 0 - ,icon: VideoConferenceMenuStyle.settingsIcons.mediaIcon + ,icon: IncallMenuStyle.settingsIcons.mediaIcon , nextPage:mediaMenu , visible: true}, {titleIndex: 1 , icon: (mainItem.callModel && mainItem.callModel.videoEnabled ? - (mainItem.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid ? VideoConferenceMenuStyle.settingsIcons.gridIcon : VideoConferenceMenuStyle.settingsIcons.activeSpeakerIcon) - : VideoConferenceMenuStyle.settingsIcons.audioOnlyIcon) + (mainItem.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid ? IncallMenuStyle.settingsIcons.gridIcon : IncallMenuStyle.settingsIcons.activeSpeakerIcon) + : IncallMenuStyle.settingsIcons.audioOnlyIcon) , nextPage:layoutMenu , visible: mainItem.callModel && mainItem.callModel.isConference}, { titleIndex: 2 - , icon: VideoConferenceMenuStyle.settingsIcons.participantsIcon + , icon: IncallMenuStyle.settingsIcons.participantsIcon , nextPage:participantsMenu , visible: mainItem.callModel && mainItem.callModel.isConference} ] delegate: Borders{ - bottomColor: VideoConferenceMenuStyle.list.border.color - bottomWidth: VideoConferenceMenuStyle.list.border.width + bottomColor: IncallMenuStyle.list.border.color + bottomWidth: IncallMenuStyle.list.border.width Layout.preferredHeight: Math.max(settingIcon.height, settingsDescription.implicitHeight) + 20 Layout.fillWidth: true visible: modelData.visible @@ -139,9 +139,9 @@ Rectangle{ Layout.leftMargin: 15 Layout.alignment: Qt.AlignVCenter icon: modelData.icon - overwriteColor: VideoConferenceMenuStyle.list.color - iconWidth: VideoConferenceMenuStyle.settingsIcons.width - iconHeight: VideoConferenceMenuStyle.settingsIcons.height + overwriteColor: IncallMenuStyle.list.color + iconWidth: IncallMenuStyle.settingsIcons.width + iconHeight: IncallMenuStyle.settingsIcons.height } Text{ id: settingsDescription @@ -151,8 +151,8 @@ Rectangle{ elide: Text.ElideRight text: mainItem.menuTitles[modelData.titleIndex] - font.pointSize: VideoConferenceMenuStyle.list.pointSize - color: VideoConferenceMenuStyle.list.color + font.pointSize: IncallMenuStyle.list.pointSize + color: IncallMenuStyle.list.color } ActionButton{ Layout.minimumWidth: iconWidth @@ -160,7 +160,7 @@ Rectangle{ Layout.alignment: Qt.AlignVCenter backgroundRadius: width/2 isCustom: true - colorSet: VideoConferenceMenuStyle.buttons.next + colorSet: IncallMenuStyle.buttons.next } } MouseArea{ @@ -211,16 +211,16 @@ Rectangle{ Layout.fillWidth: true Repeater{ //: 'Mosaic mode' : Grid layout for video conference. - model: [{text: qsTr('conferenceMenuGridLayout'), icon: VideoConferenceMenuStyle.modeIcons.gridIcon, value:LinphoneEnums.ConferenceLayoutGrid} + model: [{text: qsTr('incallMenuGridLayout'), icon: IncallMenuStyle.modeIcons.gridIcon, value:LinphoneEnums.ConferenceLayoutGrid} //: 'Active speaker mode' : Active speaker layout for video conference. - , {text: qsTr('conferenceMenuActiveSpeakerLayout'), icon: VideoConferenceMenuStyle.modeIcons.activeSpeakerIcon, value:LinphoneEnums.ConferenceLayoutActiveSpeaker} + , {text: qsTr('incallMenuActiveSpeakerLayout'), icon: IncallMenuStyle.modeIcons.activeSpeakerIcon, value:LinphoneEnums.ConferenceLayoutActiveSpeaker} //: 'Audio only mode' : Audio only layout for video conference. - , {text: qsTr('conferenceMenuAudioLayout'), icon: VideoConferenceMenuStyle.modeIcons.audioOnlyIcon, value:2} + , {text: qsTr('incallMenuAudioLayout'), icon: IncallMenuStyle.modeIcons.audioOnlyIcon, value:2} ] delegate: Borders{ - bottomColor: VideoConferenceMenuStyle.list.border.color - bottomWidth: VideoConferenceMenuStyle.list.border.width + bottomColor: IncallMenuStyle.list.border.color + bottomWidth: IncallMenuStyle.list.border.width Layout.preferredHeight: Math.max(layoutIcon.height, radio.contentItem.implicitHeight) + 20 Layout.fillWidth: true RowLayout{ @@ -264,8 +264,8 @@ Rectangle{ Layout.rightMargin: 10 Layout.alignment: Qt.AlignVCenter icon: modelData.icon - iconWidth: VideoConferenceMenuStyle.modeIcons.width - iconHeight: VideoConferenceMenuStyle.modeIcons.height + iconWidth: IncallMenuStyle.modeIcons.width + iconHeight: IncallMenuStyle.modeIcons.height } } } @@ -292,10 +292,10 @@ Rectangle{ isAdmin: mainItem.isMeAdmin Text{ //: 'Your are currently alone in this conference' : Message to warn the user when there is no other participant. - text: qsTr('conferenceMenuParticipantsAlone') + text: qsTr('incallMenuParticipantsAlone') visible: parent.count <= 1 - font.pointSize: VideoConferenceMenuStyle.list.pointSize - color: VideoConferenceMenuStyle.list.color + font.pointSize: IncallMenuStyle.list.pointSize + color: IncallMenuStyle.list.color } } Item{// Spacer diff --git a/linphone-app/ui/modules/Linphone/Styles/Menus/VideoConferenceMenuStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml similarity index 98% rename from linphone-app/ui/modules/Linphone/Styles/Menus/VideoConferenceMenuStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml index b9b9ad93c..3737987b1 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Menus/VideoConferenceMenuStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml @@ -8,7 +8,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property string sectionName: 'VideoConferenceMenu' + property string sectionName: 'IncallMenu' property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color property int radius: 8 property QtObject header: QtObject{ diff --git a/linphone-app/ui/modules/Linphone/Styles/qmldir b/linphone-app/ui/modules/Linphone/Styles/qmldir index acfb665be..e4e244429 100644 --- a/linphone-app/ui/modules/Linphone/Styles/qmldir +++ b/linphone-app/ui/modules/Linphone/Styles/qmldir @@ -38,7 +38,7 @@ singleton SipAddressDialogStyle 1.0 Dialog/SipAddressDialogStyle. singleton HistoryStyle 1.0 History/HistoryStyle.qml singleton SipAddressesMenuStyle 1.0 Menus/SipAddressesMenuStyle.qml -singleton VideoConferenceMenuStyle 1.0 Menus/VideoConferenceMenuStyle.qml +singleton IncallMenuStyle 1.0 Menus/IncallMenuStyle.qml singleton MessageCounterStyle 1.0 Misc/MessageCounterStyle.qml diff --git a/linphone-app/ui/modules/Linphone/qmldir b/linphone-app/ui/modules/Linphone/qmldir index eb53e3442..70fb41e1d 100644 --- a/linphone-app/ui/modules/Linphone/qmldir +++ b/linphone-app/ui/modules/Linphone/qmldir @@ -42,7 +42,7 @@ FileView 1.0 File/FileView.qml History 1.0 History/History.qml SipAddressesMenu 1.0 Menus/SipAddressesMenu.qml -VideoConferenceMenu 1.0 Menus/VideoConferenceMenu.qml +IncallMenu 1.0 Menus/IncallMenu.qml MessageCounter 1.0 Misc/MessageCounter.qml diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.js b/linphone-app/ui/views/App/Calls/CallsWindow.js index b003f0921..1cdce1ef4 100644 --- a/linphone-app/ui/views/App/Calls/CallsWindow.js +++ b/linphone-app/ui/views/App/Calls/CallsWindow.js @@ -87,9 +87,9 @@ function getContent (call, conferenceInfoModel) { } if(call.isConference) - return videoConference + return incall - return videoConference //incall + return incall } // ----------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml index 1815020bf..0dd919bfa 100644 --- a/linphone-app/ui/views/App/Calls/CallsWindow.qml +++ b/linphone-app/ui/views/App/Calls/CallsWindow.qml @@ -84,7 +84,7 @@ Window { maximumLeftLimit: CallsWindowStyle.callsList.maximumWidth minimumLeftLimit: CallsWindowStyle.callsList.minimumWidth - hideSplitter: !window.callsIsOpened && middlePane.sourceComponent == videoConference + hideSplitter: !window.callsIsOpened && middlePane.sourceComponent == incall // ------------------------------------------------------------------------- // Calls list. @@ -184,7 +184,7 @@ Window { minimumRightLimit: CallsWindowStyle.chat.minimumWidth resizeAInPriority: true - hideSplitter: !window.chatIsOpened && (!middlePane.sourceComponent || middlePane.sourceComponent == videoConference || !rightPane.sourceComponent) + hideSplitter: !window.chatIsOpened && (!middlePane.sourceComponent || middlePane.sourceComponent == incall || !rightPane.sourceComponent) // ----------------------------------------------------------------------- Component { @@ -195,14 +195,6 @@ Window { } } - Component { - id: incall - - Incall { - call: window.call - } - } - Component { id: chat @@ -248,8 +240,8 @@ Window { } } Component { - id: videoConference - VideoConference { + id: incall + Incall { callModel: window.call enabled: window.visible listCallsOpened: window.callsIsOpened diff --git a/linphone-app/ui/views/App/Calls/Incall.js b/linphone-app/ui/views/App/Calls/Incall.js index f33058d54..1ee3e8134 100644 --- a/linphone-app/ui/views/App/Calls/Incall.js +++ b/linphone-app/ui/views/App/Calls/Incall.js @@ -118,7 +118,7 @@ function openMediaParameters (window, incall) { call: incall.call }) } -// callerId = incall, qmlFile = 'IncallFullscreenWindow.qml' +// callerId = incall, qmlFile = 'IncallFullscreen.qml' // callerId need to have : _fullscreen and isFullScreen function showFullscreen (window, callerId, qmlFile, position) { callerId.isFullScreen = true diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml index fe8e2b011..fcf4276b5 100644 --- a/linphone-app/ui/views/App/Calls/Incall.qml +++ b/linphone-app/ui/views/App/Calls/Incall.qml @@ -1,478 +1,529 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.3 - -import Common 1.0 -import Common.Styles 1.0 -import Linphone 1.0 -import Utils 1.0 -import UtilsCpp 1.0 - -import App.Styles 1.0 - -import 'Incall.js' as Logic -import 'qrc:/ui/scripts/Utils/utils.js' as Utils - -// ============================================================================= - -Rectangle { - id: incall - - // --------------------------------------------------------------------------- - - // Used by `IncallFullscreenWindow.qml`. - readonly property bool cameraActivated: cameraIsReady || previewIsReady - - property bool cameraIsReady : false - property bool previewIsReady : false - - property CallModel call - - property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver(call.fullPeerAddress, call.fullLocalAddress) - - property bool isFullScreen: false // Use this variable to test if we are in fullscreen. Do not test _fullscreen : we need to clean memory before having the window (see .js file) - property var _fullscreen: null - on_FullscreenChanged: if( !_fullscreen) isFullScreen = false - - Component.onDestruction: _sipAddressObserver=null// Need to set it to null because of not calling destructor if not. - // --------------------------------------------------------------------------- - - color: CallStyle.backgroundColor - anchors.fill:parent - - // --------------------------------------------------------------------------- - - Connections { - target: call - - onCameraFirstFrameReceived: Logic.handleCameraFirstFrameReceived(width, height) - onStatusChanged: Logic.handleStatusChanged (status, incall._fullscreen) - onVideoRequested: Logic.handleVideoRequested(call) - } - - ColumnLayout { - anchors { - fill: parent - topMargin: CallStyle.header.topMargin - } - - spacing: 0 - - // ------------------------------------------------------------------------- - // Call info. - // ------------------------------------------------------------------------- - - Item { - id: info - - Layout.fillWidth: true - Layout.leftMargin: CallStyle.header.leftMargin - Layout.rightMargin: CallStyle.header.rightMargin - Layout.preferredHeight: CallStyle.header.contactDescription.height - - ActionBar { - id: leftActions - - anchors.left: parent.left - iconSize: CallStyle.header.iconSize - - ActionButton { - id: callQuality - - isCustom: true - backgroundRadius: 4 - colorSet: CallStyle.buttons.callQuality - icon: CallStyle.buttons.callQuality.icon_0 - - onClicked: Logic.openCallStatistics() - - // See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73 - Timer { - interval: 500 - repeat: true - running: true - triggeredOnStart: true - - onTriggered: { - // Note: `quality` is in the [0, 5] interval and -1. - var quality = call.quality - if(quality > 4) - callQuality.icon = CallStyle.buttons.callQuality.icon_4 - else if(quality > 3) - callQuality.icon = CallStyle.buttons.callQuality.icon_3 - else if(quality > 2) - callQuality.icon = CallStyle.buttons.callQuality.icon_2 - else if(quality > 1) - callQuality.icon = CallStyle.buttons.callQuality.icon_1 - else - callQuality.icon = CallStyle.buttons.callQuality.icon_0 - } - } - - CallStatistics { - id: callStatistics - - call: incall.call - width: container.width - height: container.height - - relativeTo: callQuality - relativeY: CallStyle.header.stats.relativeY - - onClosed: Logic.handleCallStatisticsClosed() - } - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallStyle.buttons.telKeyad - - onClicked: telKeypad.visible = !telKeypad.visible - } - - ActionButton { - anchors.verticalCenter: parent.verticalCenter - id: callSecure - isCustom: true - backgroundRadius: 90 - - colorSet: incall.call.isSecured ? CallStyle.buttons.secure : CallStyle.buttons.unsecure - - onClicked: zrtp.visible = (incall.call.encryption === CallModel.CallEncryptionZrtp) - - tooltipText: Logic.makeReadableSecuredString(incall.call.securedString) - } - } - - ContactDescription { - id: contactDescription - - anchors.centerIn: parent - horizontalTextAlignment: Text.AlignHCenter - sipAddress: _sipAddressObserver && _sipAddressObserver.peerAddress - username: UtilsCpp.getDisplayName(sipAddress) - - height: parent.height - width: parent.width - rightActions.width - leftActions.width - Text { - id: elapsedTime - color: CallStyle.header.elapsedTime.color - font.pointSize: CallStyle.header.elapsedTime.pointSize - horizontalAlignment: Text.AlignHCenter - width: parent.width - - Timer { - interval: 1000 - repeat: true - running: true - triggeredOnStart: true - - onTriggered: {elapsedTime.text = Utils.formatElapsedTime(call.duration);} - } - } - } - - // ----------------------------------------------------------------------- - // Video actions. - // ----------------------------------------------------------------------- - - ActionBar { - id: rightActions - - anchors.right: parent.right - iconSize: CallStyle.header.buttonIconSize - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallStyle.buttons.screenshot - - visible: incall.call.videoEnabled - - onClicked: incall.call.takeSnapshot() - - tooltipText:qsTr('takeSnapshotLabel') - } - - ActionButton { - id: recordingSwitch - - isCustom: true - backgroundRadius: 90 - colorSet: CallStyle.buttons.record - visible: SettingsModel.callRecorderEnabled - toggled: incall.call.recording - - onClicked: { - var call = incall.call - return !toggled - ? call.startRecording() - : call.stopRecording() - } - tooltipText: !toggled - ? qsTr('startRecordingLabel') - : qsTr('stopRecordingLabel') - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallStyle.buttons.fullscreen - visible: incall.call.videoEnabled - - onClicked: Logic.showFullscreen(window, incall, 'IncallFullscreenWindow.qml', contactDescription.mapToGlobal(0,0)) - } - } - } - - // ------------------------------------------------------------------------- - // Contact visual. - // ------------------------------------------------------------------------- - - Item { - id: container - - Layout.fillWidth: true - Layout.fillHeight: true - Layout.margins: CallStyle.container.margins - - Component { - id: avatar - - IncallAvatar { - call: incall.call - height: Utils.computeAvatarSize(container, CallStyle.container.avatar.maxSize, 2/3) - width: height - } - } - - Loader { - id: cameraLoader - - anchors.centerIn: parent - - active: incall.call.videoEnabled && !isFullScreen - sourceComponent: camera - - Component { - id: camera - - Camera { - call: incall.call - height: container.height - width: container.width - Component.onDestruction: { - resetWindowId() - } - } - - } - } - - Loader { - anchors.centerIn: parent - - active: !call.videoEnabled || isFullScreen - sourceComponent: avatar - } - } - - // ------------------------------------------------------------------------- - // Zrtp. - // ------------------------------------------------------------------------- - - ZrtpTokenAuthentication { - id: zrtp - - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.margins: CallStyle.container.margins - - call: incall.call - visible: !call.isSecured && call.encryption !== CallModel.CallEncryptionNone - z: Constants.zPopup - } - - // ------------------------------------------------------------------------- - // Action Buttons. - // ------------------------------------------------------------------------- - - Item { - Layout.fillWidth: true - Layout.preferredHeight: CallStyle.actionArea.height - - GridLayout { - anchors { - left: parent.left - leftMargin: CallStyle.actionArea.leftButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - - columns: incall.width < CallStyle.actionArea.lowWidth ? 2 : 4 - rowSpacing: ActionBarStyle.spacing - - Row { - spacing: CallStyle.actionArea.vu.spacing - visible: SettingsModel.muteMicrophoneEnabled - - VuMeter { - Timer { - interval: 50 - repeat: true - running: parent.enabled - - onTriggered: parent.value = incall.call.microVu - } - - enabled: !incall.call.microMuted - } - - ActionButton { - id: micro - isCustom: true - backgroundRadius: 90 - colorSet: incall.call.microMuted ? CallStyle.buttons.microOff : CallStyle.buttons.microOn - onClicked: incall.call.microMuted = !incall.call.microMuted - } - } - - Row { - spacing: CallStyle.actionArea.vu.spacing - - VuMeter { - Timer { - interval: 50 - repeat: true - running: parent.enabled - - onTriggered: parent.value = incall.call.speakerVu - } - - enabled: !incall.call.speakerMuted - } - - ActionButton { - id: speaker - isCustom: true - backgroundRadius: 90 - colorSet: incall.call.speakerMuted ? CallStyle.buttons.speakerOff : CallStyle.buttons.speakerOn - - onClicked: incall.call.speakerMuted = !incall.call.speakerMuted - } - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: incall.call.videoEnabled ? CallStyle.buttons.cameraOn : CallStyle.buttons.cameraOff - updating: incall.call.videoEnabled && incall.call.updating - visible: SettingsModel.videoSupported - - onClicked: incall.call.videoEnabled = !incall.call.videoEnabled - - TooltipArea { - text: qsTr('pendingRequestLabel') - visible: parent.updating - } - } - - ActionButton { - Layout.preferredHeight: CallStyle.buttons.options.iconSize - Layout.preferredWidth: CallStyle.buttons.options.iconSize - - isCustom: true - backgroundRadius: 90 - colorSet: CallStyle.buttons.options - - onClicked: Logic.openMediaParameters(window, incall) - } - } - - // ----------------------------------------------------------------------- - // Preview. - // ----------------------------------------------------------------------- - - Loader { - id: cameraPreviewLoader - - anchors.centerIn: parent - height: CallStyle.actionArea.height - width: 16*height/9 - active: incall.width >= CallStyle.actionArea.lowWidth && incall.call.videoEnabled && !isFullScreen - sourceComponent: cameraPreview - Component { - id: cameraPreview - - Camera { - anchors.fill: parent - call: incall.call - isPreview: true - Component.onDestruction: { - resetWindowId() - } - } - } - } - - ActionBar { - id: bottomActions - - anchors { - right: parent.right - rightMargin: CallStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - iconSize: CallStyle.actionArea.iconSize - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: call.pausedByUser ? CallStyle.buttons.play : CallStyle.buttons.pause - updating: incall.call.updating - visible: SettingsModel.callPauseEnabled - - onClicked: incall.call.pausedByUser = !incall.call.pausedByUser - - TooltipArea { - text: qsTr('pendingRequestLabel') - visible: parent.updating - } - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallStyle.buttons.hangup - - onClicked: incall.call.terminate() - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && SettingsModel.showStartChatButton ? CallStyle.buttons.chat : CallStyle.buttons.history - - onClicked: { - if (window.chatIsOpened) { - window.closeChat() - } else { - window.openChat() - } - } - } - } - } - } - - // --------------------------------------------------------------------------- - // TelKeypad. - // --------------------------------------------------------------------------- - - TelKeypad { - id: telKeypad - showHistory: true - call: incall.call - visible: SettingsModel.showTelKeypadAutomatically - y: 50 - } -} +import QtQuick 2.7 +import QtQuick.Layouts 1.3 +import QtQml.Models 2.12 +import QtGraphicalEffects 1.12 + +import Common 1.0 +import Common.Styles 1.0 +import Linphone 1.0 + +import LinphoneEnums 1.0 +import UtilsCpp 1.0 + +import App.Styles 1.0 + + +// Temp +import 'Incall.js' as Logic +import 'qrc:/ui/scripts/Utils/utils.js' as Utils + +// ============================================================================= + +Rectangle { + id: conference + + property CallModel callModel + property ConferenceModel conferenceModel: callModel && callModel.conferenceModel + property bool cameraIsReady : false + property bool previewIsReady : false + property bool isFullScreen: false // Use this variable to test if we are in fullscreen. Do not test _fullscreen : we need to clean memory before having the window (see .js file) + property var _fullscreen: null + on_FullscreenChanged: if( !_fullscreen) isFullScreen = false + + property bool listCallsOpened: true + + signal openListCallsRequest() + // --------------------------------------------------------------------------- + + color: IncallStyle.backgroundColor + + Connections { + target: callModel + + onCameraFirstFrameReceived: Logic.handleCameraFirstFrameReceived(width, height) + onStatusChanged: Logic.handleStatusChanged (status, conference._fullscreen) + onVideoRequested: Logic.handleVideoRequested(callModel) + } + + // --------------------------------------------------------------------------- + Rectangle{ + MouseArea{ + anchors.fill: parent + } + anchors.fill: parent + visible: callModel.pausedByUser + color: IncallStyle.pauseArea.backgroundColor + z: 1 + ColumnLayout{ + anchors.fill: parent + spacing: 10 + Item{ + Layout.fillWidth: true + Layout.fillHeight: true + } + ActionButton{ + Layout.alignment: Qt.AlignCenter + isCustom: true + colorSet: IncallStyle.pauseArea.play + backgroundRadius: width/2 + onClicked: callModel.pausedByUser = !callModel.pausedByUser + } + Text{ + Layout.alignment: Qt.AlignCenter + //: 'You are currently out of the conference.' : Pause message in video conference. + text: qsTr('incallPauseWarning') + font.pointSize: IncallStyle.pauseArea.title.pointSize + font.weight: IncallStyle.pauseArea.title.weight + color: IncallStyle.pauseArea.title.color + } + Text{ + Layout.alignment: Qt.AlignCenter + //: 'Click on play button to join it back.' : Explain what to do when being in pause in conference. + text: qsTr('incallPauseHint') + font.pointSize: IncallStyle.pauseArea.description.pointSize + font.weight: IncallStyle.pauseArea.description.weight + color: IncallStyle.pauseArea.description.color + } + Item{ + Layout.fillWidth: true + Layout.preferredHeight: 140 + } + } + } + + // ------------------------------------------------------------------------- + // Conference info. + // ------------------------------------------------------------------------- + RowLayout{ + id: featuresRow + // Aux features + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + + anchors.topMargin: 10 + anchors.leftMargin: 25 + anchors.rightMargin: 25 + spacing: 10 + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.callsList + visible: !listCallsOpened + onClicked: openListCallsRequest() + } + ActionButton{ + id: keypadButton + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.dialpad + toggled: telKeypad.visible + onClicked: telKeypad.visible = !telKeypad.visible + } + ActionButton { + id: callQuality + + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.callQuality + icon: IncallStyle.buttons.callQuality.icon_0 + toggled: callStatistics.isOpen + + onClicked: callStatistics.isOpen ? callStatistics.close() : callStatistics.open() + Timer { + interval: 500 + repeat: true + running: true + triggeredOnStart: true + onTriggered: { + // Note: `quality` is in the [0, 5] interval and -1. + var quality = callModel.quality + if(quality > 4) + callQuality.icon = IncallStyle.buttons.callQuality.icon_4 + else if(quality > 3) + callQuality.icon = IncallStyle.buttons.callQuality.icon_3 + else if(quality > 2) + callQuality.icon = IncallStyle.buttons.callQuality.icon_2 + else if(quality > 1) + callQuality.icon = IncallStyle.buttons.callQuality.icon_1 + else + callQuality.icon = IncallStyle.buttons.callQuality.icon_0 + } + } + } + + // Title + ColumnLayout{ + Layout.fillWidth: true + Text{ + id: title + Timer{ + id: elapsedTimeRefresher + running: true + interval: 1000 + repeat: true + onTriggered: if(conferenceModel) parent.elaspedTime = ' - ' +Utils.formatElapsedTime(conferenceModel.getElapsedSeconds()) + else parent.elaspedTime = Utils.formatElapsedTime(conference.callModel.duration) + } + property string elaspedTime + horizontalAlignment: Qt.AlignHCenter + Layout.fillWidth: true + text: conferenceModel + ? conferenceModel.subject+ elaspedTime + : callModel + ? elaspedTime + : '' + color: IncallStyle.title.color + font.pointSize: IncallStyle.title.pointSize + } + Text{ + id: address + Layout.fillWidth: true + horizontalAlignment: Qt.AlignHCenter + visible: !conferenceModel && callModel + text: !conferenceModel && callModel + ? callModel.peerAddress + : '' + color: IncallStyle.title.color + font.pointSize: IncallStyle.title.addressPointSize + } + + } + // Mode buttons + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.screenSharing + visible: false //TODO + } + ActionButton { + id: recordingSwitch + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.record + property CallModel callModel: conference.callModel + onCallModelChanged: if(!callModel) callModel.stopRecording() + visible: SettingsModel.callRecorderEnabled && callModel + toggled: callModel.recording + + onClicked: { + return !toggled + ? callModel.startRecording() + : callModel.stopRecording() + } + //: 'Start recording' : Tootltip when straing record. + tooltipText: !toggled ? qsTr('incallStartRecordTooltip') + //: 'Stop Recording' : Tooltip when stopping record. + : qsTr('incallStopRecordTooltip') + } + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.screenshot + visible: conference.callModel.snapshotEnabled + onClicked: conference.callModel.takeSnapshot() + //: 'Take Snapshot' : Tooltip for takking snapshot. + tooltipText: qsTr('incallSnapshotTooltip') + } + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.fullscreen + visible: conference.callModel.videoEnabled + onClicked: Logic.showFullscreen(window, conference, 'IncallFullscreen.qml', title.mapToGlobal(0,0)) + } + + } + + // ------------------------------------------------------------------------- + // Contacts visual. + // ------------------------------------------------------------------------- + + Item{ + id: mainGrid + anchors.top: featuresRow.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: zrtp.top + + anchors.topMargin: 15 + anchors.bottomMargin: 20 + + Component{ + id: gridComponent + IncallGrid{ + id: grid + Layout.leftMargin: 70 + Layout.rightMargin: rightMenu.visible ? 15 : 70 + callModel: conference.callModel + cameraEnabled: !conference.isFullScreen + } + } + Component{ + id: activeSpeakerComponent + IncallActiveSpeaker{ + id: activeSpeaker + callModel: conference.callModel + isRightReducedLayout: rightMenu.visible + isLeftReducedLayout: conference.listCallsOpened + cameraEnabled: !conference.isFullScreen + onCameraEnabledChanged: console.log(cameraEnabled) + } + } + RowLayout{ + anchors.fill: parent + Loader{ + id: conferenceLayout + Layout.fillHeight: true + Layout.fillWidth: true + sourceComponent: conference.conferenceModel + ? conference.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid || !conference.callModel.videoEnabled? gridComponent : activeSpeakerComponent + : activeSpeakerComponent + onSourceComponentChanged: console.log("conferenceLayout: "+conference.callModel.conferenceVideoLayout) + active: conference.callModel + ColumnLayout { + anchors.fill: parent + visible: !conference.callModel || !conferenceLayout.item || conferenceLayout.item.participantCount == 0 + BusyIndicator{ + Layout.preferredHeight: 50 + Layout.preferredWidth: 50 + Layout.alignment: Qt.AlignCenter + running: parent.visible + color: IncallStyle.buzyColor + } + Text{ + Layout.alignment: Qt.AlignCenter + + text: conference.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid && !conference.callModel.videoEnabled + //: 'Waiting for another participant...' : Waiting message for more participant. + ? qsTr('incallWaitParticipantMessage') + //: 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. + : qsTr('incallWaitMessage') + color: IncallStyle.buzyColor + } + } + } + IncallMenu{ + id: rightMenu + Layout.fillHeight: true + Layout.preferredWidth: 400 + Layout.rightMargin: 30 + callModel: conference.callModel + conferenceModel: conference.conferenceModel + visible: false + onClose: rightMenu.visible = !rightMenu.visible + onLayoutChanging: conferenceLayout.item.clearAll(layoutMode) + } + } + } + + ZrtpTokenAuthentication { + id: zrtp + + anchors.horizontalCenter: parent.horizontalCenter + anchors.margins: CallStyle.container.margins + anchors.bottom: actionsButtons.top + height: visible ? implicitHeight : 0 + + call: callModel + visible: !call.isSecured && call.encryption !== CallModel.CallEncryptionNone + z: Constants.zPopup + } + // ------------------------------------------------------------------------- + // Action Buttons. + // ------------------------------------------------------------------------- + + // Security + ActionButton{ + id: securityButton + visible: callModel && !callModel.isConference + anchors.left: parent.left + anchors.verticalCenter: actionsButtons.verticalCenter + anchors.leftMargin: 25 + height: IncallStyle.buttons.secure.buttonSize + width: height + isCustom: true + backgroundRadius: width/2 + + colorSet: callModel.isSecured ? IncallStyle.buttons.secure : IncallStyle.buttons.unsecure + + onClicked: zrtp.visible = (callModel.encryption === CallModel.CallEncryptionZrtp) + + tooltipText: Logic.makeReadableSecuredString(callModel.securedString) + } + RowLayout{ + visible: callModel.remoteRecording + + anchors.verticalCenter: actionsButtons.verticalCenter + anchors.left: securityButton.right + anchors.leftMargin: 20 + anchors.right: actionsButtons.left + anchors.rightMargin: 10 + + Icon{ + icon: IncallStyle.recordWarning.icon + iconSize: IncallStyle.recordWarning.iconSize + overwriteColor: IncallStyle.recordWarning.iconColor + } + Text{ + Layout.fillWidth: true + //: 'This call is being recorded.' : Warn the user that the remote is currently recording the call. + text: qsTr('callWarningRecord') + color: IncallStyle.recordWarning.color + font.italic: true + font.pointSize: IncallStyle.recordWarning.pointSize + wrapMode: Text.WordWrap + } + } + // Action buttons + RowLayout{ + id: actionsButtons + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom + anchors.bottomMargin: 30 + height: 60 + spacing: 30 + z: 2 + RowLayout{ + spacing: 10 + Row { + spacing: 2 + visible: SettingsModel.muteMicrophoneEnabled + property bool microMuted: callModel.microMuted + + VuMeter { + enabled: !parent.microMuted + Timer { + interval: 50 + repeat: true + running: parent.enabled + + onTriggered: parent.value = callModel.microVu + } + } + ActionSwitch { + id: micro + isCustom: true + backgroundRadius: 90 + colorSet: parent.microMuted ? IncallStyle.buttons.microOff : IncallStyle.buttons.microOn + onClicked: callModel.microMuted = !parent.microMuted + } + } + Row { + spacing: 2 + property bool speakerMuted: callModel.speakerMuted + VuMeter { + enabled: !parent.speakerMuted + Timer { + interval: 50 + repeat: true + running: parent.enabled + onTriggered: parent.value = callModel.speakerVu + } + } + ActionSwitch { + id: speaker + isCustom: true + backgroundRadius: 90 + colorSet: parent.speakerMuted ? IncallStyle.buttons.speakerOff : IncallStyle.buttons.speakerOn + onClicked: callModel.speakerMuted = !parent.speakerMuted + } + } + ActionSwitch { + id: camera + isCustom: true + backgroundRadius: 90 + colorSet: callModel && callModel.cameraEnabled ? IncallStyle.buttons.cameraOn : IncallStyle.buttons.cameraOff + updating: callModel.videoEnabled && callModel.updating + enabled: callModel.videoEnabled + onClicked: if(callModel){ + if( callModel.isConference)// Only deactivate camera in conference. + callModel.cameraEnabled = !callModel.cameraEnabled + else// In one-one, we deactivate all videos. + callModel.videoEnabled = !callModel.videoEnabled + } + } + + } + RowLayout{ + spacing: 10 + ActionButton{ + isCustom: true + backgroundRadius: width/2 + visible: SettingsModel.callPauseEnabled + updating: callModel.updating + colorSet: callModel.pausedByUser ? IncallStyle.buttons.play : IncallStyle.buttons.pause + onClicked: callModel.pausedByUser = !callModel.pausedByUser + } + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.hangup + + onClicked: callModel.terminate() + } + } + } + + // Panel buttons + RowLayout{ + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.bottomMargin: 30 + anchors.rightMargin: 25 + height: 60 + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.chat + visible: (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && callModel && !callModel.isConference + toggled: window.chatIsOpened + onClicked: { + if (window.chatIsOpened) { + window.closeChat() + } else { + window.openChat() + } + } + } + ActionButton{ + visible: callModel && callModel.isConference + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.participants + toggled: rightMenu.visible && rightMenu.isParticipantsMenu + onClicked: { + if(toggled) + rightMenu.visible = false + else + rightMenu.showParticipantsMenu() + } + } + + ActionButton{ + isCustom: true + backgroundRadius: width/2 + colorSet: IncallStyle.buttons.options + toggled: rightMenu.visible + onClicked: rightMenu.visible = !rightMenu.visible + } + } + + // --------------------------------------------------------------------------- + // TelKeypad. + // --------------------------------------------------------------------------- + CallStatistics { + id: callStatistics + + call: conference.callModel + width: conference.width + height: conference.height + } + TelKeypad { + id: telKeypad + showHistory:true + call: callModel + visible: SettingsModel.showTelKeypadAutomatically + y: 70 + } +} diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml similarity index 88% rename from linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml rename to linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml index 4291cdcc6..da67df360 100644 --- a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml +++ b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml @@ -65,8 +65,8 @@ Item { showCloseButton: false showActiveSpeakerOverlay: false // This is an active speaker. We don't need to show the indicator. showCustomButton: false - avatarStickerBackgroundColor: VideoConferenceStyle.container.avatar.stickerBackgroundColor - avatarBackgroundColor: VideoConferenceStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor } ScrollableListView{ id: miniViews @@ -104,8 +104,8 @@ Item { showCloseButton: false showCustomButton: false showAvatarBorder: true - avatarStickerBackgroundColor: VideoConferenceStyle.container.avatar.stickerBackgroundColor - avatarBackgroundColor: VideoConferenceStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor //onCloseRequested: mainItem.showMe = false } } diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml similarity index 79% rename from linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml rename to linphone-app/ui/views/App/Calls/IncallFullscreen.qml index f25601cd9..a82d1827e 100644 --- a/linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml +++ b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml @@ -75,7 +75,7 @@ Window { focus: true Keys.onEscapePressed: window.exit() - color: hideButtons ? VideoConferenceStyle.fullBackgroundColor : VideoConferenceStyle.backgroundColor + color: hideButtons ? IncallStyle.fullBackgroundColor : IncallStyle.backgroundColor Connections { target: callModel @@ -89,7 +89,7 @@ Window { Rectangle{ anchors.fill: parent visible: callModel && callModel.pausedByUser - color: VideoConferenceStyle.pauseArea.backgroundColor + color: IncallStyle.pauseArea.backgroundColor z: 1 ColumnLayout{ anchors.fill: parent @@ -101,7 +101,7 @@ Window { ActionButton{ Layout.alignment: Qt.AlignCenter isCustom: true - colorSet: VideoConferenceStyle.pauseArea.play + colorSet: IncallStyle.pauseArea.play backgroundRadius: width/2 onClicked: if(callModel) callModel.pausedByUser = !callModel.pausedByUser } @@ -109,18 +109,18 @@ Window { Layout.alignment: Qt.AlignCenter //: 'You are currently out of the conference.' : Pause message in video conference. - text: qsTr('videoConferencePauseWarning') - font.pointSize: VideoConferenceStyle.pauseArea.title.pointSize - font.weight: VideoConferenceStyle.pauseArea.title.weight - color: VideoConferenceStyle.pauseArea.title.color + text: qsTr('incallPauseWarning') + font.pointSize: IncallStyle.pauseArea.title.pointSize + font.weight: IncallStyle.pauseArea.title.weight + color: IncallStyle.pauseArea.title.color } Text{ Layout.alignment: Qt.AlignCenter //: 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - text: qsTr('videoConferencePauseHint') - font.pointSize: VideoConferenceStyle.pauseArea.description.pointSize - font.weight: VideoConferenceStyle.pauseArea.description.weight - color: VideoConferenceStyle.pauseArea.description.color + text: qsTr('incallPauseHint') + font.pointSize: IncallStyle.pauseArea.description.pointSize + font.weight: IncallStyle.pauseArea.description.weight + color: IncallStyle.pauseArea.description.color } Item{ Layout.fillWidth: true @@ -151,7 +151,7 @@ Window { id: keypadButton isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.dialpad + colorSet: IncallStyle.buttons.dialpad onClicked: telKeypad.visible = !telKeypad.visible } ActionButton { @@ -159,8 +159,8 @@ Window { isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.callQuality - icon: VideoConferenceStyle.buttons.callQuality.icon_0 + colorSet: IncallStyle.buttons.callQuality + icon: IncallStyle.buttons.callQuality.icon_0 toggled: callStatistics.isOpen onClicked: callStatistics.isOpen ? callStatistics.close() : callStatistics.open() @@ -175,15 +175,15 @@ Window { // Note: `quality` is in the [0, 5] interval and -1. var quality = callModel.quality if(quality > 4) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_4 + callQuality.icon = IncallStyle.buttons.callQuality.icon_4 else if(quality > 3) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_3 + callQuality.icon = IncallStyle.buttons.callQuality.icon_3 else if(quality > 2) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_2 + callQuality.icon = IncallStyle.buttons.callQuality.icon_2 else if(quality > 1) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_1 + callQuality.icon = IncallStyle.buttons.callQuality.icon_1 else - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_0 + callQuality.icon = IncallStyle.buttons.callQuality.icon_0 } } } @@ -201,21 +201,21 @@ Window { horizontalAlignment: Qt.AlignHCenter Layout.fillWidth: true text: conference.conferenceModel ? conference.conferenceModel.subject+ elaspedTime : '' - color: VideoConferenceStyle.title.color - font.pointSize: VideoConferenceStyle.title.pointSize + color: IncallStyle.title.color + font.pointSize: IncallStyle.title.pointSize } // Mode buttons ActionButton{ isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.screenSharing + colorSet: IncallStyle.buttons.screenSharing visible: false //TODO } ActionButton { id: recordingSwitch isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.record + colorSet: IncallStyle.buttons.record property CallModel callModel: conference.callModel onCallModelChanged: if(callModel) callModel.stopRecording() visible: SettingsModel.callRecorderEnabled && callModel @@ -227,23 +227,23 @@ Window { : callModel.stopRecording() } //: 'Start recording' : Tootltip when straing record. - tooltipText: !toggled ? qsTr('videoConferenceStartRecordTooltip') + tooltipText: !toggled ? qsTr('incallStartRecordTooltip') //: 'Stop Recording' : Tooltip when stopping record. - : qsTr('videoConferenceStopRecordTooltip') + : qsTr('incallStopRecordTooltip') } ActionButton{ isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.screenshot + colorSet: IncallStyle.buttons.screenshot visible: conference.callModel && conference.callModel.snapshotEnabled onClicked: conference.callModel && conference.callModel.takeSnapshot() //: 'Take Snapshot' : Tooltip for takking snapshot. - tooltipText: qsTr('videoConferenceSnapshotTooltip') + tooltipText: qsTr('incallSnapshotTooltip') } ActionButton{ isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.stopFullscreen + colorSet: IncallStyle.buttons.stopFullscreen onClicked: window.exit() } @@ -271,7 +271,7 @@ Window { Component{ id: gridComponent - VideoConferenceGrid{ + IncallGrid{ id: grid Layout.leftMargin: window.hideButtons ? 15 : 70 Layout.rightMargin: rightMenu.visible ? 15 : 70 @@ -281,7 +281,7 @@ Window { } Component{ id: activeSpeakerComponent - VideoConferenceActiveSpeaker{ + IncallActiveSpeaker{ id: activeSpeaker callModel: conference.callModel isRightReducedLayout: rightMenu.visible @@ -309,17 +309,17 @@ Window { Layout.preferredWidth: 50 Layout.alignment: Qt.AlignCenter running: parent.visible - color: VideoConferenceStyle.buzyColor + color: IncallStyle.buzyColor } Text{ Layout.alignment: Qt.AlignCenter //: 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - text: qsTr('videoConferenceWaitMessage') - color: VideoConferenceStyle.buzyColor + text: qsTr('incallWaitMessage') + color: IncallStyle.buzyColor } } } - VideoConferenceMenu{ + IncallMenu{ id: rightMenu Layout.fillHeight: true Layout.preferredWidth: 400 @@ -353,12 +353,12 @@ Window { anchors.left: parent.left anchors.verticalCenter: actionsButtons.verticalCenter anchors.leftMargin: 25 - height: VideoConferenceStyle.buttons.secure.buttonSize + height: IncallStyle.buttons.secure.buttonSize width: height isCustom: true backgroundRadius: width/2 - colorSet: callModel.isSecured ? VideoConferenceStyle.buttons.secure : VideoConferenceStyle.buttons.unsecure + colorSet: callModel.isSecured ? IncallStyle.buttons.secure : IncallStyle.buttons.unsecure onClicked: zrtp.visible = (callModel.encryption === CallModel.CallEncryptionZrtp) @@ -376,17 +376,17 @@ Window { anchors.rightMargin: 10 Icon{ - icon: VideoConferenceStyle.recordWarning.icon - iconSize: VideoConferenceStyle.recordWarning.iconSize - overwriteColor: VideoConferenceStyle.recordWarning.iconColor + icon: IncallStyle.recordWarning.icon + iconSize: IncallStyle.recordWarning.iconSize + overwriteColor: IncallStyle.recordWarning.iconColor } Text{ Layout.fillWidth: true //: 'This call is being recorded.' : Warn the user that the remote is currently recording the call. text: qsTr('callWarningRecord') - color: VideoConferenceStyle.recordWarning.color + color: IncallStyle.recordWarning.color font.italic: true - font.pointSize: VideoConferenceStyle.recordWarning.pointSize + font.pointSize: IncallStyle.recordWarning.pointSize wrapMode: Text.WordWrap } } @@ -421,7 +421,7 @@ Window { id: micro isCustom: true backgroundRadius: 90 - colorSet: parent.microMuted ? VideoConferenceStyle.buttons.microOff : VideoConferenceStyle.buttons.microOn + colorSet: parent.microMuted ? IncallStyle.buttons.microOff : IncallStyle.buttons.microOn onClicked: if(callModel) callModel.microMuted = !parent.microMuted } } @@ -441,7 +441,7 @@ Window { id: speaker isCustom: true backgroundRadius: 90 - colorSet: parent.speakerMuted ? VideoConferenceStyle.buttons.speakerOff : VideoConferenceStyle.buttons.speakerOn + colorSet: parent.speakerMuted ? IncallStyle.buttons.speakerOff : IncallStyle.buttons.speakerOn onClicked: if(callModel) callModel.speakerMuted = !parent.speakerMuted } } @@ -449,7 +449,7 @@ Window { id: camera isCustom: true backgroundRadius: 90 - colorSet: callModel && callModel.cameraEnabled ? VideoConferenceStyle.buttons.cameraOn : VideoConferenceStyle.buttons.cameraOff + colorSet: callModel && callModel.cameraEnabled ? IncallStyle.buttons.cameraOn : IncallStyle.buttons.cameraOff updating: callModel && callModel.videoEnabled && callModel.updating enabled: callModel && callModel.videoEnabled onClicked: if(callModel) callModel.cameraEnabled = !callModel.cameraEnabled @@ -462,13 +462,13 @@ Window { backgroundRadius: width/2 visible: SettingsModel.callPauseEnabled updating: callModel && callModel.updating - colorSet: callModel && callModel.pausedByUser ? VideoConferenceStyle.buttons.play : VideoConferenceStyle.buttons.pause + colorSet: callModel && callModel.pausedByUser ? IncallStyle.buttons.play : IncallStyle.buttons.pause onClicked: if(callModel) callModel.pausedByUser = !callModel.pausedByUser } ActionButton{ isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.hangup + colorSet: IncallStyle.buttons.hangup onClicked: if(callModel) callModel.terminate() } @@ -487,7 +487,7 @@ Window { ActionButton{ isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.chat + colorSet: IncallStyle.buttons.chat visible: false && (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && callModel && !callModel.isConference toggled: window.chatIsOpened onClicked: { @@ -502,7 +502,7 @@ Window { visible: callModel && callModel.isConference isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.participants + colorSet: IncallStyle.buttons.participants toggled: rightMenu.visible && rightMenu.isParticipantsMenu onClicked: { if(toggled) @@ -515,7 +515,7 @@ Window { ActionButton{ isCustom: true backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.options + colorSet: IncallStyle.buttons.options toggled: rightMenu.visible onClicked: rightMenu.visible = !rightMenu.visible } diff --git a/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml b/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml deleted file mode 100644 index 642ef74d6..000000000 --- a/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml +++ /dev/null @@ -1,533 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.3 -import QtQuick.Window 2.2 - -import Common 1.0 -import Common.Styles 1.0 -import DesktopTools 1.0 -import Linphone 1.0 -import Utils 1.0 - -import App.Styles 1.0 - -import 'Incall.js' as Logic - -// ============================================================================= - -Window { - id: window - - // --------------------------------------------------------------------------- - - property var call - property var caller - property bool hideButtons: false - property bool cameraIsReady : false - property bool previewIsReady : false - - // --------------------------------------------------------------------------- - - function exit (cb) { - DesktopTools.screenSaverStatus = true - - // `exit` is called by `Incall.qml`. - // The `window` id can be null if the window was closed in this view. - if (!window) { - return - } - - if(!window.close() && parent) - parent.close() - - - if (cb) { - cb() - } - } - - // --------------------------------------------------------------------------- - onCallChanged: if(!call) window.exit() - Component.onCompleted: { - window.call = caller.call - } - // --------------------------------------------------------------------------- - - Shortcut { - sequence: StandardKey.Close - onActivated: window.exit() - } - - // --------------------------------------------------------------------------- - - Rectangle { - id:container - anchors.fill: parent - color: '#000000' // Not a style. - focus: true - - Keys.onEscapePressed: window.exit() - - Loader { - anchors.fill: parent - - active: { - var caller = window.caller - return window.cameraIsReady && caller && !caller.cameraActivated - } - - sourceComponent: camera - - Component { - id: camera - - Camera { - call: window.call - Component.onDestruction: { - resetWindowId() - } - } - } - } - // ------------------------------------------------------------------------- - // Handle mouse move / Hide buttons. - // ------------------------------------------------------------------------- - - MouseArea { - Timer { - id: hideButtonsTimer - - interval: 5000 - running: true - - onTriggered: hideButtons = true - } - - anchors.fill: parent - acceptedButtons: Qt.NoButton - propagateComposedEvents: true - cursorShape: Qt.ArrowCursor - - onEntered: hideButtonsTimer.start() - onExited: hideButtonsTimer.stop() - - onPositionChanged: { - hideButtonsTimer.stop() - hideButtons = false - hideButtonsTimer.start() - } - } - - ColumnLayout { - anchors { - fill: parent - topMargin: CallFullscreenStyle.header.topMargin - } - - spacing: 0 - - // ----------------------------------------------------------------------- - // Call info. - // ----------------------------------------------------------------------- - - Item { - id: info - - Layout.alignment: Qt.AlignTop - Layout.fillWidth: true - Layout.leftMargin: CallFullscreenStyle.header.leftMargin - Layout.preferredHeight: CallFullscreenStyle.header.contactDescription.height - Layout.rightMargin: CallFullscreenStyle.header.rightMargin - - ActionBar { - anchors.left: parent.left - iconSize: CallFullscreenStyle.header.iconSize - visible: !hideButtons - - ActionButton { - id: callQuality - isCustom: true - backgroundRadius: 4 - colorSet: CallFullscreenStyle.buttons.callQuality - icon: CallStyle.buttons.callQuality.icon_0 - onClicked: Logic.openCallStatistics() - - // See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73 - Timer { - interval: 5000 - repeat: true - running: true - triggeredOnStart: true - - onTriggered: { - // Note: `quality` is in the [0, 5] interval and -1. - var quality = window.call.quality - if(quality > 4) - callQuality.icon = CallStyle.buttons.callQuality.icon_4 - else if(quality > 3) - callQuality.icon = CallStyle.buttons.callQuality.icon_3 - else if(quality > 2) - callQuality.icon = CallStyle.buttons.callQuality.icon_2 - else if(quality > 1) - callQuality.icon = CallStyle.buttons.callQuality.icon_1 - else - callQuality.icon = CallStyle.buttons.callQuality.icon_0 - } - } - - CallStatistics { - id: callStatistics - enabled: window.call - call: window.call - width: container.width - - relativeTo: callQuality - relativeY: CallFullscreenStyle.header.stats.relativeY - - onClosed: Logic.handleCallStatisticsClosed() - } - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallFullscreenStyle.buttons.telKeyad - - onClicked: telKeypad.visible = !telKeypad.visible - } - - ActionButton { - id: callSecure - anchors.verticalCenter: parent.verticalCenter - isCustom: true - backgroundRadius: 90 - colorSet: window.call && window.call.isSecured ? CallFullscreenStyle.buttons.secure : CallFullscreenStyle.buttons.unsecure - iconSize: CallFullscreenStyle.header.iconSize - - onClicked: zrtp.visible = (window.call.encryption === CallModel.CallEncryptionZrtp) - tooltipText: window.call?Logic.makeReadableSecuredString(window.call.securedString):'' - } - - } - - // --------------------------------------------------------------------- - // Timer. - // --------------------------------------------------------------------- - - Text { - id: elapsedTime - - anchors.fill: parent - - font.pointSize: CallFullscreenStyle.header.elapsedTime.fullscreen.pointSize - - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - - visible: !window.hideButtons - - // Not a customizable style. - color: 'white' - style: Text.Raised - styleColor: 'black' - - Component.onCompleted: { - var updateDuration = function () { - if(window.caller){ - var call = window.caller.call - text = Utils.formatElapsedTime(call.duration) - Utils.setTimeout(elapsedTime, 1000, updateDuration) - } - } - - updateDuration() - } - } - - // --------------------------------------------------------------------- - // Video actions. - // --------------------------------------------------------------------- - - ActionBar { - anchors.right: parent.right - iconSize: CallFullscreenStyle.header.buttonIconSize - visible: !hideButtons - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallFullscreenStyle.buttons.screenshot - - onClicked: call.takeSnapshot() - - tooltipText: qsTr('takeSnapshotLabel') - } - - ActionButton { - id: recordingSwitch - toggled: call && call.recording - isCustom: true - backgroundRadius: 90 - colorSet: CallFullscreenStyle.buttons.record - visible: SettingsModel.callRecorderEnabled - - onClicked: !toggled - ? call.startRecording() - : call.stopRecording() - - tooltipText: !toggled - ? qsTr('startRecordingLabel') - : qsTr('stopRecordingLabel') - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallFullscreenStyle.buttons.stopFullscreen - - onClicked: window.exit() - } - } - - } - - // ----------------------------------------------------------------------- - // Action Buttons. - // ----------------------------------------------------------------------- - - // ------------------------------------------------------------------------- - // Zrtp. - // ------------------------------------------------------------------------- - - ZrtpTokenAuthentication { - id: zrtp - - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.margins: CallFullscreenStyle.container.margins - call: window.call - visible: call && !call.isSecured && call.encryption !== CallModel.CallEncryptionNone - z: Constants.zPopup - color: CallFullscreenStyle.backgroundColor - } - Item { - Layout.alignment: Qt.AlignBottom - Layout.fillWidth: true - Layout.preferredHeight: CallFullscreenStyle.actionArea.height - visible: !hideButtons - - GridLayout { - anchors { - left: parent.left - leftMargin: CallFullscreenStyle.actionArea.leftButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - - rowSpacing: ActionBarStyle.spacing - - Row { - spacing: CallFullscreenStyle.actionArea.vu.spacing - visible: SettingsModel.muteMicrophoneEnabled - - VuMeter { - Timer { - interval: 50 - repeat: true - running: micro.enabled - - onTriggered: parent.value = call.microVu - } - - enabled: micro.enabled - } - - ActionSwitch { - id: micro - isCustom: true - backgroundRadius: 90 - colorSet: enabled ? CallFullscreenStyle.buttons.microOn : CallFullscreenStyle.buttons.microOff - enabled: call && !call.microMuted - onClicked: call.microMuted = enabled - } - } - - Row { - spacing: CallFullscreenStyle.actionArea.vu.spacing - - VuMeter { - Timer { - interval: 50 - repeat: true - running: parent.enabled - - onTriggered: parent.value = call.speakerVu - } - - enabled: !speaker.muted - } - - ActionButton { - id: speaker - property bool muted : call && call.speakerMuted - isCustom: true - backgroundRadius: 90 - colorSet: muted ? CallFullscreenStyle.buttons.speakerOff : CallFullscreenStyle.buttons.speakerOn - iconSize: CallFullscreenStyle.actionArea.iconSize - - onClicked: call.speakerMuted = !call.speakerMuted - } - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: call && call.videoEnabled ? CallStyle.buttons.cameraOn : CallStyle.buttons.cameraOff - updating: call && call.updating - - iconSize: CallFullscreenStyle.actionArea.iconSize - - - onClicked: window.exit(function () { call.videoEnabled = false }) - } - - ActionButton { - Layout.preferredHeight: CallFullscreenStyle.actionArea.iconSize - Layout.preferredWidth: CallFullscreenStyle.actionArea.iconSize - - isCustom: true - backgroundRadius: 90 - colorSet: CallFullscreenStyle.buttons.options - iconSize: CallFullscreenStyle.actionArea.iconSize - - onClicked: Logic.openMediaParameters(Window.window, window) - } - } - - ActionBar { - anchors { - right: parent.right - rightMargin: CallFullscreenStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - iconSize: CallFullscreenStyle.actionArea.iconSize - - ActionSwitch { - isCustom: true - backgroundRadius: 90 - colorSet: call && call.pausedByUser ? CallFullscreenStyle.buttons.play : CallFullscreenStyle.buttons.pause - updating: call && call.updating - visible: SettingsModel.callPauseEnabled - - onClicked: window.exit(function () { call.pausedByUser = !call.pausedByUser }) - } - - ActionButton { - isCustom: true - backgroundRadius: 90 - colorSet: CallFullscreenStyle.buttons.hangup - - onClicked: window.exit(call.terminate) - } - } - } - } - } - - // --------------------------------------------------------------------------- - // Preview. - // --------------------------------------------------------------------------- - - Loader { - active: { - var caller = window.caller - return window.previewIsReady && caller && !caller.cameraActivated - } - - sourceComponent: cameraPreview - - Component { - id: cameraPreview - - Camera { - id:cameraPreviewItem - property double scale: 1.0 - - function xPosition () { - return window.width / 2 - width / 2 - } - - function yPosition () { - return window.height - height - } - - function resetPosition(){ - x = xPosition (); - y = yPosition (); - } - - call: window.call - isPreview: true - Component.onDestruction: { - resetWindowId() - } - - height: Math.min(window.height, (CallFullscreenStyle.actionArea.userVideo.height * window.height/CallFullscreenStyle.actionArea.userVideo.heightReference) * scale) - width: Math.min(window.width, (CallFullscreenStyle.actionArea.userVideo.width * window.width/CallFullscreenStyle.actionArea.userVideo.widthReference) * scale ) - DragBox { - container: window - draggable: parent - - xPosition: parent.xPosition - yPosition: parent.yPosition - - property double startTime: 0 - - onWheel: { - var acceleration = 0.1; - if(startTime == 0){ - startTime = new Date().getTime(); - }else{ - var delay = new Date().getTime() - startTime; - if(delay>0) - acceleration = Math.max(0.1, Math.min(2, 10/delay)); - else - acceleration = 2 - } - var newScale = Math.max(0.1 , parent.scale+acceleration*(wheel.angleDelta.y >0 ? 1 : -1) ); - if( window.height > (CallFullscreenStyle.actionArea.userVideo.height * window.height/CallFullscreenStyle.actionArea.userVideo.heightReference) * newScale - && window.width > (CallFullscreenStyle.actionArea.userVideo.width * window.width/CallFullscreenStyle.actionArea.userVideo.widthReference) * newScale){ - parent.scale = newScale - var point = mapToItem(cameraPreviewItem.parent, wheel.x, wheel.y); - parent.x = point.x-parent.width/2; - parent.y = point.y-parent.height/2; - updateBoundaries(); - } - startTime = new Date().getTime(); - } - onDoubleClicked:{ - parent.scale = 1; - resetPosition(); - } - onClicked: if(mouse.button == Qt.RightButton) { - if( parent.scale>1) - parent.scale = 1; - else - parent.scale = 2; - resetPosition(); - } - } - } - } - } - - // --------------------------------------------------------------------------- - // TelKeypad. - // --------------------------------------------------------------------------- - - TelKeypad { - id: telKeypad - showHistory:true - call: window.call - visible: false - y: 50 - } -} diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml b/linphone-app/ui/views/App/Calls/IncallGrid.qml similarity index 90% rename from linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml rename to linphone-app/ui/views/App/Calls/IncallGrid.qml index 94f60f9b1..7d4ff0be8 100644 --- a/linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml +++ b/linphone-app/ui/views/App/Calls/IncallGrid.qml @@ -65,8 +65,8 @@ Mosaic { isPaused: avatarCell.currentDevice && avatarCell.currentDevice.isPaused showCloseButton: false showCustomButton: false - avatarStickerBackgroundColor: VideoConferenceStyle.container.avatar.stickerBackgroundColor - avatarBackgroundColor: VideoConferenceStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor //onCloseRequested: participantDevices.showMe = false } diff --git a/linphone-app/ui/views/App/Calls/VideoConference.qml b/linphone-app/ui/views/App/Calls/VideoConference.qml deleted file mode 100644 index a5f36db3d..000000000 --- a/linphone-app/ui/views/App/Calls/VideoConference.qml +++ /dev/null @@ -1,529 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQml.Models 2.12 -import QtGraphicalEffects 1.12 - -import Common 1.0 -import Common.Styles 1.0 -import Linphone 1.0 - -import LinphoneEnums 1.0 -import UtilsCpp 1.0 - -import App.Styles 1.0 - - -// Temp -import 'Incall.js' as Logic -import 'qrc:/ui/scripts/Utils/utils.js' as Utils - -// ============================================================================= - -Rectangle { - id: conference - - property CallModel callModel - property ConferenceModel conferenceModel: callModel && callModel.conferenceModel - property bool cameraIsReady : false - property bool previewIsReady : false - property bool isFullScreen: false // Use this variable to test if we are in fullscreen. Do not test _fullscreen : we need to clean memory before having the window (see .js file) - property var _fullscreen: null - on_FullscreenChanged: if( !_fullscreen) isFullScreen = false - - property bool listCallsOpened: true - - signal openListCallsRequest() - // --------------------------------------------------------------------------- - - color: VideoConferenceStyle.backgroundColor - - Connections { - target: callModel - - onCameraFirstFrameReceived: Logic.handleCameraFirstFrameReceived(width, height) - onStatusChanged: Logic.handleStatusChanged (status, conference._fullscreen) - onVideoRequested: Logic.handleVideoRequested(callModel) - } - - // --------------------------------------------------------------------------- - Rectangle{ - MouseArea{ - anchors.fill: parent - } - anchors.fill: parent - visible: callModel.pausedByUser - color: VideoConferenceStyle.pauseArea.backgroundColor - z: 1 - ColumnLayout{ - anchors.fill: parent - spacing: 10 - Item{ - Layout.fillWidth: true - Layout.fillHeight: true - } - ActionButton{ - Layout.alignment: Qt.AlignCenter - isCustom: true - colorSet: VideoConferenceStyle.pauseArea.play - backgroundRadius: width/2 - onClicked: callModel.pausedByUser = !callModel.pausedByUser - } - Text{ - Layout.alignment: Qt.AlignCenter - //: 'You are currently out of the conference.' : Pause message in video conference. - text: qsTr('videoConferencePauseWarning') - font.pointSize: VideoConferenceStyle.pauseArea.title.pointSize - font.weight: VideoConferenceStyle.pauseArea.title.weight - color: VideoConferenceStyle.pauseArea.title.color - } - Text{ - Layout.alignment: Qt.AlignCenter - //: 'Click on play button to join it back.' : Explain what to do when being in pause in conference. - text: qsTr('videoConferencePauseHint') - font.pointSize: VideoConferenceStyle.pauseArea.description.pointSize - font.weight: VideoConferenceStyle.pauseArea.description.weight - color: VideoConferenceStyle.pauseArea.description.color - } - Item{ - Layout.fillWidth: true - Layout.preferredHeight: 140 - } - } - } - - // ------------------------------------------------------------------------- - // Conference info. - // ------------------------------------------------------------------------- - RowLayout{ - id: featuresRow - // Aux features - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - - anchors.topMargin: 10 - anchors.leftMargin: 25 - anchors.rightMargin: 25 - spacing: 10 - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.callsList - visible: !listCallsOpened - onClicked: openListCallsRequest() - } - ActionButton{ - id: keypadButton - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.dialpad - toggled: telKeypad.visible - onClicked: telKeypad.visible = !telKeypad.visible - } - ActionButton { - id: callQuality - - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.callQuality - icon: VideoConferenceStyle.buttons.callQuality.icon_0 - toggled: callStatistics.isOpen - - onClicked: callStatistics.isOpen ? callStatistics.close() : callStatistics.open() - Timer { - interval: 500 - repeat: true - running: true - triggeredOnStart: true - onTriggered: { - // Note: `quality` is in the [0, 5] interval and -1. - var quality = callModel.quality - if(quality > 4) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_4 - else if(quality > 3) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_3 - else if(quality > 2) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_2 - else if(quality > 1) - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_1 - else - callQuality.icon = VideoConferenceStyle.buttons.callQuality.icon_0 - } - } - } - - // Title - ColumnLayout{ - Layout.fillWidth: true - Text{ - id: title - Timer{ - id: elapsedTimeRefresher - running: true - interval: 1000 - repeat: true - onTriggered: if(conferenceModel) parent.elaspedTime = ' - ' +Utils.formatElapsedTime(conferenceModel.getElapsedSeconds()) - else parent.elaspedTime = Utils.formatElapsedTime(conference.callModel.duration) - } - property string elaspedTime - horizontalAlignment: Qt.AlignHCenter - Layout.fillWidth: true - text: conferenceModel - ? conferenceModel.subject+ elaspedTime - : callModel - ? elaspedTime - : '' - color: VideoConferenceStyle.title.color - font.pointSize: VideoConferenceStyle.title.pointSize - } - Text{ - id: address - Layout.fillWidth: true - horizontalAlignment: Qt.AlignHCenter - visible: !conferenceModel && callModel - text: !conferenceModel && callModel - ? callModel.peerAddress - : '' - color: VideoConferenceStyle.title.color - font.pointSize: VideoConferenceStyle.title.addressPointSize - } - - } - // Mode buttons - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.screenSharing - visible: false //TODO - } - ActionButton { - id: recordingSwitch - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.record - property CallModel callModel: conference.callModel - onCallModelChanged: if(!callModel) callModel.stopRecording() - visible: SettingsModel.callRecorderEnabled && callModel - toggled: callModel.recording - - onClicked: { - return !toggled - ? callModel.startRecording() - : callModel.stopRecording() - } - //: 'Start recording' : Tootltip when straing record. - tooltipText: !toggled ? qsTr('videoConferenceStartRecordTooltip') - //: 'Stop Recording' : Tooltip when stopping record. - : qsTr('videoConferenceStopRecordTooltip') - } - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.screenshot - visible: conference.callModel.snapshotEnabled - onClicked: conference.callModel.takeSnapshot() - //: 'Take Snapshot' : Tooltip for takking snapshot. - tooltipText: qsTr('videoConferenceSnapshotTooltip') - } - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.fullscreen - visible: conference.callModel.videoEnabled - onClicked: Logic.showFullscreen(window, conference, 'VideoConferenceFullscreen.qml', title.mapToGlobal(0,0)) - } - - } - - // ------------------------------------------------------------------------- - // Contacts visual. - // ------------------------------------------------------------------------- - - Item{ - id: mainGrid - anchors.top: featuresRow.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: zrtp.top - - anchors.topMargin: 15 - anchors.bottomMargin: 20 - - Component{ - id: gridComponent - VideoConferenceGrid{ - id: grid - Layout.leftMargin: 70 - Layout.rightMargin: rightMenu.visible ? 15 : 70 - callModel: conference.callModel - cameraEnabled: !conference.isFullScreen - } - } - Component{ - id: activeSpeakerComponent - VideoConferenceActiveSpeaker{ - id: activeSpeaker - callModel: conference.callModel - isRightReducedLayout: rightMenu.visible - isLeftReducedLayout: conference.listCallsOpened - cameraEnabled: !conference.isFullScreen - onCameraEnabledChanged: console.log(cameraEnabled) - } - } - RowLayout{ - anchors.fill: parent - Loader{ - id: conferenceLayout - Layout.fillHeight: true - Layout.fillWidth: true - sourceComponent: conference.conferenceModel - ? conference.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid || !conference.callModel.videoEnabled? gridComponent : activeSpeakerComponent - : activeSpeakerComponent - onSourceComponentChanged: console.log("conferenceLayout: "+conference.callModel.conferenceVideoLayout) - active: conference.callModel - ColumnLayout { - anchors.fill: parent - visible: !conference.callModel || !conferenceLayout.item || conferenceLayout.item.participantCount == 0 - BusyIndicator{ - Layout.preferredHeight: 50 - Layout.preferredWidth: 50 - Layout.alignment: Qt.AlignCenter - running: parent.visible - color: VideoConferenceStyle.buzyColor - } - Text{ - Layout.alignment: Qt.AlignCenter - - text: conference.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid && !conference.callModel.videoEnabled - //: 'Waiting for another participant...' : Waiting message for more participant. - ? qsTr('videoConferenceWaitParticipantMessage') - //: 'Video conference is not ready. Please Wait...' : Waiting message for starting conference. - : qsTr('videoConferenceWaitMessage') - color: VideoConferenceStyle.buzyColor - } - } - } - VideoConferenceMenu{ - id: rightMenu - Layout.fillHeight: true - Layout.preferredWidth: 400 - Layout.rightMargin: 30 - callModel: conference.callModel - conferenceModel: conference.conferenceModel - visible: false - onClose: rightMenu.visible = !rightMenu.visible - onLayoutChanging: conferenceLayout.item.clearAll(layoutMode) - } - } - } - - ZrtpTokenAuthentication { - id: zrtp - - anchors.horizontalCenter: parent.horizontalCenter - anchors.margins: CallStyle.container.margins - anchors.bottom: actionsButtons.top - height: visible ? implicitHeight : 0 - - call: callModel - visible: !call.isSecured && call.encryption !== CallModel.CallEncryptionNone - z: Constants.zPopup - } - // ------------------------------------------------------------------------- - // Action Buttons. - // ------------------------------------------------------------------------- - - // Security - ActionButton{ - id: securityButton - visible: callModel && !callModel.isConference - anchors.left: parent.left - anchors.verticalCenter: actionsButtons.verticalCenter - anchors.leftMargin: 25 - height: VideoConferenceStyle.buttons.secure.buttonSize - width: height - isCustom: true - backgroundRadius: width/2 - - colorSet: callModel.isSecured ? VideoConferenceStyle.buttons.secure : VideoConferenceStyle.buttons.unsecure - - onClicked: zrtp.visible = (callModel.encryption === CallModel.CallEncryptionZrtp) - - tooltipText: Logic.makeReadableSecuredString(callModel.securedString) - } - RowLayout{ - visible: callModel.remoteRecording - - anchors.verticalCenter: actionsButtons.verticalCenter - anchors.left: securityButton.right - anchors.leftMargin: 20 - anchors.right: actionsButtons.left - anchors.rightMargin: 10 - - Icon{ - icon: VideoConferenceStyle.recordWarning.icon - iconSize: VideoConferenceStyle.recordWarning.iconSize - overwriteColor: VideoConferenceStyle.recordWarning.iconColor - } - Text{ - Layout.fillWidth: true - //: 'This call is being recorded.' : Warn the user that the remote is currently recording the call. - text: qsTr('callWarningRecord') - color: VideoConferenceStyle.recordWarning.color - font.italic: true - font.pointSize: VideoConferenceStyle.recordWarning.pointSize - wrapMode: Text.WordWrap - } - } - // Action buttons - RowLayout{ - id: actionsButtons - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: 30 - height: 60 - spacing: 30 - z: 2 - RowLayout{ - spacing: 10 - Row { - spacing: 2 - visible: SettingsModel.muteMicrophoneEnabled - property bool microMuted: callModel.microMuted - - VuMeter { - enabled: !parent.microMuted - Timer { - interval: 50 - repeat: true - running: parent.enabled - - onTriggered: parent.value = callModel.microVu - } - } - ActionSwitch { - id: micro - isCustom: true - backgroundRadius: 90 - colorSet: parent.microMuted ? VideoConferenceStyle.buttons.microOff : VideoConferenceStyle.buttons.microOn - onClicked: callModel.microMuted = !parent.microMuted - } - } - Row { - spacing: 2 - property bool speakerMuted: callModel.speakerMuted - VuMeter { - enabled: !parent.speakerMuted - Timer { - interval: 50 - repeat: true - running: parent.enabled - onTriggered: parent.value = callModel.speakerVu - } - } - ActionSwitch { - id: speaker - isCustom: true - backgroundRadius: 90 - colorSet: parent.speakerMuted ? VideoConferenceStyle.buttons.speakerOff : VideoConferenceStyle.buttons.speakerOn - onClicked: callModel.speakerMuted = !parent.speakerMuted - } - } - ActionSwitch { - id: camera - isCustom: true - backgroundRadius: 90 - colorSet: callModel && callModel.cameraEnabled ? VideoConferenceStyle.buttons.cameraOn : VideoConferenceStyle.buttons.cameraOff - updating: callModel.videoEnabled && callModel.updating - enabled: callModel.videoEnabled - onClicked: if(callModel){ - if( callModel.isConference)// Only deactivate camera in conference. - callModel.cameraEnabled = !callModel.cameraEnabled - else// In one-one, we deactivate all videos. - callModel.videoEnabled = !callModel.videoEnabled - } - } - - } - RowLayout{ - spacing: 10 - ActionButton{ - isCustom: true - backgroundRadius: width/2 - visible: SettingsModel.callPauseEnabled - updating: callModel.updating - colorSet: callModel.pausedByUser ? VideoConferenceStyle.buttons.play : VideoConferenceStyle.buttons.pause - onClicked: callModel.pausedByUser = !callModel.pausedByUser - } - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.hangup - - onClicked: callModel.terminate() - } - } - } - - // Panel buttons - RowLayout{ - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.bottomMargin: 30 - anchors.rightMargin: 25 - height: 60 - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.chat - visible: (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && callModel && !callModel.isConference - toggled: window.chatIsOpened - onClicked: { - if (window.chatIsOpened) { - window.closeChat() - } else { - window.openChat() - } - } - } - ActionButton{ - visible: callModel && callModel.isConference - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.participants - toggled: rightMenu.visible && rightMenu.isParticipantsMenu - onClicked: { - if(toggled) - rightMenu.visible = false - else - rightMenu.showParticipantsMenu() - } - } - - ActionButton{ - isCustom: true - backgroundRadius: width/2 - colorSet: VideoConferenceStyle.buttons.options - toggled: rightMenu.visible - onClicked: rightMenu.visible = !rightMenu.visible - } - } - - // --------------------------------------------------------------------------- - // TelKeypad. - // --------------------------------------------------------------------------- - CallStatistics { - id: callStatistics - - call: conference.callModel - width: conference.width - height: conference.height - } - TelKeypad { - id: telKeypad - showHistory:true - call: callModel - visible: SettingsModel.showTelKeypadAutomatically - y: 70 - } -} diff --git a/linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml similarity index 99% rename from linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml index c6fed70bb..fe37c6212 100644 --- a/linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml @@ -8,7 +8,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property string sectionName: 'VideoConference' + property string sectionName: 'Incall' property color backgroundColor: ColorsList.add(sectionName+'_bg', 'conference_bg').color property color fullBackgroundColor: ColorsList.add(sectionName+'_fullscreen_bg', 'fullscreen_conference_bg').color property color buzyColor: ColorsList.add(sectionName+'_indicator', 'q').color diff --git a/linphone-app/ui/views/App/Styles/qmldir b/linphone-app/ui/views/App/Styles/qmldir index 5bb844c59..1eb1765b1 100644 --- a/linphone-app/ui/views/App/Styles/qmldir +++ b/linphone-app/ui/views/App/Styles/qmldir @@ -11,7 +11,7 @@ singleton CallStyle 1.0 Calls/CallStyle.qml singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml singleton WaitingRoomStyle 1.0 Calls/WaitingRoomStyle.qml singleton ConferenceStyle 1.0 Calls/ConferenceStyle.qml -singleton VideoConferenceStyle 1.0 Calls/VideoConferenceStyle.qml +singleton IncallStyle 1.0 Calls/IncallStyle.qml singleton CallSipAddressStyle 1.0 Calls/Dialogs/CallSipAddressStyle.qml singleton CallTransferStyle 1.0 Calls/Dialogs/CallTransferStyle.qml