mirror of
https://github.com/koreader/koreader
synced 2024-11-18 03:25:46 +00:00
fadee1f5dc
Basically: * Use `extend` for class definitions * Use `new` for object instantiations That includes some minor code cleanups along the way: * Updated `Widget`'s docs to make the semantics clearer. * Removed `should_restrict_JIT` (it's been dead code since https://github.com/koreader/android-luajit-launcher/pull/283) * Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass). * Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events. * Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier. * Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references. * ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak). * Terminal: Make sure the shell is killed on plugin teardown. * InputText: Fix Home/End/Del physical keys to behave sensibly. * InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...). * OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of. * ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed! * Kobo: Minor code cleanups.
174 lines
5.4 KiB
Lua
174 lines
5.4 KiB
Lua
--[[--
|
|
Widget that shows a message and cancel/choice1/choice2 buttons
|
|
|
|
Example:
|
|
|
|
UIManager:show(MultiConfirmBox:new{
|
|
text = T( _("Set %1 as fallback font?"), face),
|
|
choice1_text = _("Default"),
|
|
choice1_callback = function()
|
|
-- set as default font
|
|
end,
|
|
choice2_text = _("Fallback"),
|
|
choice2_callback = function()
|
|
-- set as fallback font
|
|
end,
|
|
})
|
|
]]
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local ButtonTable = require("ui/widget/buttontable")
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
local Device = require("device")
|
|
local Font = require("ui/font")
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local HorizontalGroup = require("ui/widget/horizontalgroup")
|
|
local HorizontalSpan = require("ui/widget/horizontalspan")
|
|
local IconWidget = require("ui/widget/iconwidget")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local MovableContainer = require("ui/widget/container/movablecontainer")
|
|
local Size = require("ui/size")
|
|
local TextBoxWidget = require("ui/widget/textboxwidget")
|
|
local UIManager = require("ui/uimanager")
|
|
local VerticalGroup = require("ui/widget/verticalgroup")
|
|
local VerticalSpan = require("ui/widget/verticalspan")
|
|
local _ = require("gettext")
|
|
local Screen = require("device").screen
|
|
|
|
local MultiConfirmBox = InputContainer:extend{
|
|
modal = true,
|
|
text = _("no text"),
|
|
face = Font:getFace("infofont"),
|
|
choice1_text = _("Choice 1"),
|
|
choice1_text_func = nil,
|
|
choice2_text = _("Choice 2"),
|
|
choice2_text_func = nil,
|
|
cancel_text = _("Cancel"),
|
|
choice1_callback = function() end,
|
|
choice2_callback = function() end,
|
|
cancel_callback = function() end,
|
|
choice1_enabled = true,
|
|
choice2_enabled = true,
|
|
margin = Size.margin.default,
|
|
padding = Size.padding.default,
|
|
dismissable = true, -- set to false if any button callback is required
|
|
}
|
|
|
|
function MultiConfirmBox:init()
|
|
if self.dismissable then
|
|
if Device:isTouchDevice() then
|
|
self.ges_events.TapClose = {
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = Geom:new{
|
|
x = 0, y = 0,
|
|
w = Screen:getWidth(),
|
|
h = Screen:getHeight(),
|
|
}
|
|
}
|
|
}
|
|
end
|
|
if Device:hasKeys() then
|
|
self.key_events.Close = { {Device.input.group.Back}, doc = "cancel" }
|
|
end
|
|
end
|
|
local content = HorizontalGroup:new{
|
|
align = "center",
|
|
IconWidget:new{
|
|
icon = "notice-question",
|
|
},
|
|
HorizontalSpan:new{ width = Size.span.horizontal_default },
|
|
TextBoxWidget:new{
|
|
text = self.text,
|
|
face = self.face,
|
|
width = math.floor(math.min(Screen:getWidth(), Screen:getHeight()) * 2/3),
|
|
}
|
|
}
|
|
|
|
local button_table = ButtonTable:new{
|
|
width = content:getSize().w,
|
|
button_font_face = "cfont",
|
|
button_font_size = 20,
|
|
buttons = {
|
|
{
|
|
{
|
|
text = self.cancel_text,
|
|
callback = function()
|
|
self.cancel_callback()
|
|
UIManager:close(self)
|
|
end,
|
|
},
|
|
{
|
|
text = self.choice1_text,
|
|
text_func = self.choice1_text_func,
|
|
enabled = self.choice1_enabled,
|
|
callback = function()
|
|
self.choice1_callback()
|
|
UIManager:close(self)
|
|
end,
|
|
},
|
|
{
|
|
text = self.choice2_text,
|
|
text_func = self.choice2_text_func,
|
|
enabled = self.choice2_enabled,
|
|
callback = function()
|
|
self.choice2_callback()
|
|
UIManager:close(self)
|
|
end,
|
|
},
|
|
},
|
|
},
|
|
zero_sep = true,
|
|
show_parent = self,
|
|
}
|
|
|
|
self[1] = CenterContainer:new{
|
|
dimen = Screen:getSize(),
|
|
MovableContainer:new{
|
|
FrameContainer:new{
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
margin = self.margin,
|
|
radius = Size.radius.window,
|
|
padding = self.padding,
|
|
padding_bottom = 0, -- no padding below buttontable
|
|
VerticalGroup:new{
|
|
align = "left",
|
|
content,
|
|
-- Add same vertical space after than before content
|
|
VerticalSpan:new{ width = self.margin + self.padding },
|
|
button_table,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
end
|
|
|
|
function MultiConfirmBox:onShow()
|
|
UIManager:setDirty(self, function()
|
|
return "ui", self[1][1].dimen
|
|
end)
|
|
end
|
|
|
|
function MultiConfirmBox:onCloseWidget()
|
|
UIManager:setDirty(nil, function()
|
|
return "ui", self[1][1].dimen
|
|
end)
|
|
end
|
|
|
|
function MultiConfirmBox:onClose()
|
|
UIManager:close(self)
|
|
return true
|
|
end
|
|
|
|
function MultiConfirmBox:onTapClose(arg, ges)
|
|
if ges.pos:notIntersectWith(self[1][1].dimen) then
|
|
self:onClose()
|
|
return true
|
|
end
|
|
return false
|
|
end
|
|
|
|
return MultiConfirmBox
|