@ -152,23 +152,19 @@ function DictQuickLookup:init()
} ,
} ,
-- callback function when HoldReleaseText is handled as args
-- callback function when HoldReleaseText is handled as args
args = function ( text , hold_duration )
args = function ( text , hold_duration )
local lookup_target
-- do this lookup in the same domain (dict/wikipedia)
if hold_duration < TimeVal : new { sec = 3 , usec = 0 } then
local lookup_wikipedia = self.is_wiki
-- do this lookup in the same domain (dict/wikipedia)
if hold_duration >= TimeVal : new { sec = 3 , usec = 0 } then
lookup_target = self.is_wiki and " LookupWikipedia " or " LookupWord "
else
-- but allow switching domain with a long hold
-- but allow switching domain with a long hold
lookup_ target = self.is_wiki and " LookupWord " or " LookupWikipedia "
lookup_wikipedia = not lookup_wikipedia
end
end
if lookup_target == " LookupWikipedia " then
-- We don't pass self.highlight to subsequent lookup, we want the
self : resyncWikiLanguages ( )
-- first to be the only one to unhighlight selection when closed
if lookup_wikipedia then
self : lookupWikipedia ( false , text )
else
self.ui : handleEvent ( Event : new ( " LookupWord " , text ) )
end
end
self.ui : handleEvent (
-- don't pass self.highlight to subsequent lookup, we want
-- the first to be the only one to unhighlight selection
-- when closed
Event : new ( lookup_target , text )
)
end
end
} ,
} ,
-- These will be forwarded to MovableContainer after some checks
-- These will be forwarded to MovableContainer after some checks
@ -185,9 +181,9 @@ function DictQuickLookup:init()
-- And here comes the initial widget layout...
-- And here comes the initial widget layout...
if self.is_wiki then
if self.is_wiki then
-- Keep a copy of self.wiki_languages for use
-- Get a copy of ReaderWikipedia.wiki_languages, with the current result
-- by DictQuickLookup:resyncWikiLanguages( )
-- lang first (rotated, or added )
self.wiki_languages _copy = self.wiki_languages and { unpack ( self.wiki_languages ) } or nil
self.wiki_languages , self.update_wiki_languages_on_close = self.ui . wikipedia : getWikiLanguages ( self.lang )
end
end
-- Bigger window if fullpage Wikipedia article being shown,
-- Bigger window if fullpage Wikipedia article being shown,
@ -319,7 +315,7 @@ function DictQuickLookup:init()
local ConfirmBox = require ( " ui/widget/confirmbox " )
local ConfirmBox = require ( " ui/widget/confirmbox " )
-- if forced_lang was specified, it may not be in our wiki_languages,
-- if forced_lang was specified, it may not be in our wiki_languages,
-- but ReaderWikipedia will have put it in result.lang
-- but ReaderWikipedia will have put it in result.lang
local lang = self.lang or self.wiki_languages _copy [ 1 ]
local lang = self.lang or self.wiki_languages [ 1 ]
-- Find a directory to save file into
-- Find a directory to save file into
local dir
local dir
if G_reader_settings : isTrue ( " wikipedia_save_in_book_dir " ) and not self : isDocless ( ) then
if G_reader_settings : isTrue ( " wikipedia_save_in_book_dir " ) and not self : isDocless ( ) then
@ -386,7 +382,7 @@ function DictQuickLookup:init()
id = " close " ,
id = " close " ,
text = _ ( " Close " ) ,
text = _ ( " Close " ) ,
callback = function ( )
callback = function ( )
UIManager: close ( self )
self: onClose ( )
end ,
end ,
} ,
} ,
} ,
} ,
@ -473,12 +469,14 @@ function DictQuickLookup:init()
enabled = self : canSearch ( ) ,
enabled = self : canSearch ( ) ,
callback = function ( )
callback = function ( )
if self.is_wiki then
if self.is_wiki then
self : resyncWikiLanguages ( true ) -- rotate & resync them
-- We're rotating: forward this flag from the one we're closing so
UIManager : close ( self )
-- that ReaderWikipedia can give it to the one we'll be showing
self : lookupWikipedia ( )
self.window_list . rotated_update_wiki_languages_on_close = self.update_wiki_languages_on_close
self : lookupWikipedia ( false , nil , nil , self.wiki_languages [ 2 ] )
self : onClose ( true )
else
else
self.ui : handleEvent ( Event : new ( " HighlightSearch " ) )
self.ui : handleEvent ( Event : new ( " HighlightSearch " ) )
UIManager: close ( self )
self: onClose ( true ) -- don't unhighlight (or we might erase a search hit )
end
end
end ,
end ,
} ,
} ,
@ -486,7 +484,6 @@ function DictQuickLookup:init()
id = " close " ,
id = " close " ,
text = _ ( " Close " ) ,
text = _ ( " Close " ) ,
callback = function ( )
callback = function ( )
-- UIManager:close(self)
self : onClose ( )
self : onClose ( )
end ,
end ,
} ,
} ,
@ -1094,7 +1091,7 @@ function DictQuickLookup:onTap(arg, ges_ev)
return true
return true
end end
function DictQuickLookup : onClose ( ) function DictQuickLookup : onClose ( no_clear )
UIManager : close ( self )
UIManager : close ( self )
for i = # self.window_list , 1 , - 1 do
for i = # self.window_list , 1 , - 1 do
local window = self.window_list [ i ]
local window = self.window_list [ i ]
@ -1102,7 +1099,13 @@ function DictQuickLookup:onClose()
table.remove ( self.window_list , i )
table.remove ( self.window_list , i )
end
end
end
end
if self.highlight then
if self.update_wiki_languages_on_close then
-- except if we got no result for current language
if not self.results . no_result then
self.ui : handleEvent ( Event : new ( " UpdateWikiLanguages " , self.wiki_languages ) )
end
end
if self.highlight and not no_clear then
-- delay unhighlight of selection, so we can see where we stopped when
-- delay unhighlight of selection, so we can see where we stopped when
-- back from our journey into dictionary or wikipedia
-- back from our journey into dictionary or wikipedia
local clear_id = self.highlight : getClearId ( )
local clear_id = self.highlight : getClearId ( )
@ -1114,18 +1117,8 @@ function DictQuickLookup:onClose()
end end
function DictQuickLookup : onHoldClose ( no_clear ) function DictQuickLookup : onHoldClose ( no_clear )
self : onClose ( )
while # self.window_list > 0 do
for i = # self.window_list , 1 , - 1 do
self.window_list [ # self.window_list ] : onClose ( no_clear )
local window = self.window_list [ i ]
-- if one holds a highlight, let's clear it like in onClose()
if window.highlight and not no_clear then
local clear_id = window.highlight : getClearId ( )
UIManager : scheduleIn ( 0.5 , function ( )
window.highlight : clear ( clear_id )
end )
end
UIManager : close ( window )
table.remove ( self.window_list , i )
end
end
return true
return true
end end
@ -1258,15 +1251,12 @@ end
function DictQuickLookup : inputLookup ( ) function DictQuickLookup : inputLookup ( )
local word = self.input_dialog : getInputText ( )
local word = self.input_dialog : getInputText ( )
if word and word ~= " " then
if word and word ~= " " then
local event
-- Trust that input text does not need any cleaning (allows querying for "-suffix")
if self.is_wiki then
if self.is_wiki then
event = " LookupWikipedia "
self : lookupWikipedia ( false , word , true )
self : resyncWikiLanguages ( )
else
else
event = " LookupWord "
self.ui: handleEvent ( Event : new ( " LookupWord " , word , true ) )
end
end
-- Trust that input text does not need any cleaning (allows querying for "-suffix")
self.ui : handleEvent ( Event : new ( event , word , true ) )
end
end
end end
@ -1274,40 +1264,32 @@ function DictQuickLookup:closeInputDialog()
UIManager : close ( self.input_dialog )
UIManager : close ( self.input_dialog )
end end
function DictQuickLookup : resyncWikiLanguages ( rotate ) function DictQuickLookup : lookupWikipedia ( get_fullpage , word , is_sane , lang )
-- Resync the current language or rotate it from its state when
if not lang then
-- this window was created (we may have rotated it later in other
-- Use the lang of the current or nearest is_wiki DictQuickLookup.
-- wikipedia windows that we closed and went back here, and its
-- Otherwise, first lang in ReaderWikipedia.wiki_languages will be used.
-- state would not be what the wikipedia language button is showing.
for i = # self.window_list , 1 , - 1 do
if not self.wiki_languages_copy then
local window = self.window_list [ i ]
return
if window.is_wiki and window.lang then
end
lang = window.lang
if rotate then
break
-- rotate our saved wiki_languages copy
end
local current_lang = table.remove ( self.wiki_languages_copy , 1 )
end
table.insert ( self.wiki_languages_copy , current_lang )
end
-- re-set self.wiki_languages with original (possibly rotated) items
for i , lang in ipairs ( self.wiki_languages_copy ) do
self.wiki_languages [ i ] = lang
end
end
end if not word then
if get_fullpage then
function DictQuickLookup : lookupWikipedia ( get_fullpage ) -- we use the word of the displayed result's definition, which
local word
-- is the exact title of the full wikipedia page
local is_sane
word = self.lookupword
if get_fullpage then
is_sane = true
-- we use the word of the displayed result's definition, which
else
-- is the exact title of the full wikipedia page
-- we use the original word that was querried
word = self.lookupword
word = self.word
is_sane = true
is_sane = false
else
end
-- we use the original word that was querried
word = self.word
is_sane = false
end
end
self : resyncWikiLanguages ( )
-- Keep providing self.word_boxes so new windows keep being positionned to not hide it
self.ui : handleEvent ( Event : new ( " LookupWikipedia " , word , is_sane , self.word_box , get_fullpage ) )
self.ui : handleEvent ( Event : new ( " LookupWikipedia " , word , is_sane , self.word_boxes , get_fullpage , lang ) )
end end
return DictQuickLookup return DictQuickLookup
poire-z
2 years ago