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

try to fix #LINQT-1906

Browse source
This commit is contained in:
Gaelle Braud 2025-08-26 17:18:07 +02:00
parent 60ebaf73a9
commit e0286fdc42
4 changed files with 190 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/tool/Utils.cpp
View file

@ -2242,7 +2242,9 @@ QImage Utils::getImage(const QString &pUri) {
} }
void Utils::setGlobalCursor(Qt::CursorShape cursor) { void Utils::setGlobalCursor(Qt::CursorShape cursor) {
App::getInstance()->setOverrideCursor(QCursor(cursor)); if (!App::getInstance()->overrideCursor() || App::getInstance()->overrideCursor()->shape() != cursor) {
App::getInstance()->setOverrideCursor(QCursor(cursor));
}
} }
void Utils::restoreGlobalCursor() { void Utils::restoreGlobalCursor() {

2
Linphone/view/Control/Container/Chat/ChatFilesGridLayout.qml
View file

@ -55,7 +55,7 @@ GridLayout {
visible: modelData visible: modelData
height: mainItem.itemWidth height: mainItem.itemWidth
width: mainItem.itemWidth width: mainItem.itemWidth
onIsHoveringChanged: mainItem.isHoveringFile = isHovering // onIsHoveringChanged: mainItem.isHoveringFile = isHovering
} }
} }
} }

2
Linphone/view/Control/Display/Chat/ChatMessageContent.qml
View file

