diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index 5c54faca6..a7c117dbb 100755 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -27,6 +27,7 @@ local KeyValuePage = require("ui/widget/keyvaluepage") local ReaderUI = require("apps/reader/readerui") local InfoMessage = require("ui/widget/infomessage") local PluginLoader = require("pluginloader") +local ReaderDictionary = require("apps/reader/modules/readerdictionary") local function getDefaultDir() if Device:isKindle() then @@ -296,6 +297,7 @@ function FileManager:init() table.insert(self, FileManagerHistory:new{ ui = self, }) + table.insert(self, ReaderDictionary:new{ ui = self }) self.loaded_modules = {} -- koreader plugins diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index c70d6fdf0..4ecd23f97 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -139,6 +139,11 @@ function DictQuickLookup:init() 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() local orig_dimen = self.dict_frame and self.dict_frame.dimen or Geom:new{} -- calculate window dimension @@ -296,7 +301,7 @@ function DictQuickLookup:update() end, }, { - text = self.is_wiki and _("Close") or _("Search"), + text = (self.is_wiki or self:isDocless()) and _("Close") or _("Search"), callback = function() if not self.is_wiki then self.ui:handleEvent(Event:new("HighlightSearch")) @@ -399,7 +404,7 @@ function DictQuickLookup:onShow() end function DictQuickLookup:getHighlightedItem() - if not self.ui then return end + if self:isDocless() then return end return self.ui.highlight:getHighlightBookmarkItem() end