From 35ee55811fd0e9c259dc82deb25dd4517e17c82d Mon Sep 17 00:00:00 2001 From: Wang Yu Date: Tue, 3 Mar 2026 11:21:49 +0800 Subject: [PATCH] feat: use DDesktopServices to open files and folders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace dde-file-manager command line calls with DDesktopServices::showFolder and DDesktopServices::showFileItem for better integration. Sync from master commit #333. Log: 改用DDesktopService的方法打开文件或文件夹 Influence: 使用DTK标准接口打开文件管理器，提升系统集成性 --- src/views/termwidget.cpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/views/termwidget.cpp b/src/views/termwidget.cpp index 3f097b8a..b00409eb 100644 --- a/src/views/termwidget.cpp +++ b/src/views/termwidget.cpp @@ -518,29 +518,30 @@ inline void TermWidget::onPaste() inline void TermWidget::onOpenFileInFileManager() { qCDebug(views) << "Enter TermWidget::onOpenFileInFileManager"; - //DDesktopServices::showFolder(QUrl::fromLocalFile(workingDirectory())); - //打开文件夹的方式 和 打开文件夹 并勾选文件的方式 如下 - //dde-file-manager -n /data/home/lx777/my-wjj/git/2020-08/18-zoudu/build-deepin-terminal-unknown-Debug - //dde-file-manager --show-item a.pdf - - QProcess process; //未选择内容 if (selectedText().isEmpty()) { - qCDebug(views) << "Branch: selectedText is empty, starting dde-file-manager with workingDirectory"; - process.startDetached("dde-file-manager", {"-n", workingDirectory()}); + qCDebug(views) << "Branch: selectedText is empty, using DDesktopServices::showFolder"; + DDesktopServices::showFolder(QUrl::fromLocalFile(workingDirectory())); return; } QFileInfo fi(workingDirectory() + "/" + selectedText()); - //选择的内容是文件或者文件夹 - if (fi.isFile() || fi.isDir()) { - qCDebug(views) << "Branch: selectedText is a file or directory, starting dde-file-manager with --show-item"; - process.startDetached("dde-file-manager", {"--show-item", workingDirectory() + "/" + selectedText()}); + //选择的内容是文件夹 + if (fi.isDir()) { + qCDebug(views) << "Branch: selectedText is a directory, using DDesktopServices::showFolder"; + DDesktopServices::showFolder(QUrl::fromLocalFile(fi.filePath())); + return; + } else if (fi.isFile()) { + //选择的内容是文件 + qCDebug(views) << "Branch: selectedText is a file, using DDesktopServices::showFileItem"; + DDesktopServices::showFileItem(QUrl::fromLocalFile(fi.filePath())); return; } + //选择的文本不是文件也不是文件夹 - process.startDetached("dde-file-manager", {"-n", workingDirectory()}); + qCDebug(views) << "Branch: selectedText is not a file or directory, using DDesktopServices::showFolder"; + DDesktopServices::showFolder(QUrl::fromLocalFile(workingDirectory())); } /*** 修复 bug 28162 鼠标左右键一起按终端会退出 ***/