From 4853f1d4e9ec53458ac70222a73be225a3da8d11 Mon Sep 17 00:00:00 2001 From: wjyrich Date: Fri, 24 Oct 2025 16:13:44 +0800 Subject: [PATCH] revert: https://github.com/linuxdeepin/dde-shell/pull/1238 with trash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 文管采用了相关脚本处理,无需dde-shell特殊处理回收站,只需保持原有逻辑。 Logs: --- panels/dock/taskmanager/taskmanager.cpp | 23 ----------------------- panels/dock/taskmanager/taskmanager.h | 3 --- 2 files changed, 26 deletions(-) diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp index b9d2197ce..70116b7b6 100644 --- a/panels/dock/taskmanager/taskmanager.cpp +++ b/panels/dock/taskmanager/taskmanager.cpp @@ -24,9 +24,7 @@ #include #include #include -#include #include -#include #include @@ -275,13 +273,6 @@ void TaskManager::handleWindowAdded(QPointer window) void TaskManager::dropFilesOnItem(const QString& itemId, const QStringList& urls) { - if (itemId == "dde-trash") { - qCDebug(taskManagerLog) << "dropFilesOnItem: dde-trash - moving files to trash:" << urls; - // 将文件移动到回收站 - moveFilesToTrash(urls); - return; - } - auto indexes = m_itemModel->match(m_itemModel->index(0, 0), TaskManager::ItemIdRole, itemId, 1, Qt::MatchExactly); if (indexes.isEmpty()) { return; @@ -295,20 +286,6 @@ void TaskManager::dropFilesOnItem(const QString& itemId, const QStringList& urls m_itemModel->requestOpenUrls(indexes.first(), urlList); } -void TaskManager::moveFilesToTrash(const QStringList& urls) -{ - // 将文件路径转换为本地路径并移动到回收站 - for (const QString& urlString : urls) { - QUrl url(urlString); - QString filePath = url.toLocalFile(); - if (DTrashManager::instance()->moveToTrash(filePath)) { - qCDebug(taskManagerLog) << "Successfully moved to trash:" << filePath; - } else { - qCWarning(taskManagerLog) << "Failed to move to trash:" << filePath; - } - } -} - void TaskManager::hideItemPreview() { m_windowMonitor->hideItemPreview(); diff --git a/panels/dock/taskmanager/taskmanager.h b/panels/dock/taskmanager/taskmanager.h index 583e9c409..e64ccfa9c 100644 --- a/panels/dock/taskmanager/taskmanager.h +++ b/panels/dock/taskmanager/taskmanager.h @@ -97,9 +97,6 @@ class TaskManager : public DS_NAMESPACE::DContainment, public AbstractTaskManage Q_INVOKABLE void saveDockElementsOrder(const QStringList &appIds); Q_INVOKABLE QString getTrashTipText(); -private: - void moveFilesToTrash(const QStringList& urls); - Q_SIGNALS: void dataModelChanged(); void windowSplitChanged();