Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

Filemanager select mode: add folder buttons (#8595)

Browse Source 
"New folder" and "Folder shortcuts" buttons
This commit is contained in:
hius07 2021-12-30 13:52:04 +02:00 committed by GitHub
parent 4b5ea1197c
commit dd07112de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ local Blitbuffer = require("ffi/blitbuffer")
local Button = require("ui/widget/button") local Button = require("ui/widget/button")
local ButtonDialogTitle = require("ui/widget/buttondialogtitle") local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
local CenterContainer = require("ui/widget/container/centercontainer") local CenterContainer = require("ui/widget/container/centercontainer")
local CheckButton = require("ui/widget/checkbutton")
local ConfirmBox = require("ui/widget/confirmbox") local ConfirmBox = require("ui/widget/confirmbox")
local Device = require("device") local Device = require("device")
local DeviceListener = require("device/devicelistener") local DeviceListener = require("device/devicelistener")
@ -716,6 +717,23 @@ function FileManager:tapPlus()
end end
}, },
}, },
{},
{
{
text = _("New folder"),
callback = function()
UIManager:close(self.file_dialog)
self:createFolder()
end,
},
{
text = _("Folder shortcuts"),
callback = function()
UIManager:close(self.file_dialog)
self:handleEvent(Event:new("ShowFolderShortcutsDialog"))
end
},
},
} }
else else
title = BD.dirpath(filemanagerutil.abbreviate(self.file_chooser.path)) title = BD.dirpath(filemanagerutil.abbreviate(self.file_chooser.path))
@ -734,31 +752,7 @@ function FileManager:tapPlus()
text = _("New folder"), text = _("New folder"),
callback = function() callback = function()
UIManager:close(self.file_dialog) UIManager:close(self.file_dialog)
self.input_dialog = InputDialog:new{ self:createFolder()
title = _("New folder"),
buttons = {
{
{
text = _("Cancel"),
callback = function()
self:closeInputDialog()
end,
},
{
text = _("Create"),
callback = function()
local new_folder = self.input_dialog:getInputText()
if new_folder and new_folder ~= "" then
self:createFolder(self.file_chooser.path, new_folder)
self:closeInputDialog()
end
end,
},
}
},
}
UIManager:show(self.input_dialog)
self.input_dialog:onShowKeyboard()
end, end,
}, },
}, },
@ -1085,17 +1079,51 @@ function FileManager:pasteHere(file)
end end
end end
function FileManager:createFolder(curr_folder, new_folder) function FileManager:createFolder()
local folder = string.format("%s/%s", curr_folder, new_folder) local input_dialog, check_button_enter_folder
local code = BaseUtil.execute(self.mkdir_bin, folder) input_dialog = InputDialog:new{
if code == 0 then title = _("New folder"),
self:onRefresh() buttons = {
{
{
text = _("Cancel"),
callback = function()
UIManager:close(input_dialog)
end,
},
{
text = _("Create"),
is_enter_default = true,
callback = function()
local new_folder_name = input_dialog:getInputText()
if new_folder_name == "" then return end
UIManager:close(input_dialog)
local new_folder = string.format("%s/%s", self.file_chooser.path, new_folder_name)
if BaseUtil.execute(self.mkdir_bin, new_folder) == 0 then
if check_button_enter_folder.checked then
self.file_chooser:changeToPath(new_folder)
else
self.file_chooser:refreshPath()
end
else else
UIManager:show(InfoMessage:new{ UIManager:show(InfoMessage:new{
text = T(_("Failed to create folder:\n%1"), BD.directory(new_folder)), text = T(_("Failed to create folder:\n%1"), BD.directory(new_folder_name)),
icon = "notice-warning", icon = "notice-warning",
}) })
end end
end,
},
}
},
}
check_button_enter_folder = CheckButton:new{
text = _("Enter folder after creation"),
checked = false,
parent = input_dialog,
}
input_dialog:addWidget(check_button_enter_folder)
UIManager:show(input_dialog)
input_dialog:onShowKeyboard()
end end
function FileManager:deleteFile(file) function FileManager:deleteFile(file)