|
|
@ -481,6 +481,10 @@ function ReaderBookmark:onShowBookmark(match_table)
|
|
|
|
local multilines_show_more_text = G_reader_settings:isTrue("bookmarks_items_multilines_show_more_text")
|
|
|
|
local multilines_show_more_text = G_reader_settings:isTrue("bookmarks_items_multilines_show_more_text")
|
|
|
|
local show_separator = G_reader_settings:isTrue("bookmarks_items_show_separator")
|
|
|
|
local show_separator = G_reader_settings:isTrue("bookmarks_items_show_separator")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.bookmark_menu = CenterContainer:new{
|
|
|
|
|
|
|
|
dimen = Screen:getSize(),
|
|
|
|
|
|
|
|
covers_fullscreen = true, -- hint for UIManager:_repaint()
|
|
|
|
|
|
|
|
}
|
|
|
|
local bm_menu = Menu:new{
|
|
|
|
local bm_menu = Menu:new{
|
|
|
|
title = self.filtered_mode and _("Bookmarks (search results)") or _("Bookmarks"),
|
|
|
|
title = self.filtered_mode and _("Bookmarks (search results)") or _("Bookmarks"),
|
|
|
|
item_table = item_table,
|
|
|
|
item_table = item_table,
|
|
|
@ -504,7 +508,9 @@ function ReaderBookmark:onShowBookmark(match_table)
|
|
|
|
direction = BD.flipDirectionIfMirroredUILayout("east")
|
|
|
|
direction = BD.flipDirectionIfMirroredUILayout("east")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
show_parent = self.bookmark_menu,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
table.insert(self.bookmark_menu, bm_menu)
|
|
|
|
|
|
|
|
|
|
|
|
-- buid up menu widget method as closure
|
|
|
|
-- buid up menu widget method as closure
|
|
|
|
local bookmark = self
|
|
|
|
local bookmark = self
|
|
|
@ -815,7 +821,7 @@ function ReaderBookmark:onShowBookmark(match_table)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
bm_menu.close_callback = function()
|
|
|
|
bm_menu.close_callback = function()
|
|
|
|
UIManager:close(bm_menu)
|
|
|
|
UIManager:close(self.bookmark_menu)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
self.refresh = function()
|
|
|
|
self.refresh = function()
|
|
|
@ -823,7 +829,7 @@ function ReaderBookmark:onShowBookmark(match_table)
|
|
|
|
self:onSaveSettings()
|
|
|
|
self:onSaveSettings()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
UIManager:show(bm_menu)
|
|
|
|
UIManager:show(self.bookmark_menu)
|
|
|
|
return true
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|