mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-24 23:28:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(src/app/App): add a convertUrlToLocalPath function

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-05 11:56:14 +02:00
parent be46f8cf6c
commit 65bfcb984b
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-desktop/src/app/App.cpp
View file

@ -261,6 +261,10 @@ void App::smartShowWindow (QQuickWindow *window) {
window->requestActivate();
}
QString App::convertUrlToLocalPath (const QUrl &url) {
return QDir::toNativeSeparators(url.toLocalFile());
}
// -----------------------------------------------------------------------------
bool App::hasFocus () const {

2
linphone-desktop/src/app/App.hpp
View file

@ -71,6 +71,8 @@ public:
Q_INVOKABLE static void smartShowWindow (QQuickWindow *window);
Q_INVOKABLE static QString convertUrlToLocalPath (const QUrl &url);
public slots:
void quit ();

7
linphone-desktop/src/components/chat/ChatModel.cpp
View file

@ -428,12 +428,7 @@ void ChatModel::downloadFile (int id, const QString &downloadPath) {
return;
}
message->setFileTransferFilepath(
::Utils::qStringToLinphoneString(downloadPath.startsWith("file://")
? downloadPath.mid(sizeof("file://") - 1)
: downloadPath
)
);
message->setFileTransferFilepath(::Utils::qStringToLinphoneString(downloadPath));
message->setListener(mMessageHandlers);
if (message->downloadFile() < 0)

2
linphone-desktop/src/main.cpp
View file

@ -98,6 +98,6 @@ int main (int argc, char *argv[]) {
// ---------------------------------------------------------------------------
app.initContentApp();
qInfo() << "Running app...";
qInfo() << QStringLiteral("Running app...");
return app.exec();
}

2
linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml
View file

@ -186,7 +186,7 @@ Row {
selectExisting: false
title: qsTr('downloadFileTitle')
onAccepted: proxyModel.downloadFile(index, fileUrl)
onAccepted: proxyModel.downloadFile(index, App.convertUrlToLocalPath(fileUrl))
}
anchors.fill: parent

4
linphone-desktop/ui/views/App/Main/ContactEdit.js
View file

@ -117,8 +117,8 @@ function cancel () {
// -----------------------------------------------------------------------------
function setAvatar (path) {
contactEdit._vcard.avatar = path.match(/^(?:file:\/\/)?(.*)$/)[1]
function setAvatar (url) {
contactEdit._vcard.avatar = Linphone.App.convertUrlToLocalPath(url)
}
function setUsername (username) {