Merge pull request #177 from houqp/new_ui_code

First try on Toc Menu

frontend/document/document.lua

@@ -92,6 +92,10 @@ function Document:getPageDimensions(pageno, zoom, rotation)
 	return native_dimen
 end
 
+function Document:getToc()
+	return self._document:getToc()
+end
+
 -- load implementations:
 
 require "document/pdfdocument"

frontend/ui/dialog.lua

@@ -416,9 +416,8 @@ Menu = FocusManager:new{
 
 	item_height = 36,
 	page = 1,
-	current = 1,
-	oldcurrent = 0,
-	selected_item = nil,
+
+	on_select_callback = function() end,
 }
 
 function Menu:init()
@@ -440,9 +439,9 @@ function Menu:init()
 	if self.is_enable_shortcut then
 		self.key_events.SelectByShortCut = { {self.item_shortcuts} }
 	end
+	self.key_events.Select = { {"Press"}, doc = "select current menu item"}
 
 	self[1] = CenterContainer:new{
-		dimen = {w = G_width, h = G_height},
 		FrameContainer:new{
 			background = 0,
 			radius = math.floor(self.width/20),
@@ -460,6 +459,7 @@ function Menu:init()
 				},
 			}, -- VerticalGroup
 		}, -- FrameContainer
+		dimen = {w = G_width, h = G_height},
 	} -- CenterContainer
 
 	self:_updateItems()
@@ -467,7 +467,10 @@ end
 
 function Menu:_updateItems()
 	self.layout = {}
-	self[1][1][1][2] = VerticalGroup:new{}
+	self[1]
+		[1] -- FrameContainer
+		[1] -- VerticalGroup
+		[2] = VerticalGroup:new{}
 	local item_group = self[1][1][1][2]
 
 	for c = 1, self.perpage do
@@ -506,15 +509,17 @@ end
 
 function Menu:onSelectByShortCut(_, keyevent)
 	for k,v in ipairs(self.item_shortcuts) do
-		if v == keyevent.key then
-			local item = self.item_table[k]
+		if k > self.perpage then
+			break
+		elseif v == keyevent.key then
+			local item = self.item_table[(self.page-1)*self.perpage+k]
 			self.item_table = nil
 			UIManager:close(self)
-			debug(item)
-			-- send events
+			self.on_select_callback(item)
 			break 
 		end
 	end
+	return true
 end
 
 function Menu:onNextPage()
@@ -523,10 +528,7 @@ function Menu:onNextPage()
 		self.page = self.page + 1
 		self:_updateItems()
 		self.selected = { x = 1, y = 1 }
-		self[1][1][1][3] = TextWidget:new{
-			text = "page "..self.page.."/"..self.page_num,
-			face = self.fface,
-		},
+		self[1][1][1][3].text = "page "..self.page.."/"..self.page_num
 		UIManager:setDirty(self)
 	end
 	return true
@@ -538,10 +540,7 @@ function Menu:onPrevPage()
 		self.page = self.page - 1
 		self:_updateItems()
 		self.selected = { x = 1, y = 1 }
-		self[1][1][1][3] = TextWidget:new{
-			text = "page "..self.page.."/"..self.page_num,
-			face = self.fface,
-		},
+		self[1][1][1][3].text = "page "..self.page.."/"..self.page_num
 		UIManager:setDirty(self)
 	end
 	return true
@@ -553,6 +552,12 @@ function Menu:onShowItemDetail()
 	)
 end
 
+function Menu:onSelect()
+	UIManager:close(self)
+	self.on_select_callback(self.item_table[self.selected.y])
+	return true
+end
+
 function Menu:onClose()
 	UIManager:close(self)
 	return true

frontend/ui/reader/readertoc.lua

@@ -0,0 +1,36 @@
+ReaderToc = InputContainer:new{
+	key_events = {
+		ShowToc = { {"T"}, doc = "show Table of Content menu"},
+	},
+	dimen = Geom:new{ w = G_width-20, h = G_height-20},
+}
+
+function ReaderToc:cleanUpTocTitle(title)
+	return title:gsub("\13", "")
+end
+
+function ReaderToc:onSetDimensions(dimen)
+	self.dimen = dimen
+end
+
+function ReaderToc:onShowToc()
+	function callback(item)
+		self.ui:handleEvent(Event:new("PageUpdate", item.page))
+	end
+
+	local items = self.ui.document:getToc()
+	-- build menu items
+	for _,v in ipairs(items) do
+		v.text = ("        "):rep(v.depth-1)..self:cleanUpTocTitle(v.title)
+	end
+	toc_menu = Menu:new{
+		title = "Table of Contents",
+		item_table = items,
+		width = self.dimen.w,
+		height = self.dimen.h,
+		on_select_callback = callback,
+	}
+
+	UIManager:show(toc_menu)
+end
+

frontend/ui/readerui.lua

@@ -4,6 +4,7 @@ require "ui/reader/readerzooming"
 require "ui/reader/readerpanning"
 require "ui/reader/readerrotation"
 require "ui/reader/readerpaging"
+require "ui/reader/readertoc"
 
 --[[
 This is an abstraction for a reader interface
@@ -54,6 +55,12 @@ function ReaderUI:init()
 		view = self[1],
 		ui = self
 	}
+	-- Toc menu controller
+	self[5] = ReaderToc:new{
+		dialog = self.dialog,
+		view = self[1],
+		ui = self
+	}
 	-- if needed, insert a paging container
 	if self.document.info.has_pages then
 		local pager = ReaderPaging:new{