Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into rotate

Conflicts:
	frontend/ui/reader/readerconfig.lua
This commit is contained in:
Qingping Hou
2013-02-04 15:00:17 +08:00
15 changed files with 425 additions and 70 deletions

View File

@@ -56,7 +56,7 @@ function ReaderMenu:setUpdateItemTable()
end
table.insert(self.item_table, {
text = "Return to file browser",
text = "Return to file manager",
callback = function()
UIManager:close(self.menu_container)
self.ui:onClose()
@@ -74,11 +74,6 @@ function ReaderMenu:onShowMenu()
item_table = self.item_table,
width = Screen:getWidth() - 100,
}
function main_menu:onMenuChoice(item)
if item.callback then
item.callback()
end
end
local menu_container = CenterContainer:new{
ignore = "height",