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:
@@ -356,6 +356,12 @@ function ReaderHighlight:addToMainMenu(menu_items)
|
||||
}
|
||||
end
|
||||
menu_items.translation_settings = Translator:genSettingsMenu()
|
||||
|
||||
if not Device:isTouchDevice() then
|
||||
-- Menu items below aren't needed.
|
||||
return
|
||||
end
|
||||
|
||||
menu_items.long_press = {
|
||||
text = _("Long-press on text"),
|
||||
sub_item_table = {
|
||||
|
||||
@@ -151,6 +151,25 @@ end
|
||||
|
||||
function ReaderLink:addToMainMenu(menu_items)
|
||||
-- insert table to main reader menu
|
||||
menu_items.go_to_previous_location = {
|
||||
text = _("Go back to previous location"),
|
||||
enabled_func = function() return #self.location_stack > 0 end,
|
||||
callback = function() self:onGoBackLink() end,
|
||||
hold_callback = function(touchmenu_instance)
|
||||
UIManager:show(ConfirmBox:new{
|
||||
text = _("Clear location history?"),
|
||||
ok_text = _("Clear"),
|
||||
ok_callback = function()
|
||||
self:onClearLocationStack()
|
||||
touchmenu_instance:closeMenu()
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
if not Device:isTouchDevice() then
|
||||
-- Menu items below aren't needed.
|
||||
return
|
||||
end
|
||||
menu_items.follow_links = {
|
||||
text = _("Links"),
|
||||
sub_item_table = {
|
||||
@@ -342,21 +361,6 @@ This allows you to specify how much smaller or larger it should be relative to t
|
||||
separator = true,
|
||||
})
|
||||
end
|
||||
menu_items.go_to_previous_location = {
|
||||
text = _("Go back to previous location"),
|
||||
enabled_func = function() return #self.location_stack > 0 end,
|
||||
callback = function() self:onGoBackLink() end,
|
||||
hold_callback = function(touchmenu_instance)
|
||||
UIManager:show(ConfirmBox:new{
|
||||
text = _("Clear location history?"),
|
||||
ok_text = _("Clear"),
|
||||
ok_callback = function()
|
||||
self:onClearLocationStack()
|
||||
touchmenu_instance:closeMenu()
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
end
|
||||
|
||||
--- Check if a xpointer to <a> node really points to itself
|
||||
|
||||
@@ -200,7 +200,13 @@ function ReaderMenu:setUpdateItemTable()
|
||||
for id, common_setting in pairs(dofile("frontend/ui/elements/common_settings_menu_table.lua")) do
|
||||
self.menu_items[id] = common_setting
|
||||
end
|
||||
self.menu_items.page_turns = require("ui/elements/page_turns")
|
||||
|
||||
if Device:isTouchDevice() then
|
||||
self.menu_items.page_turns = require("ui/elements/page_turns")
|
||||
else
|
||||
-- Placed elsewhere than in Taps and gestures, with only a subset of menu items.
|
||||
self.menu_items.page_turns_non_touch = require("ui/elements/page_turns")
|
||||
end
|
||||
-- insert DjVu render mode submenu just before the last entry (show advanced)
|
||||
-- this is a bit of a hack
|
||||
if self.ui.document.is_djvu then
|
||||
|
||||
Reference in New Issue
Block a user