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

MenuSearch: open upper menu when needed only (#11495)

Browse Source
This commit is contained in:
hius07
2024-02-28 07:29:33 +02:00
committed by GitHub
parent ade1daca3a
commit ec98c6334b
5 changed files with 98 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,8 +271,9 @@ common_settings.screen_eink_opt = require("ui/elements/screen_eink_opt_menu_tabl
common_settings.screen_notification = require("ui/elements/screen_notification_menu_table")
if Device:isTouchDevice() then
common_settings.menu_activate = require("ui/elements/menu_activate")
common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table")
common_settings.taps_and_gestures = {
text = _("Taps and gestures"),
}
common_settings.ignore_hold_corners = {
text = _("Ignore long-press on corners"),
checked_func = function()
@@ -282,6 +283,12 @@ if Device:isTouchDevice() then
UIManager:broadcastEvent(Event:new("IgnoreHoldCorners"))
end,
}
common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table")
common_settings.menu_activate = require("ui/elements/menu_activate")
common_settings.keyboard_layout = {
text = _("Keyboard"),
sub_item_table = require("ui/elements/menu_keyboard_layout"),
}
end
-- NOTE: Allow disabling color if it's mistakenly enabled on a Grayscale screen (after a settings import?)
@@ -368,16 +375,6 @@ Please don't change any settings unless you know what you're doing.]])
end
end
if Device:isTouchDevice() then
common_settings.keyboard_layout = {
text = _("Keyboard"),
sub_item_table = require("ui/elements/menu_keyboard_layout"),
}
common_settings.taps_and_gestures = {
text = _("Taps and gestures"),
}
end
common_settings.navigation = {
text = _("Navigation"),
}
@@ -398,7 +395,6 @@ local function genGenericMenuEntry(title, setting, value, default, radiomark)
end,
}
end
common_settings.back_to_exit = {
text_func = function()
local back_to_exit = G_reader_settings:readSetting("back_to_exit", "prompt") -- set "back_to_exit" to "prompt"
@@ -715,17 +711,12 @@ common_settings.document_end_action = {
common_settings.language = Language:getLangMenuTable()
common_settings.font_ui_fallbacks = require("ui/elements/font_ui_fallbacks")
common_settings.screenshot = {
text = _("Screenshot folder"),
callback = function()
local Screenshoter = require("ui/widget/screenshoter")
Screenshoter:chooseFolder()
end,
keep_menu_open = true,
common_settings.device = {
text = _("Device"),
}
common_settings.font_ui_fallbacks = require("ui/elements/font_ui_fallbacks")
common_settings.units = {
text = _("Units"),
sub_item_table = {
@@ -743,10 +734,11 @@ common_settings.units = {
},
}
common_settings.search_menu = {
text = _("Menu search"),
common_settings.screenshot = {
text = _("Screenshot folder"),
callback = function()
UIManager:sendEvent(Event:new("ShowMenuSearch"))
local Screenshoter = require("ui/widget/screenshoter")
Screenshoter:chooseFolder()
end,
keep_menu_open = true,
}