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
13 changes: 10 additions & 3 deletions src/frame/ccentralwidget.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 - 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -160,12 +160,20 @@ class DrawBoard::DrawBoard_private
{
if (toddf) {
FileSelectDialog dialog(_borad);

// Set directory first to avoid GTK native dialog resetting
// filename and name filter when setDirectory is called later
if (!file.isEmpty()) {
dialog.setDirectory(QFileInfo(file).dir().absolutePath());
} else {
dialog.setDirectory(drawApp->defaultFileDialogPath());
}

dialog.setNameFilters(drawApp->writableFormatNameFilters());
dialog.selectNameFilter(drawApp->defaultFileDialogNameFilter());

if (!file.isEmpty()) {
dialog.selectFile(file);
dialog.setDirectory(QFileInfo(file).dir().absolutePath());
} else {
// Add a format suffix to the default filename
QString fullFileName = defaultFileName;
Expand All @@ -180,7 +188,6 @@ class DrawBoard::DrawBoard_private
}
}
dialog.selectFile(fullFileName);
dialog.setDirectory(drawApp->defaultFileDialogPath());
}
dialog.exec();

Expand Down
4 changes: 2 additions & 2 deletions src/frame/cmultiptabbarwidget.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 - 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -193,7 +193,7 @@ FileSelectDialog::FileSelectDialog(DrawBoard *parent): DFileDialog(parent)
this->setAcceptMode(QFileDialog::AcceptSave);

//只显示文件夹
this->setOptions(QFileDialog::DontResolveSymlinks /*| QFileDialog::Option(DontUseNativeDialog)*/);
this->setOptions(QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog);

//设置显示模式
this->setViewMode(DFileDialog::List);
Expand Down
Loading