mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
[Non-Touch] Don't add touch-related menu items (#8608)
They were ending up orphaned as "New:" in the top menu first tab.
This commit is contained in:
@@ -238,17 +238,20 @@ common_settings.screen_rotation = require("ui/elements/screen_rotation_menu_tabl
|
||||
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.screen_notification = require("ui/elements/screen_notification_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")
|
||||
common_settings.ignore_hold_corners = {
|
||||
text = _("Ignore long-press on corners"),
|
||||
checked_func = function()
|
||||
return G_reader_settings:isTrue("ignore_hold_corners")
|
||||
end,
|
||||
callback = function()
|
||||
UIManager:broadcastEvent(Event:new("IgnoreHoldCorners"))
|
||||
end,
|
||||
}
|
||||
|
||||
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.ignore_hold_corners = {
|
||||
text = _("Ignore long-press on corners"),
|
||||
checked_func = function()
|
||||
return G_reader_settings:isTrue("ignore_hold_corners")
|
||||
end,
|
||||
callback = function()
|
||||
UIManager:broadcastEvent(Event:new("IgnoreHoldCorners"))
|
||||
end,
|
||||
}
|
||||
end
|
||||
|
||||
-- NOTE: Allow disabling color if it's mistakenly enabled on a Grayscale screen (after a settings import?)
|
||||
if Screen:isColorEnabled() or Screen:isColorScreen() then
|
||||
|
||||
@@ -139,4 +139,13 @@ if Device:hasKeys() then
|
||||
})
|
||||
end
|
||||
|
||||
if not Device:isTouchDevice() then
|
||||
if Device:hasKeys() then
|
||||
-- We just need the last item added above.
|
||||
PageTurns = PageTurns.sub_item_table[#PageTurns.sub_item_table]
|
||||
else
|
||||
PageTurns = {} -- no menu item
|
||||
end
|
||||
end
|
||||
|
||||
return PageTurns
|
||||
|
||||
@@ -98,6 +98,8 @@ local order = {
|
||||
"back_to_exit",
|
||||
"back_in_filemanager",
|
||||
"back_in_reader",
|
||||
"----------------------------",
|
||||
"page_turns_non_touch",
|
||||
"android_volume_keys",
|
||||
"android_camera_key",
|
||||
"android_haptic_feedback",
|
||||
|
||||
Reference in New Issue
Block a user