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 "Follow Link" in hold/highlight dialog (#3190)

Browse Source 
* This way you can disable "tap to follow links" on single tap yet still follow links.
* Change menu as well as per @poire-z's suggestion.
This commit is contained in:
Frans de Jonge
2017-09-09 18:30:00 +02:00
committed by GitHub
parent 71553a5190
commit f439ca0e8d
4 changed files with 128 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
frontend/apps/reader/modules/readerhighlight.lua
View File

@@ -3,6 +3,7 @@ local ConfirmBox = require("ui/widget/confirmbox")
local Device = require("device")
local Event = require("ui/event")
local InputContainer = require("ui/widget/container/inputcontainer")
local ReaderLink = require("apps/reader/modules/readerlink")
local UIManager = require("ui/uimanager")
local logger = require("logger")
local _ = require("gettext")
@@ -250,6 +251,14 @@ function ReaderHighlight:onHold(arg, ges)
if ok and word then
logger.dbg("selected word:", word)
self.selected_word = word
ReaderLink.ui = self.ui
ReaderLink.view = self.view
local link = ReaderLink:getLinkFromGes(ges)
self.selected_link = nil
if link then
logger.dbg("link:", link)
self.selected_link = link
end
if self.ui.document.info.has_pages then
local boxes = {}
table.insert(boxes, self.selected_word.sbox)
@@ -296,17 +305,17 @@ function ReaderHighlight:onHoldPan(_, ges)
UIManager:setDirty(self.dialog, "ui")
end
function ReaderHighlight:lookup(selected_word)
function ReaderHighlight:lookup(selected_word, selected_link)
-- if we extracted text directly
if selected_word.word then
local word_box = self.view:pageToScreenTransform(self.hold_pos.page, selected_word.sbox)
self.ui:handleEvent(Event:new("LookupWord", selected_word.word, word_box, self))
self.ui:handleEvent(Event:new("LookupWord", selected_word.word, word_box, self, selected_link))
-- or we will do OCR
elseif selected_word.sbox and self.hold_pos then
local word = self.ui.document:getOCRWord(self.hold_pos.page, selected_word)
logger.dbg("OCRed word:", word)
local word_box = self.view:pageToScreenTransform(self.hold_pos.page, selected_word.sbox)
self.ui:handleEvent(Event:new("LookupWord", word, word_box, self))
self.ui:handleEvent(Event:new("LookupWord", word, word_box, self, selected_link))
end
end
@@ -323,7 +332,7 @@ end
function ReaderHighlight:onHoldRelease()
if self.selected_word then
self:lookup(self.selected_word)
self:lookup(self.selected_word, self.selected_link)
self.selected_word = nil
elseif self.selected_text then
logger.dbg("show highlight dialog")
@@ -348,13 +357,8 @@ function ReaderHighlight:onHoldRelease()
},
{
{
text = _("Wikipedia"),
callback = function()
UIManager:scheduleIn(0.1, function()
self:lookupWikipedia()
self:onClose()
end)
end,
text = "_",
enabled = false,
},
{
text = _("Translate"),
@@ -367,10 +371,12 @@ function ReaderHighlight:onHoldRelease()
},
{
{
text = _("Search"),
text = _("Wikipedia"),
callback = function()
self:onHighlightSearch()
UIManager:close(self.highlight_dialog)
UIManager:scheduleIn(0.1, function()
self:lookupWikipedia()
self:onClose()
end)
end,
},
{
@@ -381,6 +387,23 @@ function ReaderHighlight:onHoldRelease()
end,
},
},
{
{
text = _("Follow Link"),
enabled = self.selected_link ~= nil,
callback = function()
ReaderLink:onGotoLink(self.selected_link)
UIManager:close(self.highlight_dialog)
end,
},
{
text = _("Search"),
callback = function()
self:onHighlightSearch()
UIManager:close(self.highlight_dialog)
end,
},
},
},
tap_close_callback = function() self:handleEvent(Event:new("Tap")) end,
}