Merge pull request #36 from traycold/master

some small bugfix and some improvements (filechooser, "single file mode")
This commit is contained in:
HW
2012-03-05 15:16:53 -08:00
6 changed files with 97 additions and 51 deletions

View File

@@ -440,10 +440,16 @@ function UniReader:showTOC()
self:fillTOC()
end
local menu_items = {}
local filtered_toc = {}
local curr_page = -1
-- build menu items
for _k,_v in ipairs(self.toc) do
table.insert(menu_items,
(" "):rep(_v.depth-1)..self:cleanUpTOCTitle(_v.title))
if(_v.page >= curr_page) then
table.insert(menu_items,
(" "):rep(_v.depth-1)..self:cleanUpTOCTitle(_v.title))
table.insert(filtered_toc,_v.page)
curr_page = _v.page
end
end
toc_menu = SelectMenu:new{
menu_title = "Table of Contents",
@@ -452,7 +458,7 @@ function UniReader:showTOC()
}
item_no = toc_menu:choose(0, fb.bb:getHeight())
if item_no then
self:goto(self.toc[item_no].page)
self:goto(filtered_toc[item_no])
else
self:goto(self.pageno)
end
@@ -673,17 +679,3 @@ function UniReader:inputloop()
return keep_running
end