mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into rotate
Conflicts: frontend/ui/reader/readerconfig.lua
This commit is contained in:
@@ -77,26 +77,14 @@ function ReaderConfig:initGesListener()
|
||||
end
|
||||
|
||||
function ReaderConfig:onShowConfigMenu()
|
||||
local config_dialog = ConfigDialog:new{
|
||||
self.config_dialog = ConfigDialog:new{
|
||||
dimen = self.dimen:copy(),
|
||||
ui = self.ui,
|
||||
configurable = self.configurable,
|
||||
config_options = self.options,
|
||||
}
|
||||
|
||||
function config_dialog:onConfigChoice(option_name, option_value, event)
|
||||
self.configurable[option_name] = option_value
|
||||
if event then
|
||||
self.ui:handleEvent(Event:new(event, option_value))
|
||||
end
|
||||
end
|
||||
|
||||
config_dialog.close_callback = function ()
|
||||
UIManager:close(config_dialog)
|
||||
end
|
||||
self.config_dialog = config_dialog
|
||||
|
||||
UIManager:show(config_dialog)
|
||||
UIManager:show(self.config_dialog)
|
||||
|
||||
return true
|
||||
end
|
||||
@@ -118,6 +106,10 @@ function ReaderConfig:onSetDimensions(dimen)
|
||||
end
|
||||
end
|
||||
|
||||
function ReaderConfig:onCloseConfig()
|
||||
self.config_dialog:closeDialog()
|
||||
end
|
||||
|
||||
function ReaderConfig:onReadSettings(config)
|
||||
self.configurable:loadSettings(config, self.options.prefix..'_')
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user