lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 06:45:45 +02:00
Code Activity

callactionbar: add fullscreen button

Browse source 
Also fix a typo causing the icon in the context menu to not update

Change-Id: I8886b45afcc55a3c724494afa10fc125d218d14e
This commit is contained in:
Sébastien Blin 2022-01-14 14:18:00 -05:00
parent f15233b31f
commit 93da093ba6
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mainview/components/CallActionBar.qml
View file

@ -50,6 +50,7 @@ Control {
signal shareFileClicked signal shareFileClicked
signal pluginsClicked signal pluginsClicked
signal recordCallClicked signal recordCallClicked
signal fullScreenClicked
Component { Component {
id: buttonDelegate id: buttonDelegate
@ -220,6 +221,17 @@ Control {
icon.color: "white" icon.color: "white"
text: JamiStrings.chat text: JamiStrings.chat
}, },
Action {
id: fullScreenAction
icon.source: layoutManager.isCallFullscreen ?
JamiResources.close_fullscreen_24dp_svg :
JamiResources.open_in_full_24dp_svg
icon.color: "white"
onTriggered: root.fullScreenClicked()
text: layoutManager.isCallFullscreen ?
JamiStrings.exitFullScreen :
JamiStrings.fullScreen
},
Action { Action {
id: resumePauseCallAction id: resumePauseCallAction
onTriggered: root.resumePauseCallClicked() onTriggered: root.resumePauseCallClicked()
@ -345,6 +357,7 @@ Control {
CallOverlayModel.addSecondaryControl(shareAction) CallOverlayModel.addSecondaryControl(shareAction)
CallOverlayModel.addSecondaryControl(recordAction) CallOverlayModel.addSecondaryControl(recordAction)
CallOverlayModel.addSecondaryControl(pluginsAction) CallOverlayModel.addSecondaryControl(pluginsAction)
CallOverlayModel.addSecondaryControl(fullScreenAction)
overflowItemCount = CallOverlayModel.secondaryModel().rowCount() overflowItemCount = CallOverlayModel.secondaryModel().rowCount()
muteAudioAction.checked = isAudioMuted muteAudioAction.checked = isAudioMuted

2
src/mainview/components/CallOverlay.qml
View file

@ -49,6 +49,7 @@ Item {
property bool localHandRaised property bool localHandRaised
signal chatButtonClicked signal chatButtonClicked
signal fullScreenClicked
ParticipantsLayer { ParticipantsLayer {
id: __participantsLayer id: __participantsLayer
@ -210,6 +211,7 @@ Item {
function onRecordCallClicked() { recordClicked() } function onRecordCallClicked() { recordClicked() }
function onShareFileClicked() { jamiFileDialog.open() } function onShareFileClicked() { jamiFileDialog.open() }
function onPluginsClicked() { openPluginsMenu() } function onPluginsClicked() { openPluginsMenu() }
function onFullScreenClicked() { root.fullScreenClicked() }
} }
} }

4
src/mainview/components/CallViewContextMenu.qml
View file

@ -88,10 +88,10 @@ ContextMenuAutoLoader {
GeneralMenuItem { GeneralMenuItem {
id: fullScreen id: fullScreen
itemName: layoutManager.callIsFullscreen ? itemName: layoutManager.isCallFullscreen ?
JamiStrings.exitFullScreen : JamiStrings.exitFullScreen :
JamiStrings.fullScreen JamiStrings.fullScreen
iconSource: layoutManager.callIsFullscreen ? iconSource: layoutManager.isCallFullscreen ?
JamiResources.close_fullscreen_24dp_svg : JamiResources.close_fullscreen_24dp_svg :
JamiResources.open_in_full_24dp_svg JamiResources.open_in_full_24dp_svg
onClicked: { onClicked: {

4
src/mainview/components/OngoingCallPage.qml
View file

@ -331,6 +331,10 @@ Rectangle {
closeInCallConversation() : closeInCallConversation() :
openInCallConversation() openInCallConversation()
} }
onFullScreenClicked: {
callStackView.toggleFullScreen()
}
} }
ColumnLayout { ColumnLayout {