|
|
|
local ConfigDialog = require("ui/widget/configdialog")
|
|
|
|
local Device = require("device")
|
|
|
|
local Event = require("ui/event")
|
|
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
|
|
local UIManager = require("ui/uimanager")
|
|
|
|
local CreOptions = require("ui/data/creoptions")
|
|
|
|
local KoptOptions = require("ui/data/koptoptions")
|
|
|
|
local _ = require("gettext")
|
|
|
|
|
Clarify our OOP semantics across the codebase (#9586)
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.
2 years ago
|
|
|
local ReaderConfig = InputContainer:extend{
|
|
|
|
last_panel_index = 1,
|
|
|
|
}
|
|
|
|
|
|
|
|
function ReaderConfig:init()
|
|
|
|
if self.document.koptinterface ~= nil then
|
|
|
|
self.options = KoptOptions
|
|
|
|
else
|
|
|
|
self.options = CreOptions
|
|
|
|
end
|
|
|
|
self.configurable:loadDefaults(self.options)
|
|
|
|
|
|
|
|
self:registerKeyEvents()
|
|
|
|
self:initGesListener()
|
|
|
|
if G_reader_settings:has("activate_menu") then
|
|
|
|
self.activation_menu = G_reader_settings:readSetting("activate_menu")
|
|
|
|
else
|
|
|
|
self.activation_menu = "swipe_tap"
|
|
|
|
end
|
|
|
|
|
|
|
|
-- delegate gesture listener to ReaderUI, NOP our own
|
|
|
|
self.ges_events = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onGesture() end
|
|
|
|
|
|
|
|
function ReaderConfig:registerKeyEvents()
|
|
|
|
if Device:hasKeys() then
|
|
|
|
self.key_events.ShowConfigMenu = { { { "Press", "AA" } } }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
ReaderConfig.onPhysicalKeyboardConnected = ReaderConfig.registerKeyEvents
|
|
|
|
|
|
|
|
function ReaderConfig:initGesListener()
|
|
|
|
if not Device:isTouchDevice() then return end
|
|
|
|
|
|
|
|
local DTAP_ZONE_CONFIG = G_defaults:readSetting("DTAP_ZONE_CONFIG")
|
|
|
|
local DTAP_ZONE_CONFIG_EXT = G_defaults:readSetting("DTAP_ZONE_CONFIG_EXT")
|
|
|
|
self.ui:registerTouchZones({
|
|
|
|
{
|
|
|
|
id = "readerconfigmenu_tap",
|
|
|
|
ges = "tap",
|
|
|
|
screen_zone = {
|
|
|
|
ratio_x = DTAP_ZONE_CONFIG.x, ratio_y = DTAP_ZONE_CONFIG.y,
|
|
|
|
ratio_w = DTAP_ZONE_CONFIG.w, ratio_h = DTAP_ZONE_CONFIG.h,
|
|
|
|
},
|
|
|
|
overrides = {
|
|
|
|
"tap_forward",
|
|
|
|
"tap_backward",
|
|
|
|
},
|
|
|
|
handler = function() return self:onTapShowConfigMenu() end,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id = "readerconfigmenu_ext_tap",
|
|
|
|
ges = "tap",
|
|
|
|
screen_zone = {
|
|
|
|
ratio_x = DTAP_ZONE_CONFIG_EXT.x, ratio_y = DTAP_ZONE_CONFIG_EXT.y,
|
|
|
|
ratio_w = DTAP_ZONE_CONFIG_EXT.w, ratio_h = DTAP_ZONE_CONFIG_EXT.h,
|
|
|
|
},
|
|
|
|
overrides = {
|
|
|
|
"readerconfigmenu_tap",
|
|
|
|
},
|
|
|
|
handler = function() return self:onTapShowConfigMenu() end,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id = "readerconfigmenu_swipe",
|
|
|
|
ges = "swipe",
|
|
|
|
screen_zone = {
|
|
|
|
ratio_x = DTAP_ZONE_CONFIG.x, ratio_y = DTAP_ZONE_CONFIG.y,
|
|
|
|
ratio_w = DTAP_ZONE_CONFIG.w, ratio_h = DTAP_ZONE_CONFIG.h,
|
|
|
|
},
|
|
|
|
overrides = {
|
|
|
|
"rolling_swipe",
|
|
|
|
"paging_swipe",
|
|
|
|
},
|
|
|
|
handler = function(ges) return self:onSwipeShowConfigMenu(ges) end,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id = "readerconfigmenu_ext_swipe",
|
|
|
|
ges = "swipe",
|
|
|
|
screen_zone = {
|
|
|
|
ratio_x = DTAP_ZONE_CONFIG_EXT.x, ratio_y = DTAP_ZONE_CONFIG_EXT.y,
|
|
|
|
ratio_w = DTAP_ZONE_CONFIG_EXT.w, ratio_h = DTAP_ZONE_CONFIG_EXT.h,
|
|
|
|
},
|
|
|
|
overrides = {
|
|
|
|
"readerconfigmenu_swipe",
|
|
|
|
},
|
|
|
|
handler = function(ges) return self:onSwipeShowConfigMenu(ges) end,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id = "readerconfigmenu_pan",
|
|
|
|
ges = "pan",
|
|
|
|
screen_zone = {
|
|
|
|
ratio_x = DTAP_ZONE_CONFIG.x, ratio_y = DTAP_ZONE_CONFIG.y,
|
|
|
|
ratio_w = DTAP_ZONE_CONFIG.w, ratio_h = DTAP_ZONE_CONFIG.h,
|
|
|
|
},
|
|
|
|
overrides = {
|
|
|
|
"rolling_pan",
|
|
|
|
"paging_pan",
|
|
|
|
},
|
|
|
|
handler = function(ges) return self:onSwipeShowConfigMenu(ges) end,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id = "readerconfigmenu_ext_pan",
|
|
|
|
ges = "pan",
|
|
|
|
screen_zone = {
|
|
|
|
ratio_x = DTAP_ZONE_CONFIG_EXT.x, ratio_y = DTAP_ZONE_CONFIG_EXT.y,
|
|
|
|
ratio_w = DTAP_ZONE_CONFIG_EXT.w, ratio_h = DTAP_ZONE_CONFIG_EXT.h,
|
|
|
|
},
|
|
|
|
overrides = {
|
|
|
|
"readerconfigmenu_pan",
|
|
|
|
},
|
|
|
|
handler = function(ges) return self:onSwipeShowConfigMenu(ges) end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onShowConfigMenu()
|
|
|
|
self.config_dialog = ConfigDialog:new{
|
|
|
|
document = self.document,
|
|
|
|
ui = self.ui,
|
|
|
|
configurable = self.configurable,
|
|
|
|
config_options = self.options,
|
|
|
|
is_always_active = true,
|
|
|
|
covers_footer = true,
|
|
|
|
close_callback = function() self:onCloseCallback() end,
|
|
|
|
}
|
|
|
|
self.ui:handleEvent(Event:new("DisableHinting"))
|
|
|
|
-- show last used panel when opening config dialog
|
|
|
|
self.config_dialog:onShowConfigPanel(self.last_panel_index)
|
|
|
|
UIManager:show(self.config_dialog)
|
|
|
|
self.ui:handleEvent(Event:new("HandledAsSwipe")) -- cancel any pan scroll made
|
|
|
|
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onTapShowConfigMenu()
|
|
|
|
if self.activation_menu ~= "swipe" then
|
|
|
|
self:onShowConfigMenu()
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onSwipeShowConfigMenu(ges)
|
|
|
|
if self.activation_menu ~= "tap" and ges.direction == "north" then
|
|
|
|
self:onShowConfigMenu()
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-- For some reason, things are fine and dandy without any of this for rotations, but we need it for actual resizes...
|
|
|
|
function ReaderConfig:onSetDimensions(dimen)
|
|
|
|
if self.config_dialog then
|
|
|
|
-- init basically calls update & initGesListener and nothing else, which is exactly what we want.
|
|
|
|
self.config_dialog:init()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onCloseCallback()
|
|
|
|
self.last_panel_index = self.config_dialog.panel_index
|
|
|
|
self.config_dialog = nil
|
|
|
|
self.ui:handleEvent(Event:new("RestoreHinting"))
|
|
|
|
end
|
|
|
|
|
|
|
|
-- event handler for readercropping
|
|
|
|
function ReaderConfig:onCloseConfigMenu()
|
|
|
|
if self.config_dialog then
|
|
|
|
self.config_dialog:closeDialog()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onReadSettings(config)
|
|
|
|
self.configurable:loadSettings(config, self.options.prefix.."_")
|
|
|
|
local config_panel_index = config:readSetting("config_panel_index")
|
|
|
|
if config_panel_index then
|
|
|
|
config_panel_index = math.min(config_panel_index, #self.options)
|
|
|
|
end
|
|
|
|
self.last_panel_index = config_panel_index or 1
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderConfig:onSaveSettings()
|
|
|
|
self.configurable:saveSettings(self.ui.doc_settings, self.options.prefix.."_")
|
|
|
|
self.ui.doc_settings:saveSetting("config_panel_index", self.last_panel_index)
|
|
|
|
end
|
|
|
|
|
|
|
|
return ReaderConfig
|