Skip to content

revert: https://github.com/linuxdeepin/dde-shell/pull/1238 with trash. #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wjyrich wants to merge 1 commit into from
Closed

revert: https://github.com/linuxdeepin/dde-shell/pull/1238 with trash. #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions panels/dock/taskmanager/taskmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#include <QGuiApplication>
#include <QStringLiteral>
#include <QUrl>
#include <QDir>
#include <QStandardPaths>
#include <DTrashManager>

#include <appletbridge.h>

Expand Down Expand Up @@ -275,13 +273,6 @@ void TaskManager::handleWindowAdded(QPointer<AbstractWindow> 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;
Expand All @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions panels/dock/taskmanager/taskmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down