Browse Source

Open correct directory when clicked on Browse button

PR #16252.
adaptive-webui-19844
Vladimir Golovnev 3 years ago committed by GitHub
parent
commit
9818c7b6a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      src/gui/fspathedit.cpp
  2. 1
      src/gui/fspathedit.h

11
src/gui/fspathedit.cpp

@ -111,8 +111,12 @@ FileSystemPathEdit::FileSystemPathEditPrivate::FileSystemPathEditPrivate(
void FileSystemPathEdit::FileSystemPathEditPrivate::browseActionTriggered() void FileSystemPathEdit::FileSystemPathEditPrivate::browseActionTriggered()
{ {
Q_Q(FileSystemPathEdit); Q_Q(FileSystemPathEdit);
const QFileInfo fileInfo {q->selectedPath()};
const QString directory = (m_mode == FileSystemPathEdit::Mode::DirectoryOpen) || (m_mode == FileSystemPathEdit::Mode::DirectorySave)
? fileInfo.absoluteFilePath()
: fileInfo.absolutePath();
QString filter = q->fileNameFilter(); QString filter = q->fileNameFilter();
QString directory = q->currentDirectory().isEmpty() ? QDir::homePath() : q->currentDirectory();
QString selectedPath; QString selectedPath;
switch (m_mode) switch (m_mode)
@ -308,11 +312,6 @@ void FileSystemPathEdit::setDialogCaption(const QString &caption)
d->m_dialogCaption = caption; d->m_dialogCaption = caption;
} }
QString FileSystemPathEdit::currentDirectory() const
{
return QFileInfo(selectedPath()).absoluteDir().absolutePath();
}
QWidget *FileSystemPathEdit::editWidgetImpl() const QWidget *FileSystemPathEdit::editWidgetImpl() const
{ {
Q_D(const FileSystemPathEdit); Q_D(const FileSystemPathEdit);

1
src/gui/fspathedit.h

@ -64,7 +64,6 @@ public:
Mode mode() const; Mode mode() const;
void setMode(Mode mode); void setMode(Mode mode);
QString currentDirectory() const;
QString selectedPath() const; QString selectedPath() const;
void setSelectedPath(const QString &val); void setSelectedPath(const QString &val);

Loading…
Cancel
Save