diff --git a/panels/dock/taskmanager/package/AppItem.qml b/panels/dock/taskmanager/package/AppItem.qml index 66624072e..e1eabaf87 100644 --- a/panels/dock/taskmanager/package/AppItem.qml +++ b/panels/dock/taskmanager/package/AppItem.qml @@ -369,11 +369,19 @@ Item { PanelToolTip { id: toolTip - text: root.name + text: root.itemId === "dde-trash" ? root.name + "-" + taskmanager.Applet.getTrashTipText() : root.name toolTipX: DockPanelPositioner.x toolTipY: DockPanelPositioner.y } + PanelToolTip { + id: dragToolTip + text: qsTr("Move to Trash") + toolTipX: DockPanelPositioner.x + toolTipY: DockPanelPositioner.y + visible: false + } + Timer { id: toolTipShowTimer interval: 50 @@ -397,6 +405,20 @@ Item { anchors.fill: parent keys: ["dfm_app_type_for_drag"] + onEntered: function (drag) { + if (root.itemId === "dde-trash") { + var point = root.mapToItem(null, root.width / 2, root.height / 2) + dragToolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, dragToolTip.width, dragToolTip.height) + dragToolTip.open() + } + } + + onExited: function (drag) { + if (root.itemId === "dde-trash") { + dragToolTip.close() + } + } + onDropped: function (drop){ root.dropFilesOnItem(root.itemId, drop.urls) } diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp index 48141191b..b9d2197ce 100644 --- a/panels/dock/taskmanager/taskmanager.cpp +++ b/panels/dock/taskmanager/taskmanager.cpp @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include @@ -425,6 +427,20 @@ void TaskManager::saveDockElementsOrder(const QStringList &appIds) TaskManagerSettings::instance()->setDockedElements(newDockedElements); } +QString TaskManager::getTrashTipText() +{ + int fileCount = 0; + QString trashPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/Trash/files"; + QDir trashDir(trashPath); + + if (trashDir.exists()) { + QStringList entries = trashDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); + fileCount = entries.size(); + } + + return tr("%1 files").arg(fileCount); +} + void TaskManager::modifyOpacityChanged() { DS_NAMESPACE::DAppletBridge appearanceBridge("org.deepin.ds.dde-appearance"); diff --git a/panels/dock/taskmanager/taskmanager.h b/panels/dock/taskmanager/taskmanager.h index f299d9ea8..583e9c409 100644 --- a/panels/dock/taskmanager/taskmanager.h +++ b/panels/dock/taskmanager/taskmanager.h @@ -95,6 +95,7 @@ class TaskManager : public DS_NAMESPACE::DContainment, public AbstractTaskManage Q_INVOKABLE void activateWindow(uint32_t windowID); Q_INVOKABLE void saveDockElementsOrder(const QStringList &appIds); + Q_INVOKABLE QString getTrashTipText(); private: void moveFilesToTrash(const QStringList& urls); diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager.ts index 222de3aa9..216a98e81 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager.ts @@ -1,6 +1,13 @@ + + AppItem + + Move to Trash + + + dock::AppItem @@ -47,4 +54,11 @@ + + dock::TaskManager + + %1 files + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ar.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ar.ts index 6051a3dad..9294f3cbb 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ar.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ar.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -26,23 +35,30 @@ dock::DockGlobalElementModel Open - + افتح Undock - + فك الربط Dock - + الرسو Force Quit - + إنهاء قسري Close All - + إغلاق الكل + + + + dock::TaskManager + + %1 files + - \ No newline at end of file + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_az.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_az.ts index 3014a6497..ba2ff3b90 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_az.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_az.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -26,23 +35,30 @@ dock::DockGlobalElementModel Open - + Undock - + Undock Dock - + Dock Force Quit - + Zəmanətli Çıxış Close All - + Hər Birı Kapat + + + + dock::TaskManager + + %1 files + - \ No newline at end of file + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_bo.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_bo.ts index 222de3aa9..216a98e81 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_bo.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_bo.ts @@ -1,6 +1,13 @@ + + AppItem + + Move to Trash + + + dock::AppItem @@ -47,4 +54,11 @@ + + dock::TaskManager + + %1 files + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ca.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ca.ts index c4df647ad..a4759eb3d 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ca.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ca.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Tanca-ho tot - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_de.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_de.ts index 3b8fbabc4..e5d3d6296 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_de.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_de.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -26,23 +35,30 @@ dock::DockGlobalElementModel Open - + Öffnen Undock - + Abdocken Dock - + Dock Force Quit - + Beenden erzwingen Close All - + Alle schließen + + + + dock::TaskManager + + %1 files + - \ No newline at end of file + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_es.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_es.ts index a2148c267..585f8a9ce 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_es.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_es.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Cerrar todo - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fi.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fi.ts index 32efe3dcf..d0f81f510 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fi.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fi.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Sulje kaikki - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fr.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fr.ts index e4d48e378..df4e0ffa4 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fr.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_fr.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Tout fermer - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_hu.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_hu.ts index 886a321ff..9aa2b200d 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_hu.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_hu.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -26,23 +35,30 @@ dock::DockGlobalElementModel Open - + Megnyitás Undock - + Eltávolítás a Dokkolóról Dock - + Kitűzés a Dokkra Force Quit - + Kényszerített kilépés Close All - + Összes bezárása + + + + dock::TaskManager + + %1 files + - \ No newline at end of file + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_it.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_it.ts index 222de3aa9..216a98e81 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_it.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_it.ts @@ -1,6 +1,13 @@ + + AppItem + + Move to Trash + + + dock::AppItem @@ -47,4 +54,11 @@ + + dock::TaskManager + + %1 files + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ja.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ja.ts index 94b417d36..118350ac7 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ja.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ja.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ すべて閉じる - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ko.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ko.ts index 222de3aa9..216a98e81 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ko.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ko.ts @@ -1,6 +1,13 @@ + + AppItem + + Move to Trash + + + dock::AppItem @@ -47,4 +54,11 @@ + + dock::TaskManager + + %1 files + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_lo.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_lo.ts index d9f1ec9d3..0f901d6a8 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_lo.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_lo.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ ປິດທັງໝົດ - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_nb_NO.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_nb_NO.ts index 222de3aa9..216a98e81 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_nb_NO.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_nb_NO.ts @@ -1,6 +1,13 @@ + + AppItem + + Move to Trash + + + dock::AppItem @@ -47,4 +54,11 @@ + + dock::TaskManager + + %1 files + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pl.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pl.ts index 2bf3b2d40..ae3b8798b 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pl.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pl.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Zamknij wszystkie - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pt_BR.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pt_BR.ts index b11403d93..81b59e367 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pt_BR.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_pt_BR.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Fechar tudo - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ru.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ru.ts index 899203c2b..c97683a61 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ru.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_ru.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Закрыть все - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_sq.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_sq.ts index ec6bf4aa3..5bae6874a 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_sq.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_sq.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Mbylli Krejt - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_uk.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_uk.ts index 18d33f128..a52c67263 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_uk.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_uk.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + + + dock::AppItem @@ -45,4 +54,11 @@ Закрити всі - \ No newline at end of file + + dock::TaskManager + + %1 files + + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_CN.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_CN.ts index 3938c2e6e..a0f54bb3f 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_CN.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_CN.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + 移动到回收站 + + dock::AppItem @@ -45,4 +54,11 @@ 关闭所有 - \ No newline at end of file + + dock::TaskManager + + %1 files + %1个文件 + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_HK.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_HK.ts index 3c1c76cb3..f87dde2c6 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_HK.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_HK.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + 移動到回收站 + + dock::AppItem @@ -45,4 +54,11 @@ 關閉所有 - \ No newline at end of file + + dock::TaskManager + + %1 files + %1个文件 + + + diff --git a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_TW.ts b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_TW.ts index 07df8f776..3cb3d4a4d 100644 --- a/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_TW.ts +++ b/panels/dock/taskmanager/translations/org.deepin.ds.dock.taskmanager_zh_TW.ts @@ -1,4 +1,13 @@ - + + + + + AppItem + + Move to Trash + 移動到回收站 + + dock::AppItem @@ -45,4 +54,11 @@ 關閉所有 - \ No newline at end of file + + dock::TaskManager + + %1 files + %1个文件 + + +