[Status bar] Consistent menu entries; Add "centered dot" as separator (#8424)

* Consistent menu entries; Add "centered dot" as separator

* Menu entry: Colon
reviewable/pr8438/r1
zwim 3 years ago committed by GitHub
parent abcd989ec4
commit c6e415d646
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1177,7 +1177,13 @@ function ReaderFooter:addToMainMenu(menu_items)
end, end,
}, },
{ {
text = _("Font"), text_func = function()
local font_weight = ""
if self.settings.text_font_bold == true then
font_weight = ", " .. _("bold")
end
return T(_("Font: %1%2"), self.settings.text_font_size, font_weight)
end,
sub_item_table = { sub_item_table = {
{ {
text_func = function() text_func = function()
@ -1340,7 +1346,17 @@ function ReaderFooter:addToMainMenu(menu_items)
}, },
}, },
{ {
text = _("Alignment"), text_func = function()
local align_text
if self.settings.align == "left" then
align_text = _("Left")
elseif self.settings.align == "right" then
align_text = _("Right")
else
align_text = _("Center")
end
return T(_("Alignment: %1"), align_text)
end,
separator = true, separator = true,
enabled_func = function() enabled_func = function()
return self.settings.disable_progress_bar or self.settings.progress_bar_position ~= "alongside" return self.settings.disable_progress_bar or self.settings.progress_bar_position ~= "alongside"
@ -1379,7 +1395,17 @@ function ReaderFooter:addToMainMenu(menu_items)
} }
}, },
{ {
text = _("Prefix"), text_func = function()
local prefix_text = ""
if self.settings.item_prefix == "icons" then
prefix_text = _("Icons")
elseif self.settings.item_prefix == "compact_items" then
prefix_text = _("Compact Items")
elseif self.settings.item_prefix == "letters" then
prefix_text = _("Letters")
end
return T(_("Prefix: %1"), prefix_text)
end,
sub_item_table = { sub_item_table = {
{ {
text_func = function() text_func = function()
@ -1432,7 +1458,11 @@ function ReaderFooter:addToMainMenu(menu_items)
}, },
}, },
{ {
text = _("Item separator"), text_func = function()
local separator = self:get_separator_symbol()
separator = separator ~= "" and separator or "none"
return T(_("Item separator: %1"), separator)
end,
sub_item_table = { sub_item_table = {
{ {
text = _("Vertical line (|)"), text = _("Vertical line (|)"),
@ -1454,6 +1484,16 @@ function ReaderFooter:addToMainMenu(menu_items)
self:refreshFooter(true) self:refreshFooter(true)
end, end,
}, },
{
text = _("Dot (·)"),
checked_func = function()
return self.settings.items_separator == "dot"
end,
callback = function()
self.settings.items_separator = "dot"
self:refreshFooter(true)
end,
},
{ {
text = _("No separator"), text = _("No separator"),
checked_func = function() checked_func = function()
@ -1467,7 +1507,10 @@ function ReaderFooter:addToMainMenu(menu_items)
}, },
}, },
{ {
text = _("Progress percentage format"), text_func = function()
return T(_("Progress percentage format: %1"),
self:progressPercentage(tonumber(self.settings.progress_pct_format)))
end,
sub_item_table = { sub_item_table = {
{ {
text_func = function() text_func = function()
@ -1920,17 +1963,29 @@ end
-- this method will be updated at runtime based on user setting -- this method will be updated at runtime based on user setting
function ReaderFooter:genFooterText() end function ReaderFooter:genFooterText() end
function ReaderFooter:get_separator_symbol()
if self.settings.items_separator == "bar" then
return "|"
elseif self.settings.items_separator == "dot" then
return "·"
elseif self.settings.items_separator == "bullet" then
return ""
end
return ""
end
function ReaderFooter:genAllFooterText() function ReaderFooter:genAllFooterText()
local info = {} local info = {}
local separator = " " local separator = " "
if self.settings.item_prefix == "compact_items" then if self.settings.item_prefix == "compact_items" then
separator = " " separator = " "
end end
if self.settings.items_separator == "bar" then local separator_symbol = self:get_separator_symbol()
separator = " | " if separator_symbol ~= "" then
elseif self.settings.items_separator == "bullet" then separator = string.format(" %s ", self:get_separator_symbol())
separator = ""
end end
-- We need to BD.wrap() all items and separators, so we're -- We need to BD.wrap() all items and separators, so we're
-- sure they are laid out in our order (reversed in RTL), -- sure they are laid out in our order (reversed in RTL),
-- without ordering by the RTL Bidi algorithm. -- without ordering by the RTL Bidi algorithm.

Loading…
Cancel
Save