UI Changes (#5508)

* Changed File Browser text

KOReader looks nicer than KOReader File Browser,

* Remove the "page x of x" if only one page

Removes it from the bottom of the file browser

* Remove the "page x of x" if only one page

Removes it from the top menu, if there is only one page, why show page 1 of 1

* Renamed ~ to Home

Since the file browser can be considered "Home"

* Added 12 hour time option

Also tweaked the charging icon,  looks nicer than +, tweaked seperator between time and battery, - instead of @
This commit is contained in:
Nick
2019-10-21 22:54:29 +10:30
committed by Frans de Jonge
parent daacb84114
commit ef22e85469
9 changed files with 47 additions and 23 deletions

View File

@@ -593,17 +593,27 @@ function TouchMenu:updateItems()
table.insert(self.item_group, self.footer_top_margin)
table.insert(self.item_group, self.footer)
-- @translators %1 is the current page. %2 is the total number of pages. In some languages a good translation might need to reverse this order, for instance: "Total %2, page %1".
self.page_info_text.text = util.template(_("Page %1 of %2"), self.page, self.page_num)
if self.page_num > 1 then
-- @translators %1 is the current page. %2 is the total number of pages. In some languages a good translation might need to reverse this order, for instance: "Total %2, page %1".
self.page_info_text:setText(util.template(_("Page %1 of %2"), self.page, self.page_num))
else
self.page_info_text:setText("")
end
self.page_info_left_chev:showHide(self.page_num > 1)
self.page_info_right_chev:showHide(self.page_num > 1)
self.page_info_left_chev:enableDisable(self.page > 1)
self.page_info_right_chev:enableDisable(self.page < self.page_num)
local time_info_txt = os.date("%H:%M").." @ "
if Device:getPowerDevice():isCharging() then
time_info_txt = time_info_txt.."+"
local time_info_txt
if G_reader_settings:nilOrTrue("twelve_hour_clock") then
time_info_txt = os.date("%I:%M %p")
else
time_info_txt = os.date("%H:%M")
end
time_info_txt = time_info_txt .. " " .. Device:getPowerDevice():getCapacity() .. "%"
if Device:getPowerDevice():isCharging() then
time_info_txt = time_info_txt .. ""
end
time_info_txt = time_info_txt..Device:getPowerDevice():getCapacity().."%"
self.time_info:setText(time_info_txt)
-- recalculate dimen based on new layout