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

[UX] Add exit menu (#3167)

Browse Source 
* fixes #2898 (prevents accidentally triggering reboot or poweroff)
  Add ConfirmBox before reboot/power off
* increases clarity by preventing second page
* add "sleep" menu entry
* Add exit menu hold callback
This commit is contained in:
Frans de Jonge
2017-09-03 15:40:50 +02:00
committed by GitHub
parent c24d75f18c
commit 177485f84f
6 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,6 +266,12 @@ function FileManagerMenu:setUpdateItemTable()
for id, common_setting in pairs(require("ui/elements/common_info_menu_table")) 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()

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

@@ -184,13 +184,18 @@ function ReaderMenu:setUpdateItemTable()
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()

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

@@ -1,3 +1,4 @@
local ConfirmBox = require("ui/widget/confirmbox")
local Device = require("device")
local InfoMessage = require("ui/widget/infomessage")
local UIManager = require("ui/uimanager")
@@ -52,17 +53,38 @@ common_info.report_bug = {
})
end
}
if Device:isKindle() or Device:isKobo() then
common_info.sleep = {
text = _("Sleep"),
callback = function()
UIManager:suspend()
end,
}
end
if Device:isKobo() then
common_info.reboot = {
text = _("Reboot the device"),
callback = function()
UIManager:nextTick(UIManager.reboot_action)
UIManager:show(ConfirmBox:new{
text = _("Are you sure you want to reboot the device?"),
ok_text = _("Reboot"),
ok_callback = function()
UIManager:nextTick(UIManager.reboot_action)
end,
})
end
}
common_info.poweroff = {
text = _("Power off"),
callback = function()
UIManager:nextTick(UIManager.poweroff_action)
UIManager:show(ConfirmBox:new{
text = _("Are you sure you want to power off the device?"),
ok_text = _("Power off"),
ok_callback = function()
UIManager:nextTick(UIManager.poweroff_action)
end,
})
end
}
end

18
frontend/ui/elements/filemanager_menu_order.lua
View File

@@ -68,17 +68,14 @@ local order = {
"history",
"open_last_document",
"----------------------------",
"system_statistics",
"----------------------------",
"ota_update", --[[ if Device:isKindle() or Device:isKobo() or
Device:isPocketBook() or Device:isAndroid() ]]--
"version",
"help",
"system_statistics",
"----------------------------",
"restart_koreader",
"poweroff", -- if Device:isKobo()
"reboot", -- if Device:isKobo()
"----------------------------",
"exit",
"exit_menu",
},
help = {
"quickstart_guide",
@@ -87,6 +84,15 @@ local order = {
"----------------------------",
"about",
},
exit_menu = {
"restart_koreader",
"----------------------------",
"sleep", -- if Device:isKindle() or Device:isKobo()
"poweroff", -- if Device:isKobo()
"reboot", -- if Device:isKobo()
"----------------------------",
"exit",
}
}
return order

18
frontend/ui/elements/reader_menu_order.lua
View File

@@ -85,17 +85,14 @@ local order = {
"book_status",
"book_info",
"----------------------------",
"system_statistics",
"----------------------------",
"ota_update", --[[ if Device:isKindle() or Device:isKobo() or
Device:isPocketBook() or Device:isAndroid() ]]--
"version",
"help",
"system_statistics",
"----------------------------",
"restart_koreader",
"poweroff", -- if Device:isKobo()
"reboot", -- if Device:isKobo()
"----------------------------",
"exit",
"exit_menu",
},
help = {
"quickstart_guide",
@@ -104,6 +101,15 @@ local order = {
"----------------------------",
"about",
},
exit_menu = {
"restart_koreader",
"----------------------------",
"sleep", -- if Device:isKindle() or Device:isKobo()
"poweroff", -- if Device:isKobo()
"reboot", -- if Device:isKobo()
"----------------------------",
"exit",
}
}
return order

1
frontend/ui/menusorter.lua
View File

@@ -121,6 +121,7 @@ function MenuSorter:sort(item_table, order)
changed = true
local sub_menu_content = menu_table[sub_menu]
sub_menu_position.text = sub_menu_content.text
sub_menu_position.hold_callback = sub_menu_content.hold_callback
sub_menu_position.sub_item_table = sub_menu_content
-- remove reference from top level output
menu_table[sub_menu] = nil