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

[chore, UX] Migrate Screen menu to MenuSorter & put Screensaver under Screen (#4675)

Browse Source 
Doing more of this is the general purpose of MenuSorter, after all.

This is making some space for a new `Taps and gestures` menu, see <https://github.com/koreader/koreader/pull/4655#issuecomment-466808273>.
This commit is contained in:
Frans de Jonge
2019-02-28 18:32:11 +01:00
committed by GitHub
parent cd3ca88316
commit a1f7f25eaf
3 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/ui/elements/common_settings_menu_table.lua
View File

@@ -123,21 +123,18 @@ NetworkMgr:getMenuTable(common_settings)
common_settings.screen = {
text = _("Screen"),
sub_item_table = {
require("ui/elements/screen_dpi_menu_table"),
require("ui/elements/screen_eink_opt_menu_table"),
require("ui/elements/menu_activate"),
require("ui/elements/screen_disable_double_tap_table"),
},
}
common_settings.screen_dpi = require("ui/elements/screen_dpi_menu_table")
common_settings.screen_eink_opt = require("ui/elements/screen_eink_opt_menu_table")
common_settings.menu_activate = require("ui/elements/menu_activate")
common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table")
if Device:canToggleGSensor() then
table.insert(common_settings.screen.sub_item_table, require("ui/elements/screen_toggle_gsensor"))
common_settings.screen_toggle_gsensor = require("ui/elements/screen_toggle_gsensor")
end
if Screen.isColorScreen() then
table.insert(common_settings.screen.sub_item_table, 3, require("ui/elements/screen_color_menu_table"))
common_settings.screen.sub_item_table[3].separator = true
else
common_settings.screen.sub_item_table[2].separator = true
common_settings.color_rendering = require("ui/elements/screen_color_menu_table")
end
if Device:isAndroid() then
@@ -146,21 +143,19 @@ if Device:isAndroid() then
if not isAndroid then return end
-- keep screen on
table.insert(common_settings.screen.sub_item_table,
{
text = _("Keep screen on"),
checked_func = function() return G_reader_settings:isTrue("enable_android_wakelock") end,
callback = function() require("ui/elements/screen_android"):toggleWakelock() end,
})
common_settings.keep_screen_on = {
text = _("Keep screen on"),
checked_func = function() return G_reader_settings:isTrue("enable_android_wakelock") end,
callback = function() require("ui/elements/screen_android"):toggleWakelock() end,
}
-- fullscreen
if Device.firmware_rev <= 16 then
table.insert(common_settings.screen.sub_item_table,
{
text = _("Fullscreen"),
checked_func = function() return android.isFullscreen() end,
callback = function() require("ui/elements/screen_android"):toggleFullscreen() end,
})
common_settings.fullscreen = {
text = _("Fullscreen"),
checked_func = function() return android.isFullscreen() end,
callback = function() require("ui/elements/screen_android"):toggleFullscreen() end,
}
end
end