@ -79,7 +79,7 @@ ColumnLayout {
Layout.fillHeight: true Layout.fillHeight: true
// Layout.preferredHeight: contentHeight // Layout.preferredHeight: contentHeight
chatMessageGui: mainItem.chatMessageGui chatMessageGui: mainItem.chatMessageGui
onIsHoveringFileChanged: mainItem.isFileHoveringChanged(isHoveringFile) // onIsHoveringFileChanged: mainItem.isFileHoveringChanged(isHoveringFile)
// borderWidth: mainItem.fileBorderWidth // borderWidth: mainItem.fileBorderWidth
// property int availableSection: mainItem.availableWidth / mainItem.filesBestWidth // property int availableSection: mainItem.availableWidth / mainItem.filesBestWidth
// property int bestFitSection: mainItem.bestWidth / mainItem.filesBestWidth // property int bestFitSection: mainItem.bestWidth / mainItem.filesBestWidth

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

@ -30,6 +30,16 @@ Item {
property int overriddenHeight property int overriddenHeight
// property to change default view display // property to change default view display
property bool showAsSquare: true property bool showAsSquare: true
// default image
property var imageSource: mainItem.contentGui
? UtilsCpp.isImage(mainItem.filePath)
? AppIcons.fileImage
: UtilsCpp.isPdf(mainItem.filePath)
? AppIcons.filePdf
: UtilsCpp.isText(mainItem.filePath)
? AppIcons.fileText
: AppIcons.file
: ''
Connections { Connections {
enabled: contentGui enabled: contentGui
@ -40,55 +50,9 @@ Item {
} }
} }
property bool isHovering: thumbnailProvider.state == 'hovered' // property bool isHovering: thumbnailProvider.state == 'hovered'
property bool isOutgoing: false property bool isOutgoing: false
MouseArea {
anchors.fill: parent
hoverEnabled: true
propagateComposedEvents: true
function handleMouseMove (mouse) {
thumbnailProvider.state = Utils.pointIsInItem(this, thumbnailProvider, mouse)
? 'hovered'
: ''
}
onMouseXChanged: (mouse) => handleMouseMove.call(this, mouse)
onMouseYChanged: (mouse) => handleMouseMove.call(this, mouse)
onEntered: {
thumbnailProvider.state = 'hovered'
}
onExited: {
thumbnailProvider.state = ''
}
onClicked: (mouse) => {
mouse.accepted = false
if(mainItem.isTransferring) {
mainItem.contentGui.core.lCancelDownloadFile()
mouse.accepted = true
thumbnailProvider.state = ''
}
else if(!mainItem.contentGui.core.wasDownloaded) {
mouse.accepted = true
thumbnailProvider.state = ''
mainItem.contentGui.core.lDownloadFile()
} else if (Utils.pointIsInItem(this, thumbnailProvider, mouse)) {
mouse.accepted = true
thumbnailProvider.state = ''
// if(SettingsModel.isVfsEncrypted){
// window.attachVirtualWindow(Utils.buildCommonDialogUri('FileViewDialog'), {
// contentGui: mainItem.contentGui,
// }, function (status) {
// })
// }else
mainItem.contentGui.core.lOpenFile()
} else if (mainItem.contentGui) {
mouse.accepted = true
thumbnailProvider.state = ''
mainItem.contentGui.core.lOpenFile(true)// Show directory
}
}
}
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Thumbnail // Thumbnail
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ -184,184 +148,156 @@ Item {
} }
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Extension // Default view
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
Component { Component {
id: defaultFileView id: defaultSquareView
Control.Control {
leftPadding: Math.round(4 * DefaultStyle.dp)
rightPadding: Math.round(4 * DefaultStyle.dp)
topPadding: Math.round(23 * DefaultStyle.dp)
bottomPadding: Math.round(4 * DefaultStyle.dp)
hoverEnabled: false
Control.StackView { background: Rectangle {
id: defaultViewStack anchors.fill: parent
width: childrenRect.width color: FileViewStyle.extension.background.color
height: childrenRect.height radius: FileViewStyle.extension.radius
initialItem: mainItem.showAsSquare ? defaultSquareView : defaultView
Connections { Rectangle {
target: mainItem color: DefaultStyle.main2_200
function onShowAsSquareChanged() { anchors.top: parent.top
if (mainItem.showAsSquare) defaultViewStack.replace(defaultSquareView) anchors.left: parent.left
else defaultViewStack.replace(defaultView) anchors.right: parent.right
height: Math.round(23 * DefaultStyle.dp)
EffectImage {
anchors.centerIn: parent
imageSource: mainItem.imageSource
imageWidth: Math.round(14 * DefaultStyle.dp)
imageHeight: Math.round(14 * DefaultStyle.dp)
colorizationColor: DefaultStyle.main2_600
}
} }
} }
property var imageSource: mainItem.contentGui
? UtilsCpp.isImage(mainItem.filePath)
? AppIcons.fileImage
: UtilsCpp.isPdf(mainItem.filePath)
? AppIcons.filePdf
: UtilsCpp.isText(mainItem.filePath)
? AppIcons.fileText
: AppIcons.file
: ''
Component {
id: defaultSquareView
Control.Control {
leftPadding: Math.round(4 * DefaultStyle.dp)
rightPadding: Math.round(4 * DefaultStyle.dp)
topPadding: Math.round(23 * DefaultStyle.dp)
bottomPadding: Math.round(4 * DefaultStyle.dp)
hoverEnabled: false
background: Rectangle {
anchors.fill: parent
color: FileViewStyle.extension.background.color
radius: FileViewStyle.extension.radius
Rectangle { contentItem: Item {
color: DefaultStyle.main2_200 Text {
anchors.top: parent.top id: fileName
anchors.left: parent.left visible: !progressBar.visible
anchors.right: parent.right anchors.left: parent.left
height: Math.round(23 * DefaultStyle.dp) anchors.right: parent.right
EffectImage { anchors.verticalCenter: parent.verticalCenter
anchors.centerIn: parent // visible: mainItem.contentGui && !mainItem.isAnimatedImage
imageSource: defaultViewStack.imageSource font.pixelSize: Typography.f1.pixelSize
imageWidth: Math.round(14 * DefaultStyle.dp) font.weight: Typography.f1l.weight
imageHeight: Math.round(14 * DefaultStyle.dp) wrapMode: Text.WrapAnywhere
colorizationColor: DefaultStyle.main2_600 maximumLineCount: 2
} text: mainItem.name
} verticalAlignment: Text.AlignVCenter
} horizontalAlignment: Text.AlignHCenter
}
contentItem: Item { Text {
Text { id: fileSizeText
id: fileName visible: !progressBar.visible
visible: !progressBar.visible anchors.bottom: parent.bottom
anchors.left: parent.left anchors.right: parent.right
anchors.right: parent.right text: Utils.formatSize(mainItem.fileSize)
anchors.verticalCenter: parent.verticalCenter font.pixelSize: Typography.f1l.pixelSize
// visible: mainItem.contentGui && !mainItem.isAnimatedImage font.weight: Typography.f1l.weight
font.pixelSize: Typography.f1.pixelSize }
font.weight: Typography.f1l.weight RoundProgressBar {
wrapMode: Text.WrapAnywhere id: progressBar
maximumLineCount: 2 anchors.centerIn: parent
text: mainItem.name to: 100
verticalAlignment: Text.AlignVCenter value: mainItem.contentGui ? (mainItem.fileSize>0 ? Math.floor(100 * mainItem.contentGui.core.fileOffset / mainItem.fileSize) : 0) : to
horizontalAlignment: Text.AlignHCenter visible: mainItem.isTransferring && value != 0
} /* Change format? Current is %
Text { text: if(mainRow.contentGui){
id: fileSizeText var mainItem.fileSize = Utils.formatSize(mainRow.contentGui.core.mainItem.fileSize)
visible: !progressBar.visible return progressBar.visible
anchors.bottom: parent.bottom ? Utils.formatSize(mainRow.contentGui.core.fileOffset) + '/' + mainItem.fileSize
anchors.right: parent.right : mainItem.fileSize
text: Utils.formatSize(mainItem.fileSize) }else
font.pixelSize: Typography.f1l.pixelSize return ''
font.weight: Typography.f1l.weight */
} }
RoundProgressBar { Rectangle {
id: progressBar visible: thumbnailProvider.state === 'hovered' && mainItem.contentGui && (/*!mainItem.isOutgoing &&*/ !mainItem.contentGui.core.wasDownloaded)
anchors.centerIn: parent color: DefaultStyle.grey_0
to: 100 opacity: 0.5
value: mainItem.contentGui ? (mainItem.fileSize>0 ? Math.floor(100 * mainItem.contentGui.core.fileOffset / mainItem.fileSize) : 0) : to anchors.fill: parent
visible: mainItem.isTransferring && value != 0 }
/* Change format? Current is % EffectImage {
text: if(mainRow.contentGui){ visible: thumbnailProvider.state === 'hovered' && mainItem.contentGui && (/*!mainItem.isOutgoing &&*/ !mainItem.contentGui.core.wasDownloaded)
var mainItem.fileSize = Utils.formatSize(mainRow.contentGui.core.mainItem.fileSize) anchors.centerIn: parent
return progressBar.visible imageSource: AppIcons.download
? Utils.formatSize(mainRow.contentGui.core.fileOffset) + '/' + mainItem.fileSize width: Math.round(24 * DefaultStyle.dp)
: mainItem.fileSize height: Math.round(24 * DefaultStyle.dp)
}else colorizationColor: DefaultStyle.main2_600
return ''
*/
}
Rectangle {
visible: thumbnailProvider.state === 'hovered' && mainItem.contentGui && (/*!mainItem.isOutgoing &&*/ !mainItem.contentGui.core.wasDownloaded)
color: DefaultStyle.grey_0
opacity: 0.5
anchors.fill: parent
}
EffectImage {
visible: thumbnailProvider.state === 'hovered' && mainItem.contentGui && (/*!mainItem.isOutgoing &&*/ !mainItem.contentGui.core.wasDownloaded)
anchors.centerIn: parent
imageSource: AppIcons.download
width: Math.round(24 * DefaultStyle.dp)
height: Math.round(24 * DefaultStyle.dp)
colorizationColor: DefaultStyle.main2_600
}
}
} }
} }
Component { }
id: defaultView }
Control.Control { Component {
rightPadding: Math.round(17*DefaultStyle.dp) id: defaultView
Control.Control {
rightPadding: Math.round(17*DefaultStyle.dp)
background: Rectangle { background: Rectangle {
id: bg id: bg
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
width: mainItem.width width: mainItem.width
height: mainItem.height height: mainItem.height
radius: Math.round(10 * DefaultStyle.dp) radius: Math.round(10 * DefaultStyle.dp)
}
contentItem: RowLayout {
spacing: Math.round(16 * DefaultStyle.dp)
Rectangle {
color: DefaultStyle.main2_200
width: Math.round(58 * DefaultStyle.dp)
height: bg.height
radius: bg.radius
Rectangle {
anchors.right: parent.right
color: DefaultStyle.main2_200
width: parent.width / 2
height: parent.height
radius: parent.radius
} }
contentItem: RowLayout { EffectImage {
spacing: Math.round(16 * DefaultStyle.dp) z: parent.z + 1
Rectangle { anchors.centerIn: parent
color: DefaultStyle.main2_200 imageSource: defaultViewStack.imageSource
width: Math.round(58 * DefaultStyle.dp) width: Math.round(22 * DefaultStyle.dp)
height: bg.height height: width
radius: bg.radius colorizationColor: DefaultStyle.main2_600
Rectangle { }
anchors.right: parent.right }
color: DefaultStyle.main2_200 ColumnLayout {
width: parent.width / 2 spacing: Math.round(1 * DefaultStyle.dp)
height: parent.height Text {
radius: parent.radius text: mainItem.name
Layout.fillWidth: true
} font {
EffectImage { pixelSize: Typography.p2.pixelSize
z: parent.z + 1 weight: Typography.p2.weight
anchors.centerIn: parent
imageSource: defaultViewStack.imageSource
width: Math.round(22 * DefaultStyle.dp)
height: width
colorizationColor: DefaultStyle.main2_600
}
} }
ColumnLayout { }
spacing: Math.round(1 * DefaultStyle.dp) Text {
Text { text: mainItem.fileSize
text: mainItem.name Layout.fillWidth: true
Layout.fillWidth: true font {
font { pixelSize: Typography.p4.pixelSize
pixelSize: Typography.p2.pixelSize weight: Typography.p4.weight
weight: Typography.p2.weight
}
}
Text {
text: mainItem.fileSize
Layout.fillWidth: true
font {
pixelSize: Typography.p4.pixelSize
weight: Typography.p4.weight
}
}
} }
} }
} }
} }
} }
} }
Loader { Loader {
id: thumbnailProvider id: thumbnailProvider
anchors.fill: parent anchors.fill: parent
@ -370,17 +306,51 @@ Item {
? animatedImage ? animatedImage
: mainItem.haveThumbnail : mainItem.haveThumbnail
? thumbnailImage ? thumbnailImage
: defaultFileView : mainItem.showAsSquare
? defaultSquareView
: defaultView
: undefined : undefined
states: State { states: State {
name: 'hovered' name: 'hovered'
} }
// Changing cursor in MouseArea seems not to work with the Loader
// Use override cursor for this case MouseArea {
onStateChanged: { anchors.fill: thumbnailProvider.item
if (state === 'hovered') UtilsCpp.setGlobalCursor(Qt.PointingHandCursor) hoverEnabled: true
else UtilsCpp.restoreGlobalCursor() propagateComposedEvents: true
cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
// Changing cursor in MouseArea seems not to work with the Loader
// Use override cursor for this case
onContainsMouseChanged: {
console.log("contains mouse", containsMouse)
if (containsMouse) UtilsCpp.setGlobalCursor(Qt.PointingHandCursor)
else UtilsCpp.restoreGlobalCursor()
thumbnailProvider.state = containsMouse ? 'hovered' : ''
}
onPressed: (mouse) => {
mouse.accepted = false
if(mainItem.isTransferring) {
mainItem.contentGui.core.lCancelDownloadFile()
mouse.accepted = true
}
else if(!mainItem.contentGui.core.wasDownloaded) {
mouse.accepted = true
mainItem.contentGui.core.lDownloadFile()
} else if (Utils.pointIsInItem(this, thumbnailProvider, mouse)) {
mouse.accepted = true
// if(SettingsModel.isVfsEncrypted){
// window.attachVirtualWindow(Utils.buildCommonDialogUri('FileViewDialog'), {
// contentGui: mainItem.contentGui,
// }, function (status) {
// })
// }else
mainItem.contentGui.core.lOpenFile()
} else if (mainItem.contentGui) {
mouse.accepted = true
mainItem.contentGui.core.lOpenFile(true)// Show directory
}
}
} }
} }
} }