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

Readerfont: current font on top in menu; new fonts from current session on top in font test doc (#12410)

Browse Source 
* Move down call setupFaceMenuTable(); list current font on top in menu if sorted by recently selected.

* New fonts from current session listed on top in fonts test documents; small wording changes
This commit is contained in:
jonnyl2
2024-08-26 22:51:29 +02:00
committed by GitHub
parent 6e7b09cd3c
commit f3005906d4
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/apps/reader/modules/readerfont.lua
View File

@@ -31,7 +31,6 @@ local newly_added_fonts = nil -- not yet filled
function ReaderFont:init()
self:registerKeyEvents()
self:setupFaceMenuTable()
self.ui.menu:registerToMainMenu(self)
-- NOP our own gesture handling
self.ges_events = nil
@@ -70,6 +69,14 @@ function ReaderFont:setupFaceMenuTable()
cre = require("document/credocument"):engineInit()
local face_list = cre.getFontFaces()
face_list = self:sortFaceList(face_list)
-- list current font on top if sorted by recently selected
if G_reader_settings:isTrue("font_menu_sort_by_recently_selected") then
local idx = util.arrayContains(face_list, self.font_face)
if idx then
table.remove(face_list, idx)
table.insert(face_list, 1, self.font_face)
end
end
for k, v in ipairs(face_list) do
local font_filename, font_faceindex, is_monospace = cre.getFontFaceFilenameAndFaceIndex(v)
if not font_filename then
@@ -188,6 +195,8 @@ function ReaderFont:onReadSettings(config)
self.font_family_fonts = config:readSetting("font_family_fonts") or {}
self:updateFontFamilyFonts()
self:setupFaceMenuTable()
-- Dirty hack: we have to add following call in order to set
-- m_is_rendered(member of LVDocView) to true. Otherwise position inside
-- document will be reset to 0 on first view render.
@@ -777,7 +786,7 @@ This setting allows scaling all monospace fonts by this percentage so they can f
text = _("Generate font test document"),
callback = function()
UIManager:show(ConfirmBox:new{
text = _("Would you like to generate an HTML document showing some sample text rendered with each available font?"),
text = _("Would you like to generate an HTML document showing a text sample rendered with each available font?"),
ok_callback = function()
self:buildFontsTestDocument()
end,
@@ -894,6 +903,17 @@ a { color: black; }
<h1>%s</h1>
]], _("Available fonts test document"), _("AVAILABLE FONTS")))
local face_list = cre.getFontFaces()
if next(newly_added_fonts) then
-- Sort alphabetically, with new fonts first (as done in sortFaceList())
local move_idx = 1
for i=1, #face_list do
if newly_added_fonts[face_list[i]] then
face_list[i] = face_list[i] .. " [NEW]"
table.insert(face_list, move_idx, table.remove(face_list, i))
move_idx = move_idx + 1
end
end
end
f:write("<div style='margin: 2em'>\n")
for _, font_name in ipairs(face_list) do
local font_id = font_name:gsub(" ", "_"):gsub("'", "_")
@@ -910,7 +930,7 @@ a { color: black; }
f:write("</body></html>\n")
f:close()
UIManager:show(ConfirmBox:new{
text = T(_("Document created as:\n%1\n\nWould you like to read it now?"), BD.filepath(font_test_final_path)),
text = T(_("Document created as:\n%1\n\nWould you like to view it now?"), BD.filepath(font_test_final_path)),
ok_callback = function()
UIManager:scheduleIn(1.0, function()
self.ui:switchDocument(font_test_final_path)