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

Quit fullscreen on escape button.

Browse source
This commit is contained in:
Julien Wadel 2024-12-03 15:27:41 +01:00
parent 37db0a2394
commit f60e8c36e3
3 changed files with 40 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -664,8 +664,8 @@ AbstractMainPage {
implicitHeight: detailsButtons.implicitHeight
implicitWidth: detailsButtons.implicitWidth
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Left || event.key == Qt.Key_Escape) {
detailOptions.popup.close()
if (event.key == Qt.Key_Left || event.key == Qt.Key_Escape) {
detailOptions.popup.close()
event.accepted = true;
}
}

14
Linphone/view/Page/Window/AbstractWindow.qml
View file

@ -2,19 +2,23 @@ import QtQuick
import QtQuick.Layouts
import QtQuick.Controls.Basic
import Linphone
import UtilsCpp 1.0
import SettingsCpp 1.0
import UtilsCpp
import SettingsCpp
import DesktopToolsCpp
ApplicationWindow {
id: mainWindow
x: 0
y: 0
width: Math.min(1512 * DefaultStyle.dp, Screen.desktopAvailableWidth)
height: Math.min(982 * DefaultStyle.dp, Screen.desktopAvailableHeight)
width: Math.min(1512 * DefaultStyle.dp, Screen.desktopAvailableWidth)
height: Math.min(982 * DefaultStyle.dp, Screen.desktopAvailableHeight)
property bool isFullscreen: visibility == Window.FullScreen
onIsFullscreenChanged: DesktopToolsCpp.screenSaverStatus = !isFullscreen
MouseArea {
anchors.fill: parent
onClicked: forceActiveFocus()
onClicked: mainWindow.contentItem.forceActiveFocus()
}
Component {

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

@ -126,10 +126,10 @@ AbstractWindow {
}
Connections {
enabled: !!call
target: call && call.core
enabled: !!mainWindow.call
target: mainWindow.call && mainWindow.call.core
function onSecurityUpdated() {
if (call.core.encryption === LinphoneEnums.MediaEncryption.Zrtp) {
if (mainWindow.call.core.encryption === LinphoneEnums.MediaEncryption.Zrtp) {
if (call.core.tokenVerified) {
zrtpValidation.close()
zrtpValidationToast.open()
@ -266,6 +266,10 @@ AbstractWindow {
Rectangle {
anchors.fill: parent
color: DefaultStyle.grey_900
Keys.onEscapePressed: {
if(mainWindow.visibility == Window.FullScreen) mainWindow.showNormal()
}
ColumnLayout {
anchors.fill: parent
spacing: 10 * DefaultStyle.dp
@ -561,11 +565,9 @@ AbstractWindow {
NewCallForm {
id: newCallForm
Control.StackView.onActivated: rightPanel.headerTitleText = qsTr("Transférer %1 à :").arg(mainWindow.call.core.remoteName)
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
groupCallVisible: false
displayCurrentCalls: true
@ -654,11 +656,9 @@ AbstractWindow {
id: dialerPanelContent
Control.StackView.onActivated: rightPanel.headerTitleText = qsTr("Dialer")
spacing: 0
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
Item {
Layout.fillWidth: true
@ -702,11 +702,9 @@ AbstractWindow {
id: changeLayoutPanel
ChangeLayoutForm {
Control.StackView.onActivated: rightPanel.headerTitleText = qsTr("Modifier la disposition")
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
call: mainWindow.call
onChangeLayoutRequested: (index) => {
@ -721,11 +719,9 @@ AbstractWindow {
rightPanel.headerTitleText = qsTr("Liste d'appel")
rightPanel.customHeaderButtons = mergeCallPopupButton.createObject(rightPanel)
}
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
spacing: 0
Component {
@ -784,11 +780,9 @@ AbstractWindow {
Control.StackView.onActivated: {
rightPanel.headerTitleText = qsTr("Paramètres")
}
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
MultimediaSettings {
id: inSettingsPanel
@ -805,11 +799,9 @@ AbstractWindow {
id: screencastPanel
Item {
Control.StackView.onActivated: rightPanel.headerTitleText = qsTr("Partage de votre écran")
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
ScreencastSettings {
anchors.fill: parent
@ -825,11 +817,9 @@ AbstractWindow {
id: participantListPanel
Item {
objectName: "participantListPanel"
Keys.onPressed: (event)=> {
if (event.key == Qt.Key_Escape) {
rightPanel.visible = false
event.accepted = true;
}
Keys.onEscapePressed: (event) => {
rightPanel.visible = false
event.accepted = true
}
Control.StackView {
id: participantsStack
@ -1288,16 +1278,14 @@ AbstractWindow {
}
}
MenuButton {
visible: mainWindow.conference
icon.source: AppIcons.fullscreen
text: qsTr("Mode Plein écran")
checkable: true
Binding on checked { value: mainWindow.visibility === Window.FullScreen }
onToggled: {
if(checked) {
DesktopToolsCpp.screenSaverStatus = false
mainWindow.showFullScreen()
}else{
DesktopToolsCpp.screenSaverStatus = true
mainWindow.showNormal()
}
}