Add dictionary to filemanager

pull/2480/head
Hzj_jie 7 years ago committed by Qingping Hou
parent 81796fbfd3
commit 5bda44473d

@ -27,6 +27,7 @@ local KeyValuePage = require("ui/widget/keyvaluepage")
local ReaderUI = require("apps/reader/readerui") local ReaderUI = require("apps/reader/readerui")
local InfoMessage = require("ui/widget/infomessage") local InfoMessage = require("ui/widget/infomessage")
local PluginLoader = require("pluginloader") local PluginLoader = require("pluginloader")
local ReaderDictionary = require("apps/reader/modules/readerdictionary")
local function getDefaultDir() local function getDefaultDir()
if Device:isKindle() then if Device:isKindle() then
@ -296,6 +297,7 @@ function FileManager:init()
table.insert(self, FileManagerHistory:new{ table.insert(self, FileManagerHistory:new{
ui = self, ui = self,
}) })
table.insert(self, ReaderDictionary:new{ ui = self })
self.loaded_modules = {} self.loaded_modules = {}
-- koreader plugins -- koreader plugins

@ -139,6 +139,11 @@ function DictQuickLookup:init()
end end
end end
-- Whether currently DictQuickLookup is working without a document.
function DictQuickLookup:isDocless()
return self.ui == nil or self.ui.highlight == nil
end
function DictQuickLookup:update() function DictQuickLookup:update()
local orig_dimen = self.dict_frame and self.dict_frame.dimen or Geom:new{} local orig_dimen = self.dict_frame and self.dict_frame.dimen or Geom:new{}
-- calculate window dimension -- calculate window dimension
@ -296,7 +301,7 @@ function DictQuickLookup:update()
end, end,
}, },
{ {
text = self.is_wiki and _("Close") or _("Search"), text = (self.is_wiki or self:isDocless()) and _("Close") or _("Search"),
callback = function() callback = function()
if not self.is_wiki then if not self.is_wiki then
self.ui:handleEvent(Event:new("HighlightSearch")) self.ui:handleEvent(Event:new("HighlightSearch"))
@ -399,7 +404,7 @@ function DictQuickLookup:onShow()
end end
function DictQuickLookup:getHighlightedItem() function DictQuickLookup:getHighlightedItem()
if not self.ui then return end if self:isDocless() then return end
return self.ui.highlight:getHighlightBookmarkItem() return self.ui.highlight:getHighlightBookmarkItem()
end end

Loading…
Cancel
Save