d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #117 from adasauce/file-download-path

Browse source 
use the standard system download path for file downloads
This commit is contained in:
DeepBlueV7.X 2020-02-15 03:28:22 +01:00 committed by GitHub
commit f70923f374
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/TextInputWidget.cpp
View file

@ -626,8 +626,9 @@ TextInputWidget::command(QString command, QString args)
void void
TextInputWidget::openFileSelection() TextInputWidget::openFileSelection()
{ {
const QString homeFolder = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
const auto fileName = const auto fileName =
QFileDialog::getOpenFileName(this, tr("Select a file"), "", tr("All Files (*)")); QFileDialog::getOpenFileName(this, tr("Select a file"), homeFolder, tr("All Files (*)"));
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;

8
src/UserSettingsPage.cpp
View file

@ -27,6 +27,7 @@
#include <QPushButton> #include <QPushButton>
#include <QScrollArea> #include <QScrollArea>
#include <QSettings> #include <QSettings>
#include <QStandardPaths>
#include <QString> #include <QString>
#include <QTextStream> #include <QTextStream>
@ -513,7 +514,9 @@ UserSettingsPage::paintEvent(QPaintEvent *)
void void
UserSettingsPage::importSessionKeys() UserSettingsPage::importSessionKeys()
{ {
auto fileName = QFileDialog::getOpenFileName(this, tr("Open Sessions File"), "", ""); const QString homeFolder = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
const QString fileName =
QFileDialog::getOpenFileName(this, tr("Open Sessions File"), homeFolder, "");
QFile file(fileName); QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
@ -572,7 +575,8 @@ UserSettingsPage::exportSessionKeys()
} }
// Open file dialog to save the file. // Open file dialog to save the file.
auto fileName = const QString homeFolder = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
const QString fileName =
QFileDialog::getSaveFileName(this, tr("File to save the exported session keys"), "", ""); QFileDialog::getSaveFileName(this, tr("File to save the exported session keys"), "", "");
QFile file(fileName); QFile file(fileName);

7
src/dialogs/RoomSettings.cpp
View file

@ -11,6 +11,7 @@
#include <QPushButton> #include <QPushButton>
#include <QShortcut> #include <QShortcut>
#include <QShowEvent> #include <QShowEvent>
#include <QStandardPaths>
#include <QStyleOption> #include <QStyleOption>
#include <QVBoxLayout> #include <QVBoxLayout>
@ -740,8 +741,10 @@ RoomSettings::resetErrorLabel()
void void
RoomSettings::updateAvatar() RoomSettings::updateAvatar()
{ {
const auto fileName = const QString picturesFolder =
QFileDialog::getOpenFileName(this, tr("Select an avatar"), "", tr("All Files (*)")); QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
const QString fileName = QFileDialog::getOpenFileName(
this, tr("Select an avatar"), picturesFolder, tr("All Files (*)"));
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;

9
src/timeline/TimelineModel.cpp
View file

@ -1298,10 +1298,13 @@ TimelineModel::saveMedia(QString eventId) const
dialogTitle = tr("Save file"); dialogTitle = tr("Save file");
} }
QString filterString = QMimeDatabase().mimeTypeForName(mimeType).filterString(); const QString filterString = QMimeDatabase().mimeTypeForName(mimeType).filterString();
const QString downloadsFolder =
QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
const QString openLocation = downloadsFolder + "/" + originalFilename;
auto filename = QFileDialog::getSaveFileName( const QString filename = QFileDialog::getSaveFileName(
manager_->getWidget(), dialogTitle, originalFilename, filterString); manager_->getWidget(), dialogTitle, openLocation, filterString);
if (filename.isEmpty()) if (filename.isEmpty())
return; return;