renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move screenshot settings to submenu of Screenshot entry in readermenu

Browse Source 
And also fix a touchmenu bug that prevent some menu entries
(always at the bottom of the menu) from showing submenus. The reason is
that the onTapSelect method of TouchMenuItem doesn't return true, so that
the tap gesture will propagate to the parent widget and be captured by
touchmenu itself. But at this time the dimen of touchmenu is changed to
the submenu of the tapped menuitem. If the submenu is short enough the
tap will be outside of touchmenu which will cause a TapCloseAllMenus
event and the submenu will never be shown.
This commit is contained in:
chrox
2014-10-30 15:51:31 +08:00
parent f48c073357
commit dfcd67c5bf
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
frontend/apps/reader/modules/readermenu.lua
View File

@@ -46,7 +46,6 @@ function ReaderMenu:init()
local FileManager = require("apps/filemanager/filemanager")
FileManager:restoreScreenMode()
if not FileManager.is_running then
UIManager:quit()
FileManager:showFiles()
end
end,
@@ -91,8 +90,6 @@ function ReaderMenu:setUpdateItemTable()
end
-- setting tab
-- FIXME: it's curious that if this 'Screen' menu is placed after the Language
-- menu submenu in 'Screen' won't be shown. Probably a bug in the touchmenu module.
table.insert(self.tab_item_table.setting, {
text = _("Screen settings"),
sub_item_table = {
@@ -143,27 +140,33 @@ function ReaderMenu:setUpdateItemTable()
end
})
--typeset tab
if KOBO_SCREEN_SAVER_LAST_BOOK then
local exclude = self.ui.doc_settings:readSetting("exclude_screensaver") or false
local excluded = function()
return self.ui.doc_settings:readSetting("exclude_screensaver") or false
end
local proportional = function()
return self.ui.doc_settings:readSetting("proportional_screensaver") or false
end
table.insert(self.tab_item_table.typeset, {
text = _("Use this book's cover as screensaver"),
checked_func = function() return not (self.ui.doc_settings:readSetting("exclude_screensaver") or false) end,
callback = function()
local exclude = self.ui.doc_settings:readSetting("exclude_screensaver") or false
self.ui.doc_settings:saveSetting("exclude_screensaver", not exclude)
self.ui:saveSettings()
end
})
local proportional = self.ui.doc_settings:readSetting("proportional_screensaver") or false
table.insert(self.tab_item_table.typeset, {
text = _("Display proportional cover image in screensaver"),
checked_func = function() return (self.ui.doc_settings:readSetting("proportional_screensaver") or false) end,
callback = function()
local proportional = self.ui.doc_settings:readSetting("proportional_screensaver") or false
self.ui.doc_settings:saveSetting("proportional_screensaver", not proportional)
self.ui:saveSettings()
end
text = "Screensaver",
sub_item_table = {
{
text = _("Use this book's cover as screensaver"),
checked_func = function() return not excluded() end,
callback = function()
self.ui.doc_settings:saveSetting("exclude_screensaver", not excluded())
self.ui:saveSettings()
end
},
{
text = _("Display proportional cover image in screensaver"),
checked_func = function() return proportional() end,
callback = function()
self.ui.doc_settings:saveSetting("proportional_screensaver", not proportional())
self.ui:saveSettings()
end
}
}
})
end
end