Удаление иконок нажатием делита

Нажав делит, выеденные иконки отправятся в корзину

Нажав shift+делит, выделенные иконки удалятся безвозвратно, если пользователь подтвердит удаление

Libraries/System.lua

@@ -469,6 +469,17 @@ function system.updateIconProperties()
 	computer.pushSignal("system", "updateFileList")
 end
 
+local function getSelectedIcons (iconField)
+	local selectedIcons = {}
+	for i = 2, #iconField.children do
+		if iconField.children[i].selected then
+			table.insert(selectedIcons, iconField.children[i])
+		end
+	end
+
+	return selectedIcons
+end
+
 local function drawSelection(x, y, width, height, color, transparency)
 	screen.drawText(x, y, color, string.rep("▄", width), transparency)
 	screen.drawText(x, y + height - 1, color, string.rep("▀", width), transparency)
@@ -866,12 +877,7 @@ local function gridIconFieldIconEventHandler(workspace, object, e1, e2, e3, e4,
 		if e5 == 0 then
 			iconDeselectAndSelect(object)
 		else
-			local selectedIcons = {}
+			local selectedIcons = getSelectedIcons (object.parent)
-			for i = 2, #object.parent.children do
-				if object.parent.children[i].selected then
-					table.insert(selectedIcons, object.parent.children[i])
-				end
-			end
 
 			-- Right click on multiple selected icons	
 			if not object.selected then
@@ -1505,10 +1511,9 @@ local function gridIconFieldBackgroundObjectEventHandler(workspace, object, e1,
 		if e4 == 28 then
 			-- Если при нажатии энтера была выделенна ровно одна иконка, она попытается открыться
 			local selectedIcon
-			
 			for i = 2, #iconField.children do
-				if object.parent.children[i].selected then
+				if iconField.children[i].selected then
-					if not selectedIcon then
+					if selectedIcon ~= nil then
 						-- Больше одной иконки выбрано
 						return
 					end
@@ -1522,6 +1527,79 @@ local function gridIconFieldBackgroundObjectEventHandler(workspace, object, e1,
 				workspace:draw ()
 			end
 		end
+
+		-- Delete
+		if e4 == 211 then
+			-- При нажатии делита, выделенные иконки кидаются в корзину
+
+			selectedIcons = getSelectedIcons (iconField)
+			if #selectedIcons < 1 then
+				return
+			end
+
+			-- Если шифт нажат, удаляем перманентно, спросив пидора о его уверенности
+			if keyboard.isKeyDown (42) then
+				local container = GUI.addBackgroundContainer (workspace, true, true, localization.areYouSure .. " " .. tostring (#selectedIcons) .. " " .. localization.filesWillBeRemovedPermanently)
+				local buttonYes = container.layout:addChild (GUI.button (1, 1, 30, 1, 0xE1E1E1, 0x2D2D2D, 0xA5A5A5, 0x2D2D2D, localization.yes))
+				local buttonNo  = container.layout:addChild (GUI.button (1, 3, 30, 1, 0xE1E1E1, 0x2D2D2D, 0xA5A5A5, 0x2D2D2D, localization.no ))
+
+				buttonYes.onTouch = function ()
+					for i = 1, #selectedIcons do
+						result, reason = filesystem.remove (selectedIcons[i].path)
+						if not result then
+							GUI.alert (localization.fileDeletingFailure .. "'" .. selectedIcons[i].path .. "': " .. reason)
+						end
+
+						-- Отвыделяем иконку, шобы она случайно не открылась
+						selectedIcons[i].selected = false
+					end
+
+					computer.pushSignal ("system", "updateFileList")
+					
+					container:remove ()
+					workspace:draw ()
+				end
+				
+				buttonNo.onTouch = function ()
+					container:remove ()
+					workspace:draw ()					
+				end
+	
+				container.panel.onTouch = buttonNo.onTouch
+
+				container.eventHandler = function (workspace, object, e1, e2, e3, e4, e5, ...)
+					if e1 == "key_down" then
+						if e4 == 28 then
+							buttonYes.onTouch ()
+						elseif e4 == 15 then
+							buttonNo.onTouch ()
+						end
+					end
+				end
+				
+				workspace:draw ()
+			
+			else
+				-- Шифт никто не нажал, кидаем в корзинку
+				for i = 1, #selectedIcons do
+					if filesystem.path (selectedIcons[i].path) == paths.user.trash then
+						filesystem.remove (selectedIcons[i].path)
+					else
+						local newName = paths.user.trash .. selectedIcons[i].name
+						local clearName = filesystem.hideExtension(selectedIcons[i].name)
+						local repeats = 1
+						while filesystem.exists(newName) do
+							newName, repeats = paths.user.trash .. clearName .. string.rep("-copy", repeats) .. (selectedIcons[i].extension or ""), repeats + 1
+						end
+						filesystem.rename(selectedIcons[i].path, newName)
+					end
+					
+					selectedIcons[i].selected = false
+				end
+		
+				computer.pushSignal("system", "updateFileList")		
+			end
+		end
 	end
 end
 
@@ -1637,14 +1715,7 @@ function system.listIconField(x, y, width, height, path, ...)
 
 		if e1 == "touch" then
 			if e5 == 1 then
-				local selectedIcons = {}
+				iconOnRightClick(getSelectedIcons (cell.parent), icon, e1, e2, e3, e4, e5, ...)
-				for i = 1, #cell.parent.children - 1, columnCount do
-					if cell.parent.children[i].selected then
-						table.insert(selectedIcons, cell.parent.children[i])
-					end
-				end
-
-				iconOnRightClick(selectedIcons, icon, e1, e2, e3, e4, e5, ...)
 			end
 		elseif e1 == "double_touch" then
 			iconOnDoubleClick(icon)

Localizations/Arabic.lang

@@ -56,6 +56,7 @@
 	unknown = "غير معروف",
 	calculatingSize = "الحساب ... ",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 	properties = "الخصائص",
 	newFolderFromChosen = "مجلد جديد من اختيار",
 	create = "جديد",

Localizations/Belarusian.lang

@@ -57,6 +57,7 @@
 	unknown = "Невядома",
 	calculatingSize = "ідзе падлік…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Уласцівасці",
 	newFolderFromChosen = "Новая тэчка з вылучанага",

Localizations/Bengali.lang

@@ -55,6 +55,7 @@
 	unknown = "অজানা",
 	calculatingSize = "গণনা করা হচ্ছে ...",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 	properties = "বৈশিষ্ট্য",
 	newFolderFromChosen = "নির্বাচিত",
 	create = "নতুন",

Localizations/Bulgarian.lang

@@ -63,6 +63,7 @@
 	unknown = "Неизвестно",
 	calculatingSize = "изчисляване…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Свойства",
 	newFolderFromChosen = "Нова папка от избраните",

Localizations/Chinese.lang

@@ -57,6 +57,7 @@
 	unknown = "未知",
 	calculatingSize = "计算中...",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "属性",
 	newFolderFromChosen = "在所选文件夹里新建一个文件夹",

Localizations/Dutch.lang

@@ -57,6 +57,7 @@
 	unknown = "Onbekent",
 	calculatingSize = "Berekenen…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Instellingen",
 	newFolderFromChosen = "Nieuwe map van gekozen",

Localizations/English.lang

@@ -57,6 +57,7 @@
 	unknown = "Unknown",
 	calculatingSize = "calculating…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Properties",
 	newFolderFromChosen = "New folder from chosen",

Localizations/Finnish.lang

@@ -57,6 +57,7 @@
 	unknown = "Tuntematon",
 	calculatingSize = "lasketaan…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Ominaisuudet",
 	newFolderFromChosen = "Uusi kansio valinnasta",

Localizations/French.lang

@@ -57,6 +57,7 @@
 	unknown = "Inconnu",
 	calculatingSize = "calcule en cours ...",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Propriétés",
 	newFolderFromChosen = "Nouveau dossier choisi",

Localizations/German.lang

@@ -57,6 +57,7 @@
 	unknown = "Unbekannt",
 	calculatingSize = "Berechne Größe...",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Eigenschaften",
 	newFolderFromChosen = "Neuen Ordner wählen.",

Localizations/Hindi.lang

@@ -56,6 +56,7 @@
 	unknown = "अज्ञात",
 	calculatingSize = "गणना…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 	properties = "गुण",
 	newFolderFromChosen = "से नया फ़ोल्डर",
 	create = "नया",

Localizations/Italian.lang

@@ -57,6 +57,7 @@
 	unknown = "Sconosciuto",
 	calculatingSize = "calcolo…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Proprieta",
 	newFolderFromChosen = "Nuova cartella selezionata",

Localizations/Japanese.lang

@@ -57,6 +57,7 @@
 	unknown = "不明",
 	calculatingSize = "計算中…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "プロパティ",
 	newFolderFromChosen = "選択したフォルダから新しいフォルダを作成",

Localizations/Korean.lang

@@ -57,6 +57,7 @@
 	unknown = "알 수 없음",
 	calculatingSize = "계산중…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "속성",
 	newFolderFromChosen = "선택된 파일이 포함된 새 폴더 만들기",

Localizations/Lolcat.lang

@@ -56,6 +56,7 @@
 	unknown = "Unknown",
 	calculatingSize = "calculating…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 	properties = "propertiez",
 	newFolderFromChosen = "nu foldr frum chosen",
 	create = "nu",

Localizations/Polish.lang

@@ -57,6 +57,7 @@
 	unknown = "Nieznany",
 	calculatingSize = "obliczanie…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Ustawienia",
 	newFolderFromChosen = "Wybierz Nowy Folder z",

Localizations/Portuguese.lang

@@ -56,6 +56,7 @@
 	unknown = "Desconhecido",
 	calculatingSize = "calculando…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 	properties = "Propriedades",
 	newFolderFromChosen = "Nova pasta escolhida",
 	create = "Novo",

Localizations/Russian.lang

@@ -57,6 +57,7 @@
 	unknown = "Неизвестно",
 	calculatingSize = "идет подсчет…",
 	filesWillBeRemovedPermanently = "файл(ов) будет удалено безвозвратно",
+	fileDeletingFailure = "Ошибка при удалении файла",
 	
 	properties = "Свойства",
 	newFolderFromChosen = "Новая папка из выбранного",

Localizations/Slovak.lang

@@ -57,6 +57,7 @@
 	unknown = "Neznáme",
 	calculatingSize = "počítanie…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Vlastnosti",
 	newFolderFromChosen = "Nový priečinok z vybraného",

Localizations/Spanish.lang

@@ -57,6 +57,7 @@
 	unknown = "Desconocido",
 	calculatingSize = "calculando…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Propiedades",
 	newFolderFromChosen = "Nueva carpeta desde Directorio",

Localizations/Ukrainian.lang

@@ -57,6 +57,7 @@
 	unknown = "Невідомо",
 	calculatingSize = "йде підрахунок…",
 	filesWillBeRemovedPermanently = "file(s) will be removed permanently",
+	fileDeletingFailure = "Failed to delete file",
 
 	properties = "Властивості",
 	newFolderFromChosen = "Нова папка з обраного",