|
|
@ -1,103 +1,77 @@
|
|
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
|
|
|
|
|
|
local InputDialog = require("ui/widget/inputdialog")
|
|
|
|
|
|
|
|
local Notification = require("ui/widget/notification")
|
|
|
|
|
|
|
|
local GestureRange = require("ui/gesturerange")
|
|
|
|
|
|
|
|
local UIManager = require("ui/uimanager")
|
|
|
|
local Geom = require("ui/geometry")
|
|
|
|
local Geom = require("ui/geometry")
|
|
|
|
local Screen = require("ui/screen")
|
|
|
|
local Screen = require("ui/screen")
|
|
|
|
local Device = require("ui/device")
|
|
|
|
local Device = require("ui/device")
|
|
|
|
local GestureRange = require("ui/gesturerange")
|
|
|
|
|
|
|
|
local InputDialog = require("ui/widget/inputdialog")
|
|
|
|
|
|
|
|
local UIManager = require("ui/uimanager")
|
|
|
|
|
|
|
|
local Notification = require("ui/widget/notification")
|
|
|
|
|
|
|
|
local _ = require("gettext")
|
|
|
|
|
|
|
|
local DEBUG = require("dbg")
|
|
|
|
local DEBUG = require("dbg")
|
|
|
|
|
|
|
|
local _ = require("gettext")
|
|
|
|
|
|
|
|
|
|
|
|
local ReaderFrontlight = {}
|
|
|
|
local ReaderFrontLight = InputContainer:new{
|
|
|
|
if Device:getModel() ~= 'Kobo_phoenix' then
|
|
|
|
steps = {0,1,2,3,4,5,6,7,8,9,10},
|
|
|
|
ReaderFrontLight = InputContainer:new{
|
|
|
|
}
|
|
|
|
steps = {0,1,2,3,4,5,6,7,8,9,10},
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
function ReaderFrontLight:onAdjust(arg, ges)
|
|
|
|
|
|
|
|
return ReaderFrontLight:onAdjustOther(arg, ges)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
else ReaderFrontLight = InputContainer:new{
|
|
|
|
|
|
|
|
steps = {1,1,1,1,1,2,2,2,3,3,4,5},
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
function ReaderFrontLight:onAdjust(arg, ges)
|
|
|
|
|
|
|
|
return ReaderFrontLight:onAdjustPhoenix(arg, ges)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function ReaderFrontLight:init()
|
|
|
|
function ReaderFrontLight:init()
|
|
|
|
if Device:isTouchDevice() then
|
|
|
|
if Device:isTouchDevice() then
|
|
|
|
if Device:getModel() ~= 'Kobo_phoenix' then
|
|
|
|
self.ges_events = {
|
|
|
|
self.ges_events = {
|
|
|
|
Adjust = {
|
|
|
|
Adjust = {
|
|
|
|
GestureRange:new{
|
|
|
|
GestureRange:new{
|
|
|
|
ges = "two_finger_pan",
|
|
|
|
ges = "two_finger_pan",
|
|
|
|
rate = Device:getModel() == 'Kobo_phoenix' and nil or 3.0,
|
|
|
|
range = Geom:new{
|
|
|
|
}
|
|
|
|
x = 0, y = 0,
|
|
|
|
},
|
|
|
|
w = Screen:getWidth(),
|
|
|
|
PanRelease= {
|
|
|
|
h = Screen:getHeight(),
|
|
|
|
GestureRange:new{
|
|
|
|
},
|
|
|
|
ges = "two_finger_pan_release",
|
|
|
|
rate = 2.0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Swipe = {
|
|
|
|
}
|
|
|
|
GestureRange:new{
|
|
|
|
else self.ges_events = {
|
|
|
|
ges = "two_finger_swipe",
|
|
|
|
Adjust = {
|
|
|
|
}
|
|
|
|
GestureRange:new{
|
|
|
|
},
|
|
|
|
ges = "two_finger_pan",
|
|
|
|
}
|
|
|
|
range = Geom:new{
|
|
|
|
self.ui.menu:registerToMainMenu(self)
|
|
|
|
x = 0, y = 0,
|
|
|
|
end
|
|
|
|
w = Screen:getWidth(),
|
|
|
|
|
|
|
|
h = Screen:getHeight(),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
self.ui.menu:registerToMainMenu(self)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function ReaderFrontLight:onAdjustOther(arg, ges)
|
|
|
|
function ReaderFrontLight:onAdjust(arg, ges)
|
|
|
|
local powerd = Device:getPowerDevice()
|
|
|
|
local powerd = Device:getPowerDevice()
|
|
|
|
if powerd.flIntensity ~= nil then
|
|
|
|
if powerd.flIntensity ~= nil then
|
|
|
|
local rel_proportion = ges.distance / Screen:getWidth()
|
|
|
|
DEBUG("frontlight intensity", powerd.flIntensity)
|
|
|
|
local delta_int = self.steps[math.ceil(#self.steps*rel_proportion)] or self.steps[#self.steps]
|
|
|
|
local rel_proportion = ges.distance / Screen:getWidth()
|
|
|
|
local msg = nil
|
|
|
|
local delta_int = self.steps[math.ceil(#self.steps*rel_proportion)] or self.steps[#self.steps]
|
|
|
|
if ges.direction == "north" then
|
|
|
|
local msg = nil
|
|
|
|
msg = _("Increase front light intensity to ")
|
|
|
|
if ges.direction == "north" then
|
|
|
|
powerd:setIntensity(powerd.flIntensity + delta_int)
|
|
|
|
powerd:setIntensity(powerd.flIntensity + delta_int)
|
|
|
|
elseif ges.direction == "south" then
|
|
|
|
elseif ges.direction == "south" then
|
|
|
|
msg = _("Decrease front light intensity to ")
|
|
|
|
powerd:setIntensity(powerd.flIntensity - delta_int)
|
|
|
|
powerd:setIntensity(powerd.flIntensity - delta_int)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if msg ~= nil then
|
|
|
|
return true
|
|
|
|
UIManager:show(Notification:new{
|
|
|
|
|
|
|
|
text = msg..powerd.flIntensity,
|
|
|
|
|
|
|
|
timeout = 1
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function ReaderFrontLight:onAdjustPhoenix(arg, ges)
|
|
|
|
function ReaderFrontLight:onShowIntensity()
|
|
|
|
local powerd = Device:getPowerDevice()
|
|
|
|
local powerd = Device:getPowerDevice()
|
|
|
|
if powerd.flIntensity ~= nil then
|
|
|
|
if powerd.flIntensity ~= nil then
|
|
|
|
local rel_proportion = ges.distance / Screen:getWidth()
|
|
|
|
UIManager:show(Notification:new{
|
|
|
|
DEBUG("rel_proportion = ",rel_proportion)
|
|
|
|
text = _("Frontlight intensity is set to ")..powerd.flIntensity,
|
|
|
|
local delta_int = self.steps[math.ceil(#self.steps*rel_proportion)] or self.steps[#self.steps]
|
|
|
|
timeout = 1.0,
|
|
|
|
DEBUG("math.ceil(#self.steps*rel_proportion) = ",math.ceil(#self.steps*rel_proportion))
|
|
|
|
})
|
|
|
|
DEBUG("delta_int =", delta_int)
|
|
|
|
end
|
|
|
|
if ges.direction == "north" then
|
|
|
|
|
|
|
|
powerd:setIntensity(powerd.flIntensity + delta_int)
|
|
|
|
|
|
|
|
elseif ges.direction == "south" then
|
|
|
|
|
|
|
|
powerd:setIntensity(powerd.flIntensity - delta_int)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function ReaderFrontLight:onSwipe(arg, ges)
|
|
|
|
|
|
|
|
if ges.direction == "north" or ges.direction == "south" then
|
|
|
|
|
|
|
|
return self:onShowIntensity()
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function ReaderFrontLight:onPanRelease(arg, ges)
|
|
|
|
|
|
|
|
return self:onShowIntensity()
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function ReaderFrontLight:addToMainMenu(tab_item_table)
|
|
|
|
function ReaderFrontLight:addToMainMenu(tab_item_table)
|
|
|
|
-- insert fldial command to main reader menu
|
|
|
|
-- insert fldial command to main reader menu
|
|
|
|