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

use native player to open video files #LINQT-2116

Browse source 
hide e2e conf creation toggle #LINQT-2112
This commit is contained in:
Gaelle Braud 2025-11-06 16:43:02 +01:00 committed by Gaëlle Braud
parent d957fae94e
commit b3b40d6f99
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Linphone/view/Control/Display/Chat/FileView.qml
View file

@ -102,17 +102,6 @@ Item {
position: 100 position: 100
source: mainItem.isVideo ? "file:///" + mainItem.filePath : "" source: mainItem.isVideo ? "file:///" + mainItem.filePath : ""
fillMode: playbackState === MediaPlayer.PlayingState ? VideoOutput.PreserveAspectFit : VideoOutput.PreserveAspectCrop fillMode: playbackState === MediaPlayer.PlayingState ? VideoOutput.PreserveAspectFit : VideoOutput.PreserveAspectCrop
MouseArea {
propagateComposedEvents: false
enabled: videoThumbnail.visible
anchors.fill: parent
hoverEnabled: false
acceptedButtons: Qt.LeftButton
onClicked: (mouse) => {
mouse.accepted = true
videoThumbnail.playbackState === MediaPlayer.PlayingState ? videoThumbnail.pause() : videoThumbnail.play()
}
}
EffectImage { EffectImage {
anchors.centerIn: parent anchors.centerIn: parent
visible: videoThumbnail.playbackState !== MediaPlayer.PlayingState visible: videoThumbnail.playbackState !== MediaPlayer.PlayingState

5
Linphone/view/Control/Display/Chat/ImageFileView.qml
View file

@ -26,10 +26,6 @@ Image {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: contentGui && contentGui.core.thumbnail || "" source: contentGui && contentGui.core.thumbnail || ""
states: State {
name: 'hovered'
}
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
@ -40,7 +36,6 @@ Image {
onContainsMouseChanged: { onContainsMouseChanged: {
if (containsMouse) UtilsCpp.setGlobalCursor(Qt.PointingHandCursor) if (containsMouse) UtilsCpp.setGlobalCursor(Qt.PointingHandCursor)
else UtilsCpp.restoreGlobalCursor() else UtilsCpp.restoreGlobalCursor()
mainItem.state = containsMouse ? 'hovered' : ''
} }
onPressed: (mouse) => { onPressed: (mouse) => {
mouse.accepted = true mouse.accepted = true

14
Linphone/view/Control/Display/Chat/VideoFileView.qml
View file

@ -17,6 +17,7 @@ Rectangle {
property var fillMode: playbackState === MediaPlayer.PlayingState ? VideoOutput.PreserveAspectFit : VideoOutput.PreserveAspectCrop property var fillMode: playbackState === MediaPlayer.PlayingState ? VideoOutput.PreserveAspectFit : VideoOutput.PreserveAspectCrop
property alias videoOutput: output property alias videoOutput: output
property string source: mediaPlayer.source property string source: mediaPlayer.source
MediaPlayer { MediaPlayer {
id: mediaPlayer id: mediaPlayer
source: UtilsCpp.isVideo(mainItem.filePath) ? "file:///" + mainItem.filePath : "" source: UtilsCpp.isVideo(mainItem.filePath) ? "file:///" + mainItem.filePath : ""
@ -54,11 +55,18 @@ Rectangle {
propagateComposedEvents: false propagateComposedEvents: false
enabled: mainItem.visible enabled: mainItem.visible
anchors.fill: parent anchors.fill: parent
hoverEnabled: false hoverEnabled: true
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
onClicked: (mouse) => { cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
// Changing cursor in MouseArea seems not to work with the Loader
// Use override cursor for this case
onContainsMouseChanged: {
if (containsMouse) UtilsCpp.setGlobalCursor(Qt.PointingHandCursor)
else UtilsCpp.restoreGlobalCursor()
}
onPressed: (mouse) => {
mouse.accepted = true mouse.accepted = true
mediaPlayer.playbackState === MediaPlayer.PlayingState ? mediaPlayer.pause() : mediaPlayer.play() mainItem.contentGui.core.lOpenFile()
} }
} }
EffectImage { EffectImage {

1
Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
View file

@ -137,6 +137,7 @@ AbstractSettingsLayout {
propertyOwner: SettingsCpp propertyOwner: SettingsCpp
} }
SwitchSetting { SwitchSetting {
visible: false
Layout.fillWidth: true Layout.fillWidth: true
//: Create end to end encrypted meetings and group calls //: Create end to end encrypted meetings and group calls
titleText: qsTr("settings_advanced_create_endtoend_encrypted_meetings_title") titleText: qsTr("settings_advanced_create_endtoend_encrypted_meetings_title")