mirror of
https://github.com/IgorTimofeev/MineOS.git
synced 2025-12-20 19:19:21 +01:00
aefaefaef
This commit is contained in:
parent
953e255be4
commit
cb88e96033
@ -8,7 +8,7 @@
|
||||
about="IgorTimofeev/OpenComputers/master/MineOS/About/",
|
||||
type="Script",
|
||||
forceDownload=true,
|
||||
version=3.40,
|
||||
version=3.41,
|
||||
},
|
||||
{
|
||||
name="MineOS/Pictures/Raspberry.pic",
|
||||
@ -253,7 +253,7 @@
|
||||
name="lib/MineOSCore.lua",
|
||||
url="IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
|
||||
type="Library",
|
||||
version=1.35,
|
||||
version=1.36,
|
||||
},
|
||||
{
|
||||
name="lib/advancedLua.lua",
|
||||
|
||||
@ -387,6 +387,7 @@ local function updateDock()
|
||||
for file in fs.list(MineOSCore.paths.trash) do
|
||||
fs.remove(MineOSCore.paths.trash .. file)
|
||||
end
|
||||
workspace.updateFileList()
|
||||
end
|
||||
end
|
||||
menu:show()
|
||||
|
||||
@ -743,7 +743,17 @@ function MineOSCore.iconRightClick(icon, eventData)
|
||||
_G.clipboardCut = true
|
||||
computer.pushSignal("MineOSCore", "updateFileList")
|
||||
elseif action == MineOSCore.localization.contextMenuDelete then
|
||||
fs.rename(icon.path, MineOSCore.paths.trash .. fs.name(icon.path))
|
||||
if fs.path(icon.path) == MineOSCore.paths.trash then
|
||||
fs.remove(icon.path)
|
||||
else
|
||||
local newName = MineOSCore.paths.trash .. fs.name(icon.path)
|
||||
local clearName = MineOSCore.hideFileFormat(fs.name(icon.path))
|
||||
local repeats = 1
|
||||
while fs.exists(newName) do
|
||||
newName, repeats = MineOSCore.paths.trash .. clearName .. string.rep("-copy", repeats) .. icon.format, repeats + 1
|
||||
end
|
||||
fs.rename(icon.path, newName)
|
||||
end
|
||||
computer.pushSignal("MineOSCore", "updateFileList")
|
||||
elseif action == MineOSCore.localization.contextMenuRename then
|
||||
ecs.rename(icon.path)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user