Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[QzTools] FileDialogs: Fix suggesting default filename

Browse Source
This commit is contained in:
nowrep 2013-12-30 13:15:20 +01:00
parent 0f65591c6d
commit eada3365c9
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/tools/qztools.cpp
View File

@ -543,13 +543,32 @@ QString QzTools::getExistingDirectory(const QString &name, QWidget* parent, cons
return path;
}
static QString getFilename(const QString &path)
{
QFileInfo info(path);
if (info.isFile()) {
return info.fileName();
}
if (info.isDir()) {
return QString();
}
if (info.dir().exists()) {
return info.fileName();
}
return QString();
}
QString QzTools::getOpenFileName(const QString &name, QWidget* parent, const QString &caption, const QString &dir, const QString &filter, QString* selectedFilter, QFileDialog::Options options)
{
Settings settings;
settings.beginGroup("FileDialogPaths");
QString lastDir = settings.value(name, QString()).toString();
QString fileName = QFileInfo(dir).isFile() ? QFileInfo(dir).fileName() : QString();
QString fileName = getFilename(dir);
if (lastDir.isEmpty()) {
lastDir = dir;
@ -574,7 +593,7 @@ QStringList QzTools::getOpenFileNames(const QString &name, QWidget* parent, cons
settings.beginGroup("FileDialogPaths");
QString lastDir = settings.value(name, QString()).toString();
QString fileName = QFileInfo(dir).isFile() ? QFileInfo(dir).fileName() : QString();
QString fileName = getFilename(dir);
if (lastDir.isEmpty()) {
lastDir = dir;
@ -599,7 +618,7 @@ QString QzTools::getSaveFileName(const QString &name, QWidget* parent, const QSt
settings.beginGroup("FileDialogPaths");
QString lastDir = settings.value(name, QString()).toString();
QString fileName = QFileInfo(dir).isFile() ? QFileInfo(dir).fileName() : QString();
QString fileName = getFilename(dir);
if (lastDir.isEmpty()) {
lastDir = dir;