mirror of https://github.com/koreader/koreader
Merge pull request #683 from houqp/new_ui_houqp
Bug fix & added simple TOC menu & bookmark support & notification widgetpull/2/merge
{Qingping,Dave} Hou
12 years ago
commit
dbaec84f4d
@ -0,0 +1,52 @@
|
||||
require "ui/ui"
|
||||
require "ui/widget"
|
||||
|
||||
--[[
|
||||
Widget that displays a tiny notification on top of screen
|
||||
--]]
|
||||
Notification = InputContainer:new{
|
||||
face = Font:getFace("infofont", 20),
|
||||
text = "Null Message",
|
||||
timeout = nil,
|
||||
|
||||
key_events = {
|
||||
AnyKeyPressed = { { Input.group.Any }, seqtext = "any key", doc = "close dialog" }
|
||||
}
|
||||
}
|
||||
|
||||
function Notification:init()
|
||||
-- we construct the actual content here because self.text is only available now
|
||||
self[1] = CenterContainer:new{
|
||||
dimen = Geom:new{
|
||||
w = Screen:getWidth(),
|
||||
h = Screen:getHeight()/10,
|
||||
},
|
||||
ignore = "height",
|
||||
FrameContainer:new{
|
||||
background = 0,
|
||||
radius = 0,
|
||||
HorizontalGroup:new{
|
||||
align = "center",
|
||||
TextBoxWidget:new{
|
||||
text = self.text,
|
||||
face = self.face,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
function Notification:onShow()
|
||||
-- triggered by the UIManager after we got successfully shown (not yet painted)
|
||||
if self.timeout then
|
||||
UIManager:scheduleIn(self.timeout, function() UIManager:close(self) end)
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
function Notification:onAnyKeyPressed()
|
||||
-- triggered by our defined key events
|
||||
UIManager:close(self)
|
||||
return true
|
||||
end
|
||||
|
||||
@ -0,0 +1,148 @@
|
||||
require "ui/notification"
|
||||
|
||||
ReaderBookmark = InputContainer:new{
|
||||
bm_menu_title = "Bookmarks",
|
||||
bookmarks = nil,
|
||||
}
|
||||
|
||||
function ReaderBookmark:init()
|
||||
if Device:hasKeyboard() then
|
||||
self.key_events = {
|
||||
ShowToc = {
|
||||
{ "B" },
|
||||
doc = "show bookmarks" },
|
||||
}
|
||||
elseif Device:isTouchDevice() then
|
||||
self.ges_events = {
|
||||
AddBookmark = {
|
||||
GestureRange:new{
|
||||
ges = "double_tap",
|
||||
range = Geom:new{
|
||||
x = Screen:getWidth()/2, y = 0,
|
||||
w = Screen:getWidth()/2,
|
||||
h = Screen:getHeight()/2
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
end
|
||||
self.ui.menu:registerToMainMenu(self)
|
||||
end
|
||||
|
||||
function ReaderBookmark:onReadSettings(config)
|
||||
self.bookmarks = config:readSetting("bookmarks") or {}
|
||||
end
|
||||
|
||||
function ReaderBookmark:onCloseDocument()
|
||||
self.ui.doc_settings:saveSetting("bookmarks", self.bookmarks)
|
||||
end
|
||||
|
||||
function ReaderBookmark:onSetDimensions(dimen)
|
||||
self.dimen = dimen
|
||||
end
|
||||
|
||||
function ReaderBookmark:onAddBookmark()
|
||||
local pn_or_xp = nil
|
||||
if self.ui.document.getXPointer then
|
||||
pn_or_xp = self.ui.document:getXPointer()
|
||||
else
|
||||
pn_or_xp = self.view.state.page
|
||||
end
|
||||
|
||||
local noti_text = "Bookmark added."
|
||||
if not self:addBookmark(pn_or_xp) then
|
||||
noti_text = "Page already marked!"
|
||||
end
|
||||
UIManager:show(Notification:new{
|
||||
text = noti_text,
|
||||
timeout = 3
|
||||
})
|
||||
return true
|
||||
end
|
||||
|
||||
function ReaderBookmark:onShowBookmark()
|
||||
-- build up item_table
|
||||
for k, v in ipairs(self.bookmarks) do
|
||||
local page = v.page
|
||||
-- for CREngine, bookmark page is xpointer
|
||||
if type(page) == "string" then
|
||||
page = self.ui.document:getPageFromXPointer(v.page)
|
||||
end
|
||||
v.text = "Page "..page.." "..v.notes.." @ "..v.datetime
|
||||
end
|
||||
|
||||
local bm_menu = Menu:new{
|
||||
title = "Bookmarks",
|
||||
item_table = self.bookmarks,
|
||||
width = Screen:getWidth()-20,
|
||||
height = Screen:getHeight(),
|
||||
}
|
||||
-- buid up menu widget method as closure
|
||||
local doc = self.ui.document
|
||||
local sendEv = function(ev)
|
||||
self.ui:handleEvent(ev)
|
||||
end
|
||||
function bm_menu:onMenuChoice(item)
|
||||
if doc.info.has_pages then
|
||||
sendEv(Event:new("PageUpdate", item.page))
|
||||
elseif self.view.view_mode == "page" then
|
||||
sendEv(Event:new("PageUpdate", doc:getPageFromXPointer(item.page)))
|
||||
else
|
||||
sendEv(Event:new("PosUpdate", doc:getPosFromXPointer(item.page)))
|
||||
end
|
||||
end
|
||||
|
||||
local menu_container = CenterContainer:new{
|
||||
dimen = Screen:getSize(),
|
||||
bm_menu,
|
||||
}
|
||||
bm_menu.close_callback = function()
|
||||
UIManager:close(menu_container)
|
||||
end
|
||||
|
||||
UIManager:show(menu_container)
|
||||
return true
|
||||
end
|
||||
|
||||
function ReaderBookmark:addToMainMenu(item_table)
|
||||
-- insert table to main reader menu
|
||||
table.insert(item_table, {
|
||||
text = self.bm_menu_title,
|
||||
callback = function()
|
||||
self:onShowBookmark()
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
--[[
|
||||
return nil if page already marked, otherwise, return true
|
||||
for CREngine, bookmark page is xpointer instead of page number
|
||||
--]]
|
||||
function ReaderBookmark:addBookmark(pn_or_xp)
|
||||
for k,v in ipairs(self.bookmarks) do
|
||||
if v.page == pn_or_xp then
|
||||
return nil
|
||||
end
|
||||
end
|
||||
-- build notes from TOC
|
||||
local notes = self.ui.toc:getTocTitleByPage(pn_or_xp)
|
||||
if notes ~= "" then
|
||||
notes = "in "..notes
|
||||
end
|
||||
mark_item = {
|
||||
page = pn_or_xp,
|
||||
datetime = os.date("%Y-%m-%d %H:%M:%S"),
|
||||
notes = notes,
|
||||
}
|
||||
table.insert(self.bookmarks, mark_item)
|
||||
table.sort(self.bookmarks, function(a,b)
|
||||
return self:isBookmarkInSequence(a, b)
|
||||
end)
|
||||
return true
|
||||
end
|
||||
|
||||
function ReaderBookmark:isBookmarkInSequence(a, b)
|
||||
return a.page < b.page
|
||||
end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue