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 #1602 from Frenzie/external-styles

Browse Source 
Fix clear external styles not persistent in document settings
This commit is contained in:
Qingping Hou
2015-08-25 22:16:01 -07:00
parent a486dbc6b6 f1e8710f0f
commit c3eaae5e9b
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
frontend/apps/reader/modules/readertypeset.lua
View File

@@ -19,8 +19,8 @@ function ReaderTypeset:init()
end
function ReaderTypeset:onReadSettings(config)
self.css = config:readSetting("css")
if self.css and self.css ~= "" then
self.css = config:readSetting("css") or G_reader_settings:readSetting("copt_css")
if self.css then
self.ui.document:setStyleSheet(self.css)
else
self.ui.document:setStyleSheet(self.ui.document.default_css)
@@ -65,40 +65,43 @@ function ReaderTypeset:onToggleEmbeddedStyleSheet(toggle)
end
function ReaderTypeset:genStyleSheetMenu()
local style_table = {}
local file_list = {
{
text = _("clear all external styles"),
callback = function()
self:setStyleSheet(nil)
end
css = ""
},
{
text = _("Auto"),
callback = function()
self:setStyleSheet(self.ui.document.default_css)
end
css = self.ui.document.default_css
},
}
for f in lfs.dir("./data") do
if lfs.attributes("./data/"..f, "mode") == "file" and string.match(f, "%.css$") then
table.insert(file_list, {
text = f,
callback = function()
self:setStyleSheet("./data/"..f)
end
css = "./data/"..f
})
end
end
return file_list
for i,file in ipairs(file_list) do
table.insert(style_table, {
text = file["text"],
callback = function()
self:setStyleSheet(file["css"])
end,
hold_callback = function()
self:makeDefaultStyleSheet(file["css"], file["text"])
end
})
end
return style_table
end
function ReaderTypeset:setStyleSheet(new_css)
if new_css ~= self.css then
--DEBUG("setting css to ", new_css)
self.css = new_css
if new_css == nil then
new_css = ""
end
self.ui.document:setStyleSheet(new_css)
self.ui:handleEvent(Event:new("UpdatePos"))
end
@@ -169,6 +172,18 @@ function ReaderTypeset:makeDefaultFloatingPunctuation()
})
end
function ReaderTypeset:makeDefaultStyleSheet(css, text)
text = text or css
if css then
UIManager:show(ConfirmBox:new{
text = T( _("Set default style to %1?"), text),
ok_callback = function()
G_reader_settings:saveSetting("copt_css", css)
end,
})
end
end
function ReaderTypeset:onSetPageMargins(margins)
local left = Screen:scaleBySize(margins[1])
local top = Screen:scaleBySize(margins[2])