From 399d676cf060f6457aeee02fe387e99f9bea6384 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Wed, 2 Mar 2016 00:05:56 -0800 Subject: [PATCH] kobo: rename frontlight_state config to is_frontlight_on --- frontend/ui/uimanager.lua | 18 +++++++++--------- reader.lua | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua index 7d57e0f2c..1aa449729 100644 --- a/frontend/ui/uimanager.lua +++ b/frontend/ui/uimanager.lua @@ -64,23 +64,23 @@ function UIManager:init() local kobo_light_on_start = tonumber(KOBO_LIGHT_ON_START) if kobo_light_on_start then local new_intensity - local new_state + local is_fl_on if kobo_light_on_start > 0 then new_intensity = math.min(kobo_light_on_start, 100) - new_state = true + is_fl_on = true elseif kobo_light_on_start == 0 then - new_state = false + is_fl_on = false elseif kobo_light_on_start == -2 then local NickelConf = require("device/kobo/nickel_conf") new_intensity = NickelConf.frontLightLevel.get() - new_state = NickelConf.frontLightState:get() - if new_state == nil then + is_fl_on = NickelConf.frontLightState:get() + if is_fl_on == nil then -- this device does not support frontlight toggle, - -- we set the state based on frontlight intensity. + -- we set the value based on frontlight intensity. if new_intensity > 0 then - new_state = true + is_fl_on = true else - new_state = false + is_fl_on = false end end end @@ -90,7 +90,7 @@ function UIManager:init() G_reader_settings:saveSetting("frontlight_intensity", new_intensity) end - G_reader_settings:saveSetting("frontlight_state", new_state) + G_reader_settings:saveSetting("is_frontlight_on", is_fl_on) end elseif Device:isKindle() then self.event_handlers["IntoSS"] = function() diff --git a/reader.lua b/reader.lua index fd53d181c..df564aacc 100755 --- a/reader.lua +++ b/reader.lua @@ -122,14 +122,14 @@ if Device:isKobo() then if powerd and powerd.restore_settings then local intensity = G_reader_settings:readSetting("frontlight_intensity") powerd.fl_intensity = intensity or powerd.fl_intensity - local state = G_reader_settings:readSetting("frontlight_state") - if state then - -- default state is off, turn it on + local is_fl_on = G_reader_settings:readSetting("is_frontlight_on") + if is_fl_on then + -- default is_fl_on is false, turn it on powerd:toggleFrontlight() else -- the light can still be turned on manually outside of koreader -- or nickel. so we always set the intensity to 0 here to keep it - -- in sync with the default state + -- in sync with powerd.is_fl_on (false by default) -- NOTE: we cant use setIntensity method here because for kobo the -- min intensity is 1 :( powerd.fl:setBrightness(0)