mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +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.
79 lines
2.3 KiB
Lua
79 lines
2.3 KiB
Lua
local BD = require("ui/bidi")
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local ConfirmBox = require("ui/widget/confirmbox")
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
local OPDSBrowser = require("opdsbrowser")
|
|
local UIManager = require("ui/uimanager")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
local logger = require("logger")
|
|
local _ = require("gettext")
|
|
local Screen = require("device").screen
|
|
local T = require("ffi/util").template
|
|
|
|
local OPDSCatalog = WidgetContainer:extend{
|
|
title = _("OPDS Catalog"),
|
|
}
|
|
|
|
function OPDSCatalog:init()
|
|
local opds_browser = OPDSBrowser:new{
|
|
title = self.title,
|
|
show_parent = self,
|
|
is_popout = false,
|
|
is_borderless = true,
|
|
has_close_button = true,
|
|
close_callback = function() return self:onClose() end,
|
|
file_downloaded_callback = function(downloaded_file)
|
|
UIManager:show(ConfirmBox:new{
|
|
text = T(_("File saved to:\n%1\nWould you like to read the downloaded book now?"),
|
|
BD.filepath(downloaded_file)),
|
|
ok_text = _("Read now"),
|
|
cancel_text = _("Read later"),
|
|
ok_callback = function()
|
|
local Event = require("ui/event")
|
|
UIManager:broadcastEvent(Event:new("SetupShowReader"))
|
|
|
|
self:onClose()
|
|
|
|
local ReaderUI = require("apps/reader/readerui")
|
|
ReaderUI:showReader(downloaded_file)
|
|
end
|
|
})
|
|
end,
|
|
}
|
|
|
|
self[1] = FrameContainer:new{
|
|
padding = 0,
|
|
bordersize = 0,
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
opds_browser,
|
|
}
|
|
end
|
|
|
|
function OPDSCatalog:onShow()
|
|
UIManager:setDirty(self, function()
|
|
return "ui", self[1].dimen
|
|
end)
|
|
end
|
|
|
|
function OPDSCatalog:onCloseWidget()
|
|
UIManager:setDirty(nil, function()
|
|
return "ui", self[1].dimen
|
|
end)
|
|
end
|
|
|
|
function OPDSCatalog:showCatalog()
|
|
logger.dbg("show OPDS catalog")
|
|
UIManager:show(OPDSCatalog:new{
|
|
dimen = Screen:getSize(),
|
|
covers_fullscreen = true, -- hint for UIManager:_repaint()
|
|
})
|
|
end
|
|
|
|
function OPDSCatalog:onClose()
|
|
logger.dbg("close OPDS catalog")
|
|
UIManager:close(self)
|
|
return true
|
|
end
|
|
|
|
return OPDSCatalog
|