Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/frame/ccentralwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class DrawBoard::DrawBoard_private
return _dialog;
}

QString execFileSelectDialog(const QString &defualFileName, bool toddf = true, QString file = "")
QString execFileSelectDialog(const QString &defaultFileName, bool toddf = true, QString file = "")
{
if (toddf) {
FileSelectDialog dialog(_borad);
Expand All @@ -167,7 +167,19 @@ class DrawBoard::DrawBoard_private
dialog.selectFile(file);
dialog.setDirectory(QFileInfo(file).dir().absolutePath());
} else {
dialog.selectFile(defualFileName);
// Add a format suffix to the default filename
QString fullFileName = defaultFileName;
QFileInfo fileInfo(fullFileName);
if (fileInfo.suffix().isEmpty()) {
QString suffix = dialog.extractSuffix(drawApp->defaultFileDialogNameFilter());
if (!suffix.isEmpty()) {
if (!suffix.startsWith("."))
suffix.prepend(".");
if (!fullFileName.endsWith(suffix))
fullFileName = fullFileName + suffix;
}
}
dialog.selectFile(fullFileName);
dialog.setDirectory(drawApp->defaultFileDialogPath());
}
dialog.exec();
Expand Down
2 changes: 1 addition & 1 deletion src/frame/cmultiptabbarwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ class FileSelectDialog: public DFileDialog
int exec() override;

QString resultFile()const;
QString extractSuffix(const QString &filter);
private:
void saveSetting();
QString checkAndBuildPath(const QString &path);
QString extractSuffix(const QString &filter);

private:
QString _resultFile;
Expand Down
Loading