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

[UX] Gesture manager: allow folder shortcuts as action in Reader (#4759)

Browse Source 
Note that `self.ui:onClose()` properly closes open documents. There might be similar pieces of code around that don't do that.

Fixes #4755.
This commit is contained in:
Frans de Jonge
2019-03-08 21:02:25 +01:00
committed by GitHub
parent 2cbec1b54e
commit 5ccc3ec352
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/apps/filemanager/filemanagershortcuts.lua
View File

@@ -190,13 +190,24 @@ function FileManagerShortcuts:deleteFolderShortcut(item)
end
function FileManagerShortcuts:onShowFolderShortcutsDialog()
local fm_bookmark = FileManagerShortcuts:new{
local fm_bookmark = self:new{
title = _("Folder shortcuts"),
show_parent = self.ui,
curr_path = self.ui.file_chooser.path,
curr_path = self.ui.file_chooser and self.ui.file_chooser.path or self.ui:getLastDirFile(),
goFolder = function(folder)
if folder ~= nil and lfs.attributes(folder, "mode") == "directory" then
self.ui.file_chooser:changeToPath(folder)
if self.ui.file_chooser then
self.ui.file_chooser:changeToPath(folder)
else -- called from Reader
local FileManager = require("apps/filemanager/filemanager")
self.ui:onClose()
if FileManager.instance then
FileManager.instance:reinit(folder)
else
FileManager:showFiles(folder)
end
end
end
end,
}

2
frontend/apps/reader/modules/readergesture.lua
View File

@@ -315,7 +315,7 @@ function ReaderGesture:buildMenu(ges, default)
{"clear_location_history", not self.is_docless, true},
{"folder_up", self.is_docless},
{"folder_shortcuts", self.is_docless, true},
{"folder_shortcuts", true, true},
{ "toc", not self.is_docless},
{"bookmarks", not self.is_docless},

6
frontend/apps/reader/readerui.lua
View File

@@ -13,6 +13,7 @@ local Event = require("ui/event")
local FileManagerBookInfo = require("apps/filemanager/filemanagerbookinfo")
local FileManagerHistory = require("apps/filemanager/filemanagerhistory")
local FileManagerFileSearcher = require("apps/filemanager/filemanagerfilesearcher")
local FileManagerShortcuts = require("apps/filemanager/filemanagershortcuts")
local InfoMessage = require("ui/widget/infomessage")
local InputContainer = require("ui/widget/container/inputcontainer")
local InputDialog = require("ui/widget/inputdialog")
@@ -336,6 +337,11 @@ function ReaderUI:init()
dialog = self.dialog,
ui = self,
})
-- folder shortcuts
self:registerModule("folder_shortcuts", FileManagerShortcuts:new{
dialog = self.dialog,
ui = self,
})
-- history view
self:registerModule("history", FileManagerHistory:new{
dialog = self.dialog,