Merge branch 'master' of github.com:hwhw/kindlepdfviewer

Makefile

@@ -215,6 +215,7 @@ customupdate: all
 	mkdir $(INSTALL_DIR)/data
 	cp -rpL data/*.css $(INSTALL_DIR)/data
 	cp -rpL fonts $(INSTALL_DIR)
+	cp -r resources $(INSTALL_DIR)
 	mkdir $(INSTALL_DIR)/fonts/host
 	zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/
 	rm -Rf $(INSTALL_DIR)

dialog.lua

@@ -29,3 +29,15 @@ function InfoMessage:show(text)
 	dialog:paintTo(fb.bb, 0, 0)
 	dialog:free()
 end
+
+function showInfoMsgWithDelay(text, msec, refresh_mode)
+	if not refresh_mode then refresh_mode = 0 end
+	Screen:saveCurrentBB()
+
+	InfoMessage:show(text)
+	fb:refresh(refresh_mode)
+	util.usleep(msec*1000)
+
+	Screen:restoreFromSavedBB()
+	fb:refresh(refresh_mode)
+end

reader.lua

@@ -48,6 +48,8 @@ function openFile(filename)
 		reader = CREReader
 	end
 	if reader then
+		InfoMessage:show("Opening document, please wait... ")
+		fb:refresh(0)
 		local ok, err = reader:open(filename)
 		if ok then
 			reader:loadSettings(filename)

unireader.lua

@@ -1532,17 +1532,21 @@ function UniReader:showToc()
 		("        "):rep(v.depth-1)..self:cleanUpTocTitle(v.title))
 	end
 
-	toc_menu = SelectMenu:new{
-		menu_title = "Table of Contents",
-		item_array = menu_items,
-		no_item_msg = "This document does not have a Table of Contents.",
-	}
-	item_no = toc_menu:choose(0, fb.bb:getHeight())
-
-	if item_no then
-		self:gotoTocEntry(self.toc[item_no])
+	if #menu_items == 0 then
+		showInfoMsgWithDelay(
+			"This document does not have a TOC.", 2000, 1)
 	else
-		self:redrawCurrentPage()
+		toc_menu = SelectMenu:new{
+			menu_title = "Table of Contents",
+			item_array = menu_items,
+		}
+		item_no = toc_menu:choose(0, fb.bb:getHeight())
+
+		if item_no then
+			self:gotoTocEntry(self.toc[item_no])
+		else
+			self:redrawCurrentPage()
+		end
 	end
 end
 
@@ -1552,17 +1556,22 @@ function UniReader:showJumpStack()
 		table.insert(menu_items,
 			v.datetime.." -> Page "..v.page.." "..v.notes)
 	end
-	jump_menu = SelectMenu:new{
-		menu_title = "Jump Keeper      (current page: "..self.pageno..")",
-		item_array = menu_items,
-		no_item_msg = "No jump history.",
-	}
-	item_no = jump_menu:choose(0, fb.bb:getHeight())
-	if item_no then
-		local jump_item = self.jump_stack[item_no]
-		self:goto(jump_item.page)
+
+	if #menu_items == 0 then
+		showInfoMsgWithDelay(
+			"No jump history found.", 2000, 1)
 	else
-		self:redrawCurrentPage()
+		jump_menu = SelectMenu:new{
+			menu_title = "Jump Keeper      (current page: "..self.pageno..")",
+			item_array = menu_items,
+		}
+		item_no = jump_menu:choose(0, fb.bb:getHeight())
+		if item_no then
+			local jump_item = self.jump_stack[item_no]
+			self:goto(jump_item.page)
+		else
+			self:redrawCurrentPage()
+		end
 	end
 end
 
@@ -1578,14 +1587,20 @@ function UniReader:showHighLight()
 			end
 		end
 	end
-	toc_menu = SelectMenu:new{
-		menu_title = "HighLights",
-		item_array = menu_items,
-		no_item_msg = "No HighLight found.",
-	}
-	item_no = toc_menu:choose(0, fb.bb:getHeight())
-	if item_no then
-		self:goto(highlight_dict[item_no].page)
+	if #menu_items == 0 then
+		showInfoMsgWithDelay(
+			"No HighLights found.", 2000, 1)
+	else
+		toc_menu = SelectMenu:new{
+			menu_title = "HighLights",
+			item_array = menu_items,
+		}
+		item_no = toc_menu:choose(0, fb.bb:getHeight())
+		if item_no then
+			self:goto(highlight_dict[item_no].page)
+		else
+			self:redrawCurrentPage()
+		end
 	end
 end