averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-18 12:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

ReaderMenu/FileManagerMenu: deduplicate Exit menu code (#8459)

Browse Source
This commit is contained in:
zwim
2021-11-21 19:01:43 +01:00
committed by GitHub
parent 1d92ee19fb
commit 8ef426d79f
4 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/apps/filemanager/filemanagermenu.lua
View File

@@ -763,30 +763,9 @@ Tap a book in the search results to open it.]]),
for id, common_setting in pairs(dofile("frontend/ui/elements/common_info_menu_table.lua")) do
self.menu_items[id] = common_setting
end
self.menu_items.exit_menu = {
text = _("Exit"),
hold_callback = function()
self:exitOrRestart()
end,
}
self.menu_items.exit = {
text = _("Exit"),
callback = function()
self:exitOrRestart()
end,
}
self.menu_items.restart_koreader = {
text = _("Restart KOReader"),
callback = function()
self:exitOrRestart(function()
UIManager:restartKOReader()
end)
end,
}
if not Device:canRestart() then
self.menu_items.exit_menu = self.menu_items.exit
self.menu_items.exit = nil
self.menu_items.restart_koreader = nil
-- insert common exit for filemanager
for id, common_setting in pairs(dofile("frontend/ui/elements/common_exit_menu_table.lua")) do
self.menu_items[id] = common_setting
end
if not Device:isTouchDevice() then
-- add a shortcut on non touch-device

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

@@ -251,29 +251,9 @@ function ReaderMenu:setUpdateItemTable()
for id, common_setting in pairs(dofile("frontend/ui/elements/common_info_menu_table.lua")) do
self.menu_items[id] = common_setting
end
self.menu_items.exit_menu = {
text = _("Exit"),
hold_callback = function()
self:exitOrRestart()
end,
}
self.menu_items.exit = {
text = _("Exit"),
callback = function()
self:exitOrRestart()
end,
}
self.menu_items.restart_koreader = {
text = _("Restart KOReader"),
callback = function()
self:exitOrRestart(function() UIManager:restartKOReader() end)
end,
}
if not Device:canRestart() then
self.menu_items.exit_menu = self.menu_items.exit
self.menu_items.exit = nil
self.menu_items.restart_koreader = nil
-- insert common exit for reader
for id, common_setting in pairs(dofile("frontend/ui/elements/common_exit_menu_table.lua")) do
self.menu_items[id] = common_setting
end
self.menu_items.open_previous_document = {

56
frontend/ui/elements/common_exit_menu_table.lua Normal file
View File

@@ -0,0 +1,56 @@
local Device = require("device")
local Event = require("ui/event")
local UIManager = require("ui/uimanager")
local _ = require("gettext")
local exit_settings = {}
exit_settings.exit_menu = {
text = _("Exit"),
-- submenu entries will be appended by xyz_menu_order_lua
}
exit_settings.exit = {
text = _("Exit"),
callback = function()
UIManager:broadcastEvent(Event:new("Exit"))
end,
}
exit_settings.restart_koreader = {
text = _("Restart KOReader"),
callback = function()
UIManager:broadcastEvent(Event:new("Restart"))
end,
}
if not Device:canRestart() then
exit_settings.exit_menu = exit_settings.exit
exit_settings.exit = nil
exit_settings.restart_koreader = nil
end
if Device:canSuspend() then
exit_settings.sleep = {
text = _("Sleep"),
callback = function()
UIManager:suspend()
end,
}
end
if Device:canReboot() then
exit_settings.reboot = {
text = _("Reboot the device"),
keep_menu_open = true,
callback = function()
UIManager:broadcastEvent(Event:new("Reboot"))
end
}
end
if Device:canPowerOff() then
exit_settings.poweroff = {
text = _("Power off"),
keep_menu_open = true,
callback = function()
UIManager:broadcastEvent(Event:new("PowerOff"))
end
}
end
return exit_settings

27
frontend/ui/elements/common_info_menu_table.lua
View File

@@ -77,31 +77,4 @@ common_info.report_bug = {
end
}
if Device:canSuspend() then
common_info.sleep = {
text = _("Sleep"),
callback = function()
UIManager:suspend()
end,
}
end
if Device:canReboot() then
common_info.reboot = {
text = _("Reboot the device"),
keep_menu_open = true,
callback = function()
UIManager:broadcastEvent(Event:new("Reboot"))
end
}
end
if Device:canPowerOff() then
common_info.poweroff = {
text = _("Power off"),
keep_menu_open = true,
callback = function()
UIManager:broadcastEvent(Event:new("PowerOff"))
end
}
end
return common_info