From 625521e129a61af8174ca803e96c39e18ec65ae0 Mon Sep 17 00:00:00 2001
From: Isa Nanic <isa.nanic@savoirfairelinux.com>
Date: Fri, 14 Dec 2018 15:14:02 -0500
Subject: [PATCH] ux: set default download folder if not user-selected
Change-Id: If48532c1293de43ffb78113f53dc5a0e0befb3ac
---
mainwindow.cpp | 6 ++++--
messagewebview.cpp | 4 +---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4e8ea62..4756da8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -287,8 +287,10 @@ MainWindow::readSettingsFromRegistry()
QSettings settings;
restoreGeometry(settings.value(SettingsKey::geometry).toByteArray());
restoreState(settings.value(SettingsKey::windowState).toByteArray());
- LRCInstance::editableDataTransferModel()->downloadDirectory = settings.
- value(SettingsKey::downloadPath, "Downloads").toString().toStdString() + "/";
+
+ LRCInstance::editableDataTransferModel()->downloadDirectory = settings.value(SettingsKey::downloadPath,
+ QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)).toString().toStdString() + "/";
+
if (not settings.contains(SettingsKey::enableNotifications)) {
settings.setValue(SettingsKey::enableNotifications, true);
}
diff --git a/messagewebview.cpp b/messagewebview.cpp
index a662e2d..de7d70a 100644
--- a/messagewebview.cpp
+++ b/messagewebview.cpp
@@ -284,10 +284,8 @@ PrivateBridging::acceptFile(const QString& arg)
auto convUid = LRCInstance::getSelectedConvUid();
LRCInstance::getCurrentConversationModel()->getTransferInfo(interactionUid, info);
- auto downloadsFolder = QSettings().value(SettingsKey::downloadPath, "Downloads").toString().toStdString() + "/";
-
// get full path
- std::string filename = downloadsFolder.c_str();
+ std::string filename = LRCInstance::dataTransferModel().downloadDirectory.c_str();
if (!filename.empty() && filename.back() != '/')
filename += "/";
auto wantedFilename = filename + info.displayName;
--
GitLab