feat: delete shortcut with source

This commit is contained in:
Procybit 2022-11-27 21:02:46 +03:00
parent d76d5688c4
commit 86f278af3a
11 changed files with 39 additions and 18 deletions

View File

@ -587,31 +587,35 @@ local function iconDeselectAndSelect(icon)
workspace:draw()
end
local function moveToTrash(path)
local ext = filesystem.extension(path)
local name = filesystem.name(path)
local dir = filesystem.path(path)
if dir == paths.user.trash or ext == ".lnk" then
filesystem.remove(path)
else
local name = filesystem.name(path)
local clearName = filesystem.hideExtension(name)
local newPath = paths.user.trash .. name
local repeats = 1
while filesystem.exists(newPath) do
newPath, repeats = paths.user.trash .. clearName .. string.rep("-copy", repeats) .. (ext or ""), repeats + 1
end
filesystem.rename(path, newPath)
end
computer.pushSignal("system", "updateFileList")
end
local function moveSelectedIconsToTrash(selectedIcons)
local icon
for i = 1, #selectedIcons do
icon = selectedIcons[i]
if filesystem.path(icon.path) == paths.user.trash or icon.isShortcut then
filesystem.remove(icon.path)
else
local name = filesystem.name(icon.path)
local clearName = filesystem.hideExtension(name)
local newPath = paths.user.trash .. name
local repeats = 1
while filesystem.exists(newPath) do
newPath, repeats = paths.user.trash .. clearName .. string.rep("-copy", repeats) .. (icon.extension or ""), repeats + 1
end
filesystem.rename(icon.path, newPath)
end
moveToTrash(icon.path)
icon.selected = false
end
computer.pushSignal("system", "updateFileList")
end
local function iconOnRightClick(selectedIcons, icon, e1, e2, e3, e4)
@ -874,6 +878,13 @@ local function iconOnRightClick(selectedIcons, icon, e1, e2, e3, e4)
moveSelectedIconsToTrash(selectedIcons)
end
if icon.isShortcut then
contextMenu:addItem(localization.deleteWithSource).onTouch = function()
moveToTrash(icon.shortcutPath)
moveToTrash(icon.path)
end
end
contextMenu:addSeparator()
contextMenu:addItem(localization.properties).onTouch = function()

View File

@ -74,6 +74,7 @@
rename = "Преименуване",
editShortcut = "Редактиране на пряк път",
createShortcut = "Създаване на пряк път",
deleteWithSource = "Изтриване с източник",
addToDock = "Добавяне в дока",
removeFromDock = "Премахване от дока",
moveRight = "Премести вдясно",

View File

@ -75,6 +75,7 @@
rename = "重命名",
editShortcut = "编辑快捷方式",
createShortcut = "创建快捷方式",
deleteWithSource = "刪除源",
addToDock = "添加到Dock",
removeFromDock = "从Dock中删除",
moveRight = "向右移动",

View File

@ -75,6 +75,7 @@
rename = "Rename",
editShortcut = "Edit shortcut",
createShortcut = "Create shortcut",
deleteWithSource = "Delete with source",
addToDock = "Add to Dock",
removeFromDock = "Remove from Dock",
moveRight = "Move right",

View File

@ -75,6 +75,7 @@
rename = "Renommer",
editShortcut = "Modifier le raccourci",
createShortcut = "Créer un raccourci",
deleteWithSource = "Supprimer avec la source",
addToDock = "Ajouter à la barre des tâches",
removeFromDock = "Retirer de la barre des tâches",
moveRight = "Déplacer vers la droite",

View File

@ -75,6 +75,7 @@
rename = "Umbenennen",
editShortcut = "Verknüpfung bearbeiten",
createShortcut = "Verknüpfung erstellen",
deleteWithSource = "Mit Quelle löschen",
addToDock = "Zum Dock hinzufügen",
removeFromDock = "Aus Dock entfernen",
moveRight = "Nach rechts bewegen",

View File

@ -75,6 +75,7 @@
rename = "Rinomina",
editShortcut = "Modifica scorciatoia",
createShortcut = "Crea scorciatoia",
deleteWithSource = "Elimina con fonte",
addToDock = "Aggiungi alla bacheca",
removeFromDock = "Rimuovi Dalla bacheca",
moveRight = "Sposta a destra",

View File

@ -75,6 +75,7 @@
rename = "名前を変更 ",
editShortcut = "ショートカットを編集",
createShortcut = "ショートカットを作成",
deleteWithSource = "ソースで削除",
addToDock = "Dockに追加",
removeFromDock = "Dockから削除",
moveRight = "右に移動",

View File

@ -75,6 +75,7 @@
rename = "Переименовать",
editShortcut = "Редактировать ярлык",
createShortcut = "Создать ярлык",
deleteWithSource = "Удалить с источником",
addToDock = "Добавить в Dock",
removeFromDock = "Удалить из Dock",
moveRight = "Передвинуть правее",

View File

@ -75,6 +75,7 @@
rename = "Premenovať",
editShortcut = "Upraviť odkaz",
createShortcut = "Vytvoriť odkaz",
deleteWithSource = "Odstrániť so zdrojom",
addToDock = "Pridať do lišty",
removeFromDock = "Odstrániť z lišty",
moveRight = "Posunúť doprava",

View File

@ -75,6 +75,7 @@
rename = "Перейменувати",
editShortcut = "Змінити ярлик",
createShortcut = "Створити ярлик",
deleteWithSource = "Видалити з джерелом",
addToDock = "Додати в док",
removeFromDock = "Видалити з док",
moveRight = "Перемістити вправо",