Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add some settings to Display mode/Other settings menu (#3129)

Browse Source
pull/3131/head
poire-z 7 years ago committed by Frans de Jonge
parent b89435b432
commit 2595dbb0ec
1 changed files with 309 additions and 208 deletions
Show Stats Download Patch File Download Diff File

127
plugins/coverbrowser.koplugin/main.lua
Unescape Escape View File

@ -1,3 +1,4 @@
local Device = require("device")
local InputContainer = require("ui/widget/container/inputcontainer")
local UIManager = require("ui/uimanager")
local logger = require("logger")
@ -36,10 +37,17 @@ local DISPLAY_MODES = {
local CoverBrowser = InputContainer:new{}
function CoverBrowser:init()
self.full_featured = true
-- As we don't know how to run and kill subprocesses on Android (for
-- background info extraction), disable this plugin for now.
-- XXX What about the emulator on Windows ?
if require("ffi/util").isAndroid() then
-- background info extraction), this plugin is very limited on Android,
-- and will provide only a menu for managing a few core settings.
if Device.isAndroid() then
self.full_featured = false
end
self.ui.menu:registerToMainMenu(self)
if not self.full_featured then
return
end
@ -49,8 +57,6 @@ function CoverBrowser:init()
self.history_display_mode = BookInfoManager:getSetting("history_display_mode")
self:setupHistoryDisplayMode()
self.ui.menu:registerToMainMenu(self)
-- If KOReader has started directly to FileManager, the FileManager
-- instance is being init()'ed and there is no FileManager.instance yet,
-- but there'll be one at next tick.
@ -60,7 +66,92 @@ function CoverBrowser:init()
end
function CoverBrowser:addToMainMenu(menu_items)
if not self.ui.view then -- only for FileManager menu
-- We add it only to FileManager menu
if self.ui.view then -- Reader
return
end
-- Items available even if not full_featured
-- (settings used by core, that fit in this menu)
local generic_items = {
{
text_func = function()
local current_state = _("Show new files in bold")
if G_reader_settings:readSetting("show_file_in_bold") == "opened" then
current_state = _("Show opened files in bold")
elseif G_reader_settings:readSetting("show_file_in_bold") == false then
current_state = _("Show files in bold") -- with checkmark unchecked
end
if self.full_featured then
-- Inform that this settings applies only to classic file chooser
current_state = _("(Classic mode) ") .. current_state
end
return current_state
end,
checked_func = function() return G_reader_settings:readSetting("show_file_in_bold") ~= false end,
sub_item_table = {
{
text = _("Don't show files in bold"),
checked_func = function() return G_reader_settings:readSetting("show_file_in_bold") == false end,
callback = function()
G_reader_settings:saveSetting("show_file_in_bold", false)
self:refreshFileManagerInstance()
end,
},
{
text = _("Show opened files in bold"),
checked_func = function() return G_reader_settings:readSetting("show_file_in_bold") == "opened" end,
callback = function()
G_reader_settings:saveSetting("show_file_in_bold", "opened")
self:refreshFileManagerInstance()
end,
},
{
text = _("Show new (not yet opened) files in bold"),
checked_func = function()
return G_reader_settings:readSetting("show_file_in_bold") ~= false and G_reader_settings:readSetting("show_file_in_bold") ~= "opened"
end,
callback = function()
G_reader_settings:delSetting("show_file_in_bold")
self:refreshFileManagerInstance()
end,
},
},
separator = true,
},
{
text = _("Shorten home directory to ~"),
checked_func = function() return G_reader_settings:readSetting("home_dir_display_name") end,
callback = function()
if G_reader_settings:readSetting("home_dir_display_name") then
G_reader_settings:delSetting("home_dir_display_name")
local FileManager = require("apps/filemanager/filemanager")
if FileManager.instance then FileManager.instance:reinit() end
else
G_reader_settings:saveSetting("home_dir_display_name", "~")
local FileManager = require("apps/filemanager/filemanager")
if FileManager.instance then FileManager.instance:reinit() end
end
end,
},
{
text = _("Auto-remove deleted or purged items from history"),
checked_func = function() return G_reader_settings:readSetting("autoremove_deleted_items_from_history") end,
callback = function() G_reader_settings:flipNilOrFalse("autoremove_deleted_items_from_history") end,
},
}
if not self.full_featured then
-- Make the generic items directly as 1st level items,
-- and use alternate name for main menu, not mentionning
-- "display mode" that are not available
menu_items.filemanager_display_mode = {
text = _("File browser settings"),
sub_item_table = generic_items
}
return
end
menu_items.filemanager_display_mode = {
text = _("Display mode"),
sub_item_table = {
@ -88,21 +179,21 @@ function CoverBrowser:addToMainMenu(menu_items)
end,
},
{
text = _("List with image and metadata"),
text = _("Detailed list with cover images and metadata"),
checked_func = function() return self.filemanager_display_mode == "list_image_meta" end,
callback = function()
self:setupFileManagerDisplayMode("list_image_meta")
end,
},
{
text = _("List with metadata, no image"),
text = _("Detailed list with metadata, no images"),
checked_func = function() return self.filemanager_display_mode == "list_only_meta" end,
callback = function()
self:setupFileManagerDisplayMode("list_only_meta")
end,
},
{
text = _("List with image and filename"),
text = _("Detailed list with cover images and filenames"),
checked_func = function() return self.filemanager_display_mode == "list_image_filename" end,
callback = function()
self:setupFileManagerDisplayMode("list_image_filename")
@ -112,7 +203,6 @@ function CoverBrowser:addToMainMenu(menu_items)
-- Plug the same choices for History here as a submenu
-- (Any other suitable place for that ?)
{
separator = true,
text = _("History display mode"),
sub_item_table = {
{
@ -137,21 +227,21 @@ function CoverBrowser:addToMainMenu(menu_items)
end,
},
{
text = _("List with image and metadata"),
text = _("Detailed list with cover images and metadata"),
checked_func = function() return self.history_display_mode == "list_image_meta" end,
callback = function()
self:setupHistoryDisplayMode("list_image_meta")
end,
},
{
text = _("List with metadata, no image"),
text = _("Detailed list with metadata, no images"),
checked_func = function() return self.history_display_mode == "list_only_meta" end,
callback = function()
self:setupHistoryDisplayMode("list_only_meta")
end,
},
{
text = _("List with image and filename"),
text = _("Detailed list with cover images and filenames"),
checked_func = function() return self.history_display_mode == "list_image_filename" end,
callback = function()
self:setupHistoryDisplayMode("list_image_filename")
@ -159,6 +249,7 @@ function CoverBrowser:addToMainMenu(menu_items)
separator = true,
},
},
separator = true,
},
-- Misc settings
{
@ -212,6 +303,7 @@ function CoverBrowser:addToMainMenu(menu_items)
self:refreshFileManagerInstance()
end,
},
-- generic_items will be inserted here
},
},
{
@ -285,6 +377,11 @@ function CoverBrowser:addToMainMenu(menu_items)
},
},
}
-- Finally, insert the generic items at end of "Other settings" submenu
local sub_item_table = menu_items.filemanager_display_mode.sub_item_table
local generic_items_target = sub_item_table[#sub_item_table-1].sub_item_table -- second to last
for _, item in pairs(generic_items) do
table.insert(generic_items_target, item)
end
end
@ -301,7 +398,11 @@ function CoverBrowser:refreshFileManagerInstance(cleanup)
fc.onFileHold_ours = nil
end
end
if self.filemanager_display_mode then
fc:updateItems()
else -- classic file_chooser needs this for a full redraw
fc:refreshPath()
end
end
end

Write Preview
Loading…
Cancel
Save