mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-28 11:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(ui/scripts/Utils/utils): provide a getUriFromSystemPath function

Browse source
This commit is contained in:
Ronan Abhamon 2017-06-07 09:26:26 +02:00
parent 796205cd58
commit e059e36d87
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml
View file

@ -75,14 +75,11 @@ TextField {
return '' return ''
} }
var folder = Utils.dirname(textField.selectedFile) return Utils.getUriFromSystemPath(Utils.dirname(textField.selectedFile))
return !Utils.startsWith(folder, 'file:')
? 'file:' + folder
: folder
} }
onAccepted: { onAccepted: {
textField.selectedFile = Utils.getPathFromUri(fileUrl) textField.selectedFile = Utils.getSystemPathFromUri(fileUrl)
textField.accepted(textField.selectedFile) textField.accepted(textField.selectedFile)
} }

2
linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml
View file

@ -29,7 +29,7 @@ Item {
// Filtering files, other urls are forbidden. // Filtering files, other urls are forbidden.
files = files.reduce(function (files, file) { files = files.reduce(function (files, file) {
if (file.startsWith('file:')) { if (file.startsWith('file:')) {
files.push(Utils.getPathFromUri(file)) files.push(Utils.getSystemPathFromUri(file))
} }
return files return files

2
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
View file

@ -71,7 +71,7 @@ Notification {
hoverEnabled: true hoverEnabled: true
onClicked: notification._close(function () { onClicked: notification._close(function () {
Qt.openUrlExternally('file://' + Utils.dirname(notification._fileUri)) Qt.openUrlExternally(Utils.getUriFromSystemPath(Utils.dirname(notification._fileUri)))
}) })
} }
} }

15
linphone-desktop/ui/scripts/Utils/utils.js
View file

@ -155,7 +155,7 @@ function openWindow (window, parent, options) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function getPathFromUri (uri) { function getSystemPathFromUri (uri) {
var str = uri.toString() var str = uri.toString()
if (startsWith(str, 'file://')) { if (startsWith(str, 'file://')) {
str = str.substring(7) str = str.substring(7)
@ -172,6 +172,19 @@ function getPathFromUri (uri) {
return str return str
} }
function getUriFromSystemPath (path) {
if (path.startsWith('file://')) {
return path
}
var os = Qt.platform.os
if (os === 'windows' || os === 'winrt') {
return 'file://' + (/^[^:]+:/.exec(path) ? '' : '/')
}
return 'file://' + path
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Test if a point is in a item. // Test if a point is in a item.