From ce5f66ccbcad1e2437e12b10d9d215438bc9f0fa Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Wed, 9 Sep 2015 17:37:35 +0200 Subject: [PATCH] Prefix battery percentage w/ a + when charging. Adresses comments on MR. Add a comment explaining the magic behind CRe's charging icon when using CRE's full (top) status bar. --- frontend/apps/reader/modules/readerfooter.lua | 3 +-- frontend/apps/reader/modules/readerrolling.lua | 1 + frontend/ui/widget/touchmenu.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua index a49399474..27c93a959 100644 --- a/frontend/apps/reader/modules/readerfooter.lua +++ b/frontend/apps/reader/modules/readerfooter.lua @@ -196,8 +196,7 @@ end function ReaderFooter:getBatteryInfo() local powerd = Device:getPowerDevice() - --local state = powerd:isCharging() and -1 or powerd:getCapacity() - return "B:" .. powerd:getCapacity() .. "%" + return "B:" .. (powerd:isCharging() and "+" or "") .. powerd:getCapacity() .. "%" end function ReaderFooter:getTimeInfo() diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua index 6522b2910..8b7afac39 100644 --- a/frontend/apps/reader/modules/readerrolling.lua +++ b/frontend/apps/reader/modules/readerrolling.lua @@ -499,6 +499,7 @@ function ReaderRolling:updateBatteryState() DEBUG("update battery state") if self.view.view_mode == "page" then local powerd = Device:getPowerDevice() + -- -1 is CR_BATTERY_STATE_CHARGING @ crengine/crengine/include/lvdocview.h local state = powerd:isCharging() and -1 or powerd:getCapacity() if state then self.ui.document:setBatteryState(state) diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index 65c4b49b8..596d7594b 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -463,7 +463,7 @@ function TouchMenu:updateItems() 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) - self.time_info.text = os.date("%H:%M").." @ "..Device:getPowerDevice():getCapacity().."%" + self.time_info.text = os.date("%H:%M").." @ "..(Device:getPowerDevice():isCharging() and "+" or "")..Device:getPowerDevice():getCapacity().."%" UIManager:setDirty("all", function() local refresh_dimen =