renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1162 from Frenzie/master

Browse Source 
File manager improvements: added delete confirmation dialog and success/failure message
This commit is contained in:
Huang Xin
2014-11-13 19:35:54 +08:00
parent b0b02182ff 886a9d8f8f
commit c219ba3266
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/apps/filemanager/filemanager.lua
View File

@@ -106,9 +106,15 @@ function FileManager:init()
text = _("Delete"),
callback = function()
local path = util.realpath(file)
deleteFile(file)
self:refreshPath()
local ConfirmBox = require("ui/widget/confirmbox")
UIManager:close(self.file_dialog)
UIManager:show(ConfirmBox:new{
text = _("Are you sure that you want to delete this file?\n") .. file .. ("\nIf you delete a file, it is permanently lost"),
ok_callback = function()
deleteFile(file)
self:refreshPath()
end,
})
end,
},
},
@@ -234,7 +240,19 @@ function FileManager:pasteHere(file)
end
function FileManager:deleteFile(file)
util.execute("/bin/rm", "-r", util.realpath(file))
local InfoMessage = require("ui/widget/infomessage")
local rm = util.execute("/bin/rm", "-r", util.realpath(file))
DEBUG("File to remove", util.realpath(file))
DEBUG("rm status", rm)
if rm == 0 then
UIManager:show(InfoMessage:new{
text = _("Successfully deleted\n") .. file,
})
else
UIManager:show(InfoMessage:new{
text = _("An error occurred while trying to delete\n") .. file,
})
end
end
local collates = {
@@ -255,7 +273,7 @@ function FileManager:getSortingMenuTable()
end
return {
text_func = function()
return _("Sorting: ") .. collates[fm.file_chooser.collate]
return _("Sort order: ") .. collates[fm.file_chooser.collate]
end,
sub_item_table = {
set_collate_table("strcoll"),