mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
0599c440cc
bidi.lua:
- Revert "Alias everything to Bidi.nowrap() when in LTR UI,
as using LTR isolates seems uneeded when already LTR" (part
of a628714f) which was a wrong assumption: we need proper
wrappers for all things paths. Enhance some of these wrappers.
- Fix GetText RTL wrapping which was losing empty lines and
trailing \n.
- Wrap all paths, directories, filenames in the code with
these wrappers.
- Wrap all book metadata (title, authors...) with BD.auto(),
as it helps fixing some edge cases (like open/close quotation
marks which are not considered as bracket types by FriBiDi).
(Needed some minor logic changes in CoverBrowser.)
- Tweak hyphenation menu text
- Update forgotten SortWidget for UI mirroring
- KoptConfig: update "justification" index for RTL re-ordering,
following the recent addition of the page_gap_height option.
115 lines
4.3 KiB
Lua
115 lines
4.3 KiB
Lua
local BD = require("ui/bidi")
|
|
local DataStorage = require("datastorage")
|
|
local FFIUtil = require("ffi/util")
|
|
local InputDialog = require("ui/widget/inputdialog")
|
|
local LuaSettings = require("luasettings")
|
|
local UIManager = require("ui/uimanager")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
local _ = require("gettext")
|
|
local T = FFIUtil.template
|
|
local filemanagerutil = require("apps/filemanager/filemanagerutil")
|
|
local util = require("util")
|
|
|
|
local DocSettingTweak = WidgetContainer:new{
|
|
name = 'docsettingtweak',
|
|
}
|
|
|
|
local directory_defaults_name = "directory_defaults.lua"
|
|
local directory_defaults_path = FFIUtil.joinPath(DataStorage:getSettingsDir(), directory_defaults_name)
|
|
local directory_defaults = nil
|
|
local initialized = false
|
|
|
|
function DocSettingTweak:init()
|
|
if not initialized then
|
|
-- Make sure our settings file exists
|
|
if not lfs.attributes(directory_defaults_path, "mode") then
|
|
FFIUtil.copyFile(FFIUtil.joinPath(self.path, "directory_defaults_template.lua"),
|
|
directory_defaults_path)
|
|
end
|
|
initialized = true
|
|
end
|
|
DocSettingTweak:loadDefaults()
|
|
self.ui.menu:registerToMainMenu(self)
|
|
end
|
|
|
|
function DocSettingTweak:loadDefaults()
|
|
directory_defaults = LuaSettings:open(directory_defaults_path)
|
|
end
|
|
|
|
function DocSettingTweak:addToMainMenu(menu_items)
|
|
menu_items.doc_setting_tweak = {
|
|
text = _("Tweak document settings"),
|
|
callback = function() DocSettingTweak:editDirectoryDefaults() end,
|
|
}
|
|
end
|
|
|
|
function DocSettingTweak:editDirectoryDefaults()
|
|
local directory_defaults_file = io.open(directory_defaults_path, "rb")
|
|
local defaults = directory_defaults_file:read("*all")
|
|
directory_defaults_file:close()
|
|
local config_editor
|
|
config_editor = InputDialog:new{
|
|
title = T(_("Directory Defaults: %1"), BD.filepath(directory_defaults_path)),
|
|
input = defaults,
|
|
input_type = "string",
|
|
para_direction_rtl = false, -- force LTR
|
|
fullscreen = true,
|
|
condensed = true,
|
|
allow_newline = true,
|
|
cursor_at_end = false,
|
|
add_nav_bar = true,
|
|
reset_callback = function()
|
|
return defaults
|
|
end,
|
|
save_callback = function(content)
|
|
if content and #content > 0 then
|
|
local parse_error = util.checkLuaSyntax(content)
|
|
if not parse_error then
|
|
local syntax_okay, syntax_error = pcall(loadstring(content))
|
|
if syntax_okay then
|
|
directory_defaults_file = io.open(directory_defaults_path, "w")
|
|
directory_defaults_file:write(content)
|
|
directory_defaults_file:close()
|
|
DocSettingTweak:loadDefaults()
|
|
return true, _("Defaults saved")
|
|
else
|
|
return false, T(_("Defaults invalid: %1"), syntax_error)
|
|
end
|
|
else
|
|
return false, T(_("Defaults invalid: %1"), parse_error)
|
|
end
|
|
end
|
|
return false, _("Defaults empty")
|
|
end,
|
|
}
|
|
UIManager:show(config_editor)
|
|
config_editor:onShowKeyboard()
|
|
end
|
|
|
|
function DocSettingTweak:onDocSettingsLoad(doc_settings, document)
|
|
-- check that the documents settings are empty & and that we have defaults to customize
|
|
if next(doc_settings.data) == nil and directory_defaults.data ~= nil then
|
|
local base = G_reader_settings:readSetting("home_dir") or filemanagerutil.getDefaultDir()
|
|
if document.file == nil or document.file == "" then
|
|
return
|
|
end
|
|
local directory = FFIUtil.dirname(document.file)
|
|
-- check if folder matches our defaults to override
|
|
while directory:sub(1, #base) == base do
|
|
if directory_defaults:has(directory) then
|
|
doc_settings.data = util.tableDeepCopy(directory_defaults:readSetting(directory))
|
|
break
|
|
else
|
|
if directory == "/" or directory == "." then
|
|
-- have reached the filesystem root, abort
|
|
break
|
|
else
|
|
directory = FFIUtil.dirname(directory)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
return DocSettingTweak
|