From f50f78fada8dcab8472cdb381997efb72d15a91e Mon Sep 17 00:00:00 2001 From: zhangjiarui Date: Mon, 13 Jul 2026 17:39:08 +0800 Subject: [PATCH] fix(print): use valid file name for print preview output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the current image path and pass only its file name to the print dialog. 使用当前图片路径并仅向打印对话框传递文件名。 Log: 修复打印预览保存默认路径和文件名异常 Bug: https://pms.uniontech.com/bug-view-369191.html Influence: 保存 PDF 或图片时默认路径可用，并显示当前图片文件名。 --- libimageviewer/widgets/printhelper.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libimageviewer/widgets/printhelper.cpp b/libimageviewer/widgets/printhelper.cpp index 49f92d7a..d442d9c1 100755 --- a/libimageviewer/widgets/printhelper.cpp +++ b/libimageviewer/widgets/printhelper.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2020 - 2024 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -69,7 +69,9 @@ void PrintHelper::showPrintDialog(const QStringList &paths, QWidget *parent) m_re->appendImage(img); } } - tempExsitPaths << paths; + if (!path.isEmpty()) { + tempExsitPaths << path; + } } // 看图采用同步,因为只有一张图片，传入父指针 @@ -78,10 +80,13 @@ void PrintHelper::showPrintDialog(const QStringList &paths, QWidget *parent) (DTK_VERSION_MAJOR >= 5 && DTK_VERSION_MINOR >= 4 && DTK_VERSION_PATCH >= 10)) // 5.4.4暂时没有合入 // 增加运行时版本判断 if (DApplication::runtimeDtkVersion() >= DTK_VERSION_CHECK(5, 4, 10, 0)) { - if (!tempExsitPaths.isEmpty()) { - // 直接传递为路径,不会有问题 - printDialog2.setDocName(QFileInfo(tempExsitPaths.at(0)).absoluteFilePath()); + QString documentName = tempExsitPaths.isEmpty() + ? QStringLiteral("print") + : QFileInfo(tempExsitPaths.first()).fileName(); + if (documentName.isEmpty()) { + documentName = QStringLiteral("print"); } + printDialog2.setDocName(documentName); } #endif