From 496ab3720e3c4c7ceb1994281bc842dd65595a72 Mon Sep 17 00:00:00 2001
From: traycold <traycold@gmail.com>
Date: Wed, 14 Mar 2012 00:07:19 +0100
Subject: [PATCH] small bugfix

---
 helppage.lua  | 4 ++--
 unireader.lua | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helppage.lua b/helppage.lua
index ed0fdf2d6..2e7498cd4 100644
--- a/helppage.lua
+++ b/helppage.lua
@@ -67,8 +67,8 @@ function HelpPage:show(ypos, height,commands)
 					renderUtf8Text(fb.bb, max_x + 20, ypos + self.spacing*c, self.hface, self.hfhash, self.commands[i].help, true)
 				end
 			end			
-			renderUtf8Text(fb.bb, 5, height - self.ffsize, self.fface, self.ffhash,
-				"Page "..self.page.." of "..math.ceil(self.items / perpage), true)					
+			renderUtf8Text(fb.bb, 5, height - math.floor(self.ffsize * 0.4), self.fface, self.ffhash,
+				"Page "..self.page.." of "..math.ceil(self.items / perpage).."  - click Back to close this page", true)					
 			markerdirty = true
 		end
 		if pagedirty then
diff --git a/unireader.lua b/unireader.lua
index df1b005e8..c990fe06d 100644
--- a/unireader.lua
+++ b/unireader.lua
@@ -918,7 +918,7 @@ function UniReader:add_all_commands()
 		function(unireader)
 			unireader:setglobalzoommode(unireader.ZOOM_FIT_TO_CONTENT_HALF_WIDTH)
 		end)	
-	self.commands:add(KEY_G,MOD_SHIFT,"G",
+	self.commands:add(KEY_G,nil,"G",
 		"goto page",
 		function(unireader)
 			local page = InputBox:input(height-100, 100, "Page:")
@@ -1008,10 +1008,10 @@ function UniReader:add_all_commands()
 			print("# bbox override: ", unireader.bbox.enabled);
 		end)
 	self.commands:add(KEY_MENU,nil,"Menu",
-		"set crop mode",
+		"open menu",
 		function(unireader)
-			self:showMenu()
-			self:goto(self.pageno)		
+			unireader:showMenu()
+			unireader:goto(unireader.pageno)		
 		end)		
 	-- panning
 	local panning_keys = {Keydef:new(KEY_FW_LEFT,MOD_ANY),Keydef:new(KEY_FW_RIGHT,MOD_ANY),Keydef:new(KEY_FW_UP,MOD_ANY),Keydef:new(KEY_FW_DOWN,MOD_ANY),Keydef:new(KEY_FW_PRESS,MOD_ANY)}