diff --git a/frontend/apps/reader/modules/readerfrontlight.lua b/frontend/apps/reader/modules/readerfrontlight.lua index 16750865f..2da0c528a 100644 --- a/frontend/apps/reader/modules/readerfrontlight.lua +++ b/frontend/apps/reader/modules/readerfrontlight.lua @@ -83,9 +83,7 @@ end function ReaderFrontLight:onShowFlDialog() local FrontLightWidget = require("ui/widget/frontlightwidget") - local fl = FrontLightWidget:new{ - } - UIManager:show(fl) + UIManager:show(FrontLightWidget:new{}) end function ReaderFrontLight:close() diff --git a/frontend/ui/widget/filechooser.lua b/frontend/ui/widget/filechooser.lua index 8897fdcd3..14586fdca 100644 --- a/frontend/ui/widget/filechooser.lua +++ b/frontend/ui/widget/filechooser.lua @@ -108,16 +108,25 @@ function FileChooser:genItemTableFromPath(path) local dir_files = {} local subdir_path = self.path.."/"..dir.name self.list(subdir_path, sub_dirs, dir_files) - local items = #sub_dirs + #dir_files - local istr = util.template( - items == 1 and _("1 item") - or _("%1 items"), items) + local num_items = #sub_dirs + #dir_files + local istr + if num_items == 1 then + istr = _("1 item") + else + istr = util.template(_("%1 items"), num_items) + end table.insert(item_table, { text = dir.name.."/", mandatory = istr, path = subdir_path }) end + + local show_new_book_in_bold = true -- show new books in bold by default + if G_reader_settings:isTrue("show_opened_doc_in_bold") then + show_new_book_in_bold = false + end + for _, file in ipairs(files) do local full_path = self.path.."/"..file.name local file_size = lfs.attributes(full_path, "size") or 0 @@ -129,16 +138,21 @@ function FileChooser:genItemTableFromPath(path) else sstr = string.format("%d B", file_size) end + local show_in_bold + if show_new_book_in_bold then + show_in_bold = not DocSettings:hasSidecarDir(full_path) + else + show_in_bold = DocSettings:hasSidecarDir(full_path) + end table.insert(item_table, { text = file.name, mandatory = sstr, - -- show new books in bold - bold = not DocSettings:hasSidecarDir(full_path), + bold = show_in_bold, path = full_path }) end - -- lfs.dir iterated node string may be encoded with some weird codepage on Windows - -- we need to encode them to utf-8 + -- lfs.dir iterated node string may be encoded with some weird codepage on + -- Windows we need to encode them to utf-8 if ffi.os == "Windows" then for k, v in pairs(item_table) do if v.text then diff --git a/frontend/ui/widget/frontlightwidget.lua b/frontend/ui/widget/frontlightwidget.lua index 9abc384c2..ecc8feb1c 100644 --- a/frontend/ui/widget/frontlightwidget.lua +++ b/frontend/ui/widget/frontlightwidget.lua @@ -42,7 +42,7 @@ function FrontLightWidget:init() self.fl_cur = self.fl_min end local steps_fl = self.fl_max - self.fl_min + 1 - self.one_step = math.ceil(steps_fl / 25 ) + self.one_step = math.ceil(steps_fl / 25) self.steps = math.ceil(steps_fl / self.one_step) if (self.steps - 1) * self.one_step < self.fl_max - self.fl_min then self.steps = self.steps + 1 @@ -91,7 +91,6 @@ function FrontLightWidget:generateProgressGroup(width, height, fl_level, step) end function FrontLightWidget:setProgress(num, step) - --clear previous data self.fl_container:clear() local padding_span = VerticalSpan:new{ width = self.span } local button_group_down = HorizontalGroup:new{ align = "center" }