mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-25 07:28:34 +00:00
Fullscreen : Add remote record warning, move call statistics, hide secure icon, enter directly in fullscreen mode.
This commit is contained in:
parent
926abb2af3
commit
32698ed4a5
16 changed files with 152 additions and 45 deletions
|
|
@ -3428,6 +3428,11 @@ Klik her: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3428,6 +3428,11 @@ Klicken Sie hier: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3451,6 +3451,11 @@ Click here: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation>Video conference is not ready. Please Wait…</translation>
|
<translation>Video conference is not ready. Please Wait…</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished">This call is being recorded.</translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3428,6 +3428,11 @@ Haga clic aquí: <a href="%1">%1 </a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3428,6 +3428,11 @@ Cliquez ici : <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3415,6 +3415,11 @@ Kattintson ide: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3428,6 +3428,11 @@ Clicca: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3415,6 +3415,11 @@
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3441,6 +3441,11 @@ Spustelėkite čia: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3428,6 +3428,11 @@ Clique aqui: <a href="%1">%1 </a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3441,6 +3441,11 @@
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation>Видеоконференция не готова. Пожалуйста, подождите…</translation>
|
<translation>Видеоконференция не готова. Пожалуйста, подождите…</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3428,6 +3428,11 @@ Klicka här: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3415,6 +3415,11 @@ Buraya tıklayın: <a href="%1">%1</a>
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3441,6 +3441,11 @@
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -3415,6 +3415,11 @@
|
||||||
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
<extracomment>'Video conference is not ready. Please Wait...' : Waiting message for starting conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>callWarningRecord</source>
|
||||||
|
<extracomment>'This call is being recorded.' : Warn the user that the remote is currently recording the call.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>VideoConferenceMenu</name>
|
<name>VideoConferenceMenu</name>
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,40 @@ Window {
|
||||||
colorSet: VideoConferenceStyle.buttons.dialpad
|
colorSet: VideoConferenceStyle.buttons.dialpad
|
||||||
onClicked: telKeypad.visible = !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: {
|
||||||
|
if(callModel) {
|
||||||
|
// 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
|
// Title
|
||||||
Text{
|
Text{
|
||||||
Timer{
|
Timer{
|
||||||
|
|
@ -316,7 +350,8 @@ Window {
|
||||||
}
|
}
|
||||||
// Security
|
// Security
|
||||||
ActionButton{
|
ActionButton{
|
||||||
visible: callModel && !callModel.isConference
|
id: securityButton
|
||||||
|
visible: !window.hideButtons && callModel && !callModel.isConference
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.verticalCenter: actionsButtons.verticalCenter
|
anchors.verticalCenter: actionsButtons.verticalCenter
|
||||||
anchors.leftMargin: 25
|
anchors.leftMargin: 25
|
||||||
|
|
@ -331,7 +366,32 @@ Window {
|
||||||
|
|
||||||
tooltipText: Logic.makeReadableSecuredString(callModel.securedString)
|
tooltipText: Logic.makeReadableSecuredString(callModel.securedString)
|
||||||
}
|
}
|
||||||
|
RowLayout{
|
||||||
|
visible: callModel && callModel.remoteRecording
|
||||||
|
|
||||||
|
anchors.verticalCenter: !window.hideButtons ? actionsButtons.verticalCenter : undefined
|
||||||
|
anchors.bottom: window.hideButtons ? parent.bottom : undefined
|
||||||
|
anchors.bottomMargin: window.hideButtons ? 20 : 0
|
||||||
|
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
|
// Action buttons
|
||||||
RowLayout{
|
RowLayout{
|
||||||
id: actionsButtons
|
id: actionsButtons
|
||||||
|
|
@ -425,11 +485,12 @@ Window {
|
||||||
anchors.rightMargin: 25
|
anchors.rightMargin: 25
|
||||||
height: visible ? 60 : 0
|
height: visible ? 60 : 0
|
||||||
visible: !window.hideButtons
|
visible: !window.hideButtons
|
||||||
|
/* Not available in fullscreen yet.
|
||||||
ActionButton{
|
ActionButton{
|
||||||
isCustom: true
|
isCustom: true
|
||||||
backgroundRadius: width/2
|
backgroundRadius: width/2
|
||||||
colorSet: VideoConferenceStyle.buttons.chat
|
colorSet: VideoConferenceStyle.buttons.chat
|
||||||
visible: (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && callModel && !callModel.isConference
|
visible: false && (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && callModel && !callModel.isConference
|
||||||
toggled: window.chatIsOpened
|
toggled: window.chatIsOpened
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (window.chatIsOpened) {
|
if (window.chatIsOpened) {
|
||||||
|
|
@ -438,7 +499,7 @@ Window {
|
||||||
window.openChat()
|
window.openChat()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
ActionButton{
|
ActionButton{
|
||||||
visible: callModel && callModel.isConference
|
visible: callModel && callModel.isConference
|
||||||
isCustom: true
|
isCustom: true
|
||||||
|
|
@ -452,40 +513,7 @@ Window {
|
||||||
rightMenu.showParticipantsMenu()
|
rightMenu.showParticipantsMenu()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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: {
|
|
||||||
if(callModel) {
|
|
||||||
// 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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ActionButton{
|
ActionButton{
|
||||||
isCustom: true
|
isCustom: true
|
||||||
backgroundRadius: width/2
|
backgroundRadius: width/2
|
||||||
|
|
@ -519,18 +547,22 @@ Window {
|
||||||
MouseArea{
|
MouseArea{
|
||||||
Timer {
|
Timer {
|
||||||
id: hideButtonsTimer
|
id: hideButtonsTimer
|
||||||
property bool realRunning : true
|
property bool realRunning : false
|
||||||
|
property bool firstUse: true
|
||||||
|
|
||||||
interval: 5000
|
interval: firstUse ? 500 : 4000
|
||||||
running: true
|
running: false
|
||||||
triggeredOnStart: true
|
triggeredOnStart: !firstUse
|
||||||
onTriggered: {if(realRunning != running) realRunning = running}
|
onTriggered: {if(!firstUse && realRunning != running) realRunning = running
|
||||||
|
firstUse = false}
|
||||||
function startTimer(){
|
function startTimer(){
|
||||||
restart();
|
if(!firstUse || !running)
|
||||||
|
restart();
|
||||||
}
|
}
|
||||||
function stopTimer(){
|
function stopTimer(){
|
||||||
stop();
|
stop()
|
||||||
realRunning = false;
|
realRunning = false
|
||||||
|
hideButtonsTimer.firstUse = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